From 695c387e89830e6ddfc8895b51d9b1228e305fd9 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 14 Sep 2019 14:05:03 +0000
Subject: [PATCH] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: contract-12.0/contract-12.0-contract
Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-contract/
---
 contract/i18n/am.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/ar.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/bg.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/bs.po       | 1105 +++++++++++++++++++++++++-------
 contract/i18n/ca.po       | 1112 +++++++++++++++++++++++++-------
 contract/i18n/cs.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/da.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/de.po       | 1265 +++++++++++++++++++++++++++++-------
 contract/i18n/el_GR.po    | 1109 +++++++++++++++++++++++++-------
 contract/i18n/en_GB.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/es.po       | 1262 +++++++++++++++++++++++++++++-------
 contract/i18n/es_AR.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/es_CO.po    | 1103 ++++++++++++++++++++++++-------
 contract/i18n/es_CR.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/es_DO.po    | 1103 ++++++++++++++++++++++++-------
 contract/i18n/es_EC.po    | 1103 ++++++++++++++++++++++++-------
 contract/i18n/es_ES.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/es_MX.po    | 1109 +++++++++++++++++++++++++-------
 contract/i18n/es_PY.po    | 1103 ++++++++++++++++++++++++-------
 contract/i18n/es_VE.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/et.po       | 1105 +++++++++++++++++++++++++-------
 contract/i18n/eu.po       | 1103 ++++++++++++++++++++++++-------
 contract/i18n/fa.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/fi.po       | 1109 +++++++++++++++++++++++++-------
 contract/i18n/fr.po       | 1281 ++++++++++++++++++++++++++++++-------
 contract/i18n/fr_CA.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/fr_CH.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/gl.po       | 1260 +++++++++++++++++++++++++++++-------
 contract/i18n/gl_ES.po    | 1103 ++++++++++++++++++++++++-------
 contract/i18n/he.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/hi_IN.po    | 1137 +++++++++++++++++++++++++-------
 contract/i18n/hr.po       | 1163 ++++++++++++++++++++++++++-------
 contract/i18n/hr_HR.po    | 1190 +++++++++++++++++++++++++++-------
 contract/i18n/hu.po       | 1109 +++++++++++++++++++++++++-------
 contract/i18n/id.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/it.po       | 1217 ++++++++++++++++++++++++++++-------
 contract/i18n/ja.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/ko.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/lt.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/lt_LT.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/lv.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/mk.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/mn.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/nb.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/nb_NO.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/nl.po       | 1250 +++++++++++++++++++++++++++++-------
 contract/i18n/nl_BE.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/nl_NL.po    | 1134 +++++++++++++++++++++++++-------
 contract/i18n/pl.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/pt.po       | 1258 +++++++++++++++++++++++++++++-------
 contract/i18n/pt_BR.po    | 1176 +++++++++++++++++++++++++++-------
 contract/i18n/pt_PT.po    | 1109 +++++++++++++++++++++++++-------
 contract/i18n/ro.po       | 1109 +++++++++++++++++++++++++-------
 contract/i18n/ru.po       | 1130 +++++++++++++++++++++++++-------
 contract/i18n/sk.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/sk_SK.po    | 1105 +++++++++++++++++++++++++-------
 contract/i18n/sl.po       | 1113 +++++++++++++++++++++++++-------
 contract/i18n/sr.po       | 1105 +++++++++++++++++++++++++-------
 contract/i18n/sr@latin.po | 1105 +++++++++++++++++++++++++-------
 contract/i18n/sv.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/th.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/tr.po       | 1199 +++++++++++++++++++++++++++-------
 contract/i18n/tr_TR.po    | 1183 +++++++++++++++++++++++++++-------
 contract/i18n/uk.po       | 1107 +++++++++++++++++++++++++-------
 contract/i18n/vi.po       | 1105 +++++++++++++++++++++++++-------
 contract/i18n/vi_VN.po    | 1107 +++++++++++++++++++++++++-------
 contract/i18n/zh_CN.po    | 1275 +++++++++++++++++++++++++++++-------
 contract/i18n/zh_TW.po    | 1105 +++++++++++++++++++++++++-------
 68 files changed, 62054 insertions(+), 14875 deletions(-)

diff --git a/contract/i18n/am.po b/contract/i18n/am.po
index 85f323da..c1a90368 100644
--- a/contract/i18n/am.po
+++ b/contract/i18n/am.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Última actualización en"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/ar.po b/contract/i18n/ar.po
index 8306defe..45d669dc 100644
--- a/contract/i18n/ar.po
+++ b/contract/i18n/ar.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "المعرف"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "آخر تحديث في"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "الاسم"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/bg.po b/contract/i18n/bg.po
index 3e2ba62b..57b8832a 100644
--- a/contract/i18n/bg.po
+++ b/contract/i18n/bg.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Описание"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Последно обновено на"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Име"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/bs.po b/contract/i18n/bs.po
index 35202543..73e12014 100644
--- a/contract/i18n/bs.po
+++ b/contract/i18n/bs.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/ca.po b/contract/i18n/ca.po
index 11d4ae98..0144d738 100644
--- a/contract/i18n/ca.po
+++ b/contract/i18n/ca.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Compte analític"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +326,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creat el"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Darrera Actualització el"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Darrera Actualització per"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nom"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1011,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1085,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1114,298 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
-
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
diff --git a/contract/i18n/cs.po b/contract/i18n/cs.po
index 012886e9..1efd24d5 100644
--- a/contract/i18n/cs.po
+++ b/contract/i18n/cs.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Vytvořil(a)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Naposled upraveno"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Naposled upraveno"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Název"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/da.po b/contract/i18n/da.po
index 436a49f2..f996e248 100644
--- a/contract/i18n/da.po
+++ b/contract/i18n/da.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "Id"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Sidst opdateret den"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Navn"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/de.po b/contract/i18n/de.po
index 6c410380..8e29be2c 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -150,14 +150,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Vertrag (Ref: ${object.name or 'k.A.'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Enddatum der Abrechnungsperiode"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Anfangsdatum der Abrechnungsperiode"
 
@@ -168,7 +184,9 @@ msgstr "<strong>Vertrag: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Anfangsdatum:</strong>"
 
 #. module: contract
@@ -212,48 +230,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Einzelpreis</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "account.analytic.contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Kostenrechnungspositionen"
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Wiederkehrende Rechnungen von Verträgen erzeugen"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Kostenstelle"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Auto-Preis?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Klicken Sie hier, um eine neue Vertragsvorlage zu erstellen."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Klicken Sie hier, um einen neuen Vertrag anzulegen."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Unternehmen"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
@@ -265,154 +392,294 @@ msgstr "Kontakt"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Vertrag"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "Vertragsbeginn '%s' kann nicht später als das Vertragsende sein"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Vertragspositionen"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Vertragspositionen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Vertragstyp"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Vertragsvorlage"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Vertragsvorlage"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Vertragsvorlagen"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Vertragsvorlagen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Vertragstyp"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "Vertragsbeginn '%s' kann nicht später als das Vertragsende sein"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Vertragspositionen"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Vertragsvorlagen"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Verträge"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Rechnungssichtbarkeit erstellen"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Rechnungen anlegen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Erstellt von"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Erstellt am"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Wiederholung"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Kunde"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Kundenverträge"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Enddatum"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Datum (von)"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Startdatum"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Datum (bis)"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Beginn Rechnungsstellung"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Datum der nächsten Rechnung"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Ende Rechnungsstellung"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Tag(e)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Beschreibung"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Rabatt (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Rabatt muss kleiner oder gleich 100 sein"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -421,44 +688,90 @@ msgstr ""
 "100 sein"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Beendet"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Wiederkehrende Rechnungen von Verträgen erzeugen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Wiederkehrende Rechnungen automatisch erzeugen"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Gruppieren nach..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Gruppieren nach..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -468,124 +781,333 @@ msgstr ""
 "Preisliste gesetzt. Wenn der Haken nicht gesetzt ist, können Sie selbst "
 "einen Preis setzen"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Rechnung"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Rechnung"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Rechnung"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Rechnungspositionen"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Wiederholung in (Tagen/Wochen/Monaten/Jahren)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Rechnungen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Rechnungsstellung"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Rechnungsstellung"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Journal"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Datum der nächsten Rechnung"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert von"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Legende (für Markierungen in Beschreibungen der Rechnungspositionen)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Monat(e)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Monatsletzter Tag"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Nächste Rechnung"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Nächste Rechnung"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Vertrag"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Partner (immer \"False\")"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "Partner und Abteilungen"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Startdatum"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, 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."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Periodenende"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Periodenbeginn"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Vertragspositionen"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Preisliste"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Produkt"
 
@@ -597,41 +1119,82 @@ msgid "Purchase Contracts"
 msgstr "Einkaufsverträge"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Menge"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Wiederholung"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Periodische Rechnungen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Wiederholung"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Vertragspositionen"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Wiederholung je"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Wiederholung in (Tagen/Wochen/Monaten/Jahren)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Verantwortlich"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Verantwortlich"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -640,19 +1203,21 @@ msgid "Sale Contracts"
 msgstr "Verkaufsverträge"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "als Email versenden"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Sequenz"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Sequenz der Vertragszeile bei der Anzeige von Verträgen"
 
@@ -667,137 +1232,369 @@ msgid "Show the sale contracts for this partner"
 msgstr "Verkaufsverträge des Partners anzeigen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Spezifischer Preis"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Legen Sie das Intervall für die automatische Rechnungslegung fest."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Legen Sie das Intervall für die automatische Rechnungslegung fest."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr "Legen Sie fest, ob das Datum als Start- oder Enddatum behandelt wird"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Zwischensumme"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Vertragspositionen"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Lieferant"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Lieferantenverträge"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Einzelpreis"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Mengeneinheit"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "USt-ID:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Gültig"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
-msgstr "Lieferantenrechnungen"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Woche(n)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Jahr(e)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, 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:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 "Das Datum der nächsten Rechnung darf nicht vor Vertragsbeginn des Vertrags "
 "'%s' liegen"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Sie müssen zuerst einen Kunden für den Vertrag '%s' auswählen!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Sie müssen zuerst einen Lieferanten für den Vertrag '%s' auswählen!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Bitte prüfen Sie das Startdatum und das Enddatum des Vertrags:\n"
-"%s"
+"Das Datum der nächsten Rechnung darf nicht vor Vertragsbeginn des Vertrags "
+"'%s' liegen"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "Sie müssen einen Kunden für den Vertrag '%s' angeben"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"Das Datum der nächsten Rechnung darf nicht vor Vertragsbeginn des Vertrags "
+"'%s' liegen"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr ""
 "Sie müssen das Datum der nächsten Rechnung für den Vertrag '%s' angeben"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "Sie müssen den Vertragsbeginn für den Vertrag '%s' angeben"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Verkaufsverträge"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "account.analytic.contract"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Periodische Rechnungen anzeigen"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Kostenrechnungspositionen"
+
+#~ msgid "Date From"
+#~ msgstr "Datum (von)"
+
+#~ msgid "Date To"
+#~ msgstr "Datum (bis)"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Beginn Rechnungsstellung"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Ende Rechnungsstellung"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Wiederkehrende Rechnungen automatisch erzeugen"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "Partner und Abteilungen"
+
+#~ msgid "Vendor Bills"
+#~ msgstr "Lieferantenrechnungen"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Sie müssen zuerst einen Kunden für den Vertrag '%s' auswählen!"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Sie müssen zuerst einen Lieferanten für den Vertrag '%s' auswählen!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Bitte prüfen Sie das Startdatum und das Enddatum des Vertrags:\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "Sie müssen einen Kunden für den Vertrag '%s' angeben"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "Sie müssen den Vertragsbeginn für den Vertrag '%s' angeben"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Periodische Rechnungen anzeigen"
diff --git a/contract/i18n/el_GR.po b/contract/i18n/el_GR.po
index 5ccd1a8d..757ec4d6 100644
--- a/contract/i18n/el_GR.po
+++ b/contract/i18n/el_GR.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Αναλυτικός Λογαριασμός"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +327,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από "
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "Κωδικός"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Τελευταία ενημέρωση στις"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία ενημέρωση από"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Ονομασία"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1012,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1086,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1115,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/en_GB.po b/contract/i18n/en_GB.po
index 2bc134e4..3ec4f010 100644
--- a/contract/i18n/en_GB.po
+++ b/contract/i18n/en_GB.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Created by"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Last Updated on"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Name"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es.po b/contract/i18n/es.po
index 2bc43794..27a997ac 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -148,14 +148,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrato (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Fecha fin del periodo facturado"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Fecha inicio del periodo facturado"
 
@@ -166,7 +182,9 @@ msgstr "<strong>Contrato: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Fecha de inicio: </strong>"
 
 #. module: contract
@@ -210,48 +228,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Precio unidad</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "Contratos Cuenta Analítica"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Ver líneas contables analíticas"
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Generar facturas recurrentes desde los contratos"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Cuenta analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "¿Precio automático?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Pulse para crear una nueva plantilla de contrato."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Pulse para crear un contrato nuevo."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Compañía"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "Componer correo electrónico"
@@ -263,155 +390,295 @@ msgstr "Contacto"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
-"La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Líneas de contrato"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Líneas de contrato"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Tipo de contrato"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Plantilla de contrato"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Plantilla de contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Plantillas de contrato"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Plantillas de contrato"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Tipo de contrato"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr ""
+"La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Plantillas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Visibilidad de crear factura"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Crear facturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Recurrencia"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Cliente"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Contratos de cliente"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Fecha fin"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Fecha inicio"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Fecha de inicio"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Fecha fin"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Fecha del periodo facturado"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Próxima fecha de factura"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Fecha del periodo facturado"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Día(s)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Descripción"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Descuento (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "El descuento debería ser menor o igual a 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -420,44 +687,90 @@ msgstr ""
 "igual a 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Finalizado"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Generar facturas recurrentes desde los contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Generar facturas recurrentes automáticamente"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Agrupar por..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -466,125 +779,334 @@ msgstr ""
 "Si está marcado, el precio se obtendrá automáticamente aplicando la tarifa "
 "al producto. Si no, podrá introducir un precio manual"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Factura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Factura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Factura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Líneas de factura"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/año)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Facturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tipo de facturación"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tipo de facturación"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Diario"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Próxima fecha de factura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 "Leyenda (para los marcadores dentro de descripción en lineas de factura)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mes(es)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Mes(es) último día"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Próxima factura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Próxima factura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Empresa (siempre Falso)"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "Empresa y contactos"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Fecha de inicio"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, 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'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Pospago"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Prepago"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Lista de precios"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Producto"
 
@@ -596,41 +1118,82 @@ msgid "Purchase Contracts"
 msgstr "Contratos de compras"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Recurrencia"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Facturas recurrentes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Recurrencia"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Repetir cada"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Repetir cada (días/semana/mes/año)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Responsable"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Responsable"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -639,19 +1202,21 @@ msgid "Sale Contracts"
 msgstr "Contratos de ventas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "Enviar por correo electrónico"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Secuencia de la linea de contrato cuando se muestra en los contratos"
 
@@ -666,137 +1231,366 @@ msgid "Show the sale contracts for this partner"
 msgstr "Muestra los contratos de ventas para esta empresa/contacto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Precio específico"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Especifica el intervalo para la generación de facturas automática."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Especifica el intervalo para la generación de facturas automática."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 "Especifica si la fecha de proceso es desde o hasta la fecha de facturación"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Subtotal"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Contratos de proveedor"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Precio unidad"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unidad de medida"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "NIF:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Válido"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Semana(s)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Año(s)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, 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:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 "No puede tener una fecha de próxima factura anterior a la fecha de inicio "
 "del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "¡Seleccione un cliente para este contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Tiene que seleccionar un Proveedor para el contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Debe revisar las fechas de inicio y de fin\n"
-"%s"
+"No puede tener una fecha de próxima factura anterior a la fecha de inicio "
+"del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "Debe especificar un cliente para el contrato '%s'"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"No puede tener una fecha de próxima factura anterior a la fecha de inicio "
+"del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr "Debe suministrar una fecha de próxima factura para el contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "Debe suministrar una fecha de inicio para el contrato '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Contratos de ventas"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Contratos Cuenta Analítica"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Mostrar facturas recurrentes"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Ver líneas contables analíticas"
+
+#~ msgid "Date From"
+#~ msgstr "Fecha inicio"
+
+#~ msgid "Date To"
+#~ msgstr "Fecha fin"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Fecha del periodo facturado"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Fecha del periodo facturado"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Generar facturas recurrentes automáticamente"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "Empresa y contactos"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "¡Seleccione un cliente para este contrato %s!"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Tiene que seleccionar un Proveedor para el contrato %s!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Debe revisar las fechas de inicio y de fin\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "Debe especificar un cliente para el contrato '%s'"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "Debe suministrar una fecha de inicio para el contrato '%s'"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Mostrar facturas recurrentes"
diff --git a/contract/i18n/es_AR.po b/contract/i18n/es_AR.po
index 1879bbf1..516d5904 100644
--- a/contract/i18n/es_AR.po
+++ b/contract/i18n/es_AR.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Última actualización el"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_CO.po b/contract/i18n/es_CO.po
index eeb30ac3..c2cf53bb 100644
--- a/contract/i18n/es_CO.po
+++ b/contract/i18n/es_CO.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_CR.po b/contract/i18n/es_CR.po
index d1141888..f966cdef 100644
--- a/contract/i18n/es_CR.po
+++ b/contract/i18n/es_CR.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Ultima actualización en"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_DO.po b/contract/i18n/es_DO.po
index 8780f9b3..35ba1618 100644
--- a/contract/i18n/es_DO.po
+++ b/contract/i18n/es_DO.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_EC.po b/contract/i18n/es_EC.po
index 5819059a..24d71431 100644
--- a/contract/i18n/es_EC.po
+++ b/contract/i18n/es_EC.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_ES.po b/contract/i18n/es_ES.po
index 39fdaf88..3d8f2e3e 100644
--- a/contract/i18n/es_ES.po
+++ b/contract/i18n/es_ES.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Última actualización en"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_MX.po b/contract/i18n/es_MX.po
index fbd485bf..d3c84ee2 100644
--- a/contract/i18n/es_MX.po
+++ b/contract/i18n/es_MX.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Cuenta analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +327,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Ultima actualización en"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1012,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1086,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1115,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_PY.po b/contract/i18n/es_PY.po
index e834a55f..dec85d54 100644
--- a/contract/i18n/es_PY.po
+++ b/contract/i18n/es_PY.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/es_VE.po b/contract/i18n/es_VE.po
index 65ceafed..682f4899 100644
--- a/contract/i18n/es_VE.po
+++ b/contract/i18n/es_VE.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Ultima actualización en"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nombre"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/et.po b/contract/i18n/et.po
index 27d732b7..139bf8a8 100644
--- a/contract/i18n/et.po
+++ b/contract/i18n/et.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
-msgstr "Loodud"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr "Loodud"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nimi"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1007,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1081,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1110,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/eu.po b/contract/i18n/eu.po
index 7466b18c..bac6ea64 100644
--- a/contract/i18n/eu.po
+++ b/contract/i18n/eu.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Izena"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1007,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1081,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1110,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/fa.po b/contract/i18n/fa.po
index 9a36bf24..dee38973 100644
--- a/contract/i18n/fa.po
+++ b/contract/i18n/fa.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "شناسه"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "آخرین به روز رسانی در"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "آخرین به روز رسانی توسط"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/fi.po b/contract/i18n/fi.po
index e94109d1..095a8727 100644
--- a/contract/i18n/fi.po
+++ b/contract/i18n/fi.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analyyttinen tili"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +326,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Luotu"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Kuvaus"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Viimeksi päivitetty"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivittänyt"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nimi"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Tuote"
 
@@ -530,41 +1011,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Määrä"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1085,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1114,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Mittayksikkö"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po
index 7b40bd14..4c583b59 100644
--- a/contract/i18n/fr.po
+++ b/contract/i18n/fr.po
@@ -92,8 +92,8 @@ msgstr ""
 "       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
 "       &nbsp;&nbsp;Contract: <strong>${object.name}</strong><br />\n"
 "       % if object.date_start:\n"
-"       &nbsp;&nbsp;Date de début de contrat: ${object.date_start or ''}<br />"
-"\n"
+"       &nbsp;&nbsp;Date de début de contrat: ${object.date_start or ''}<br /"
+">\n"
 "       % endif\n"
 "\n"
 "       % if object.user_id:\n"
@@ -107,8 +107,8 @@ msgstr ""
 "    </p>\n"
 "\n"
 "    <br/>\n"
-"    <p>Si vous avez la moindre question, n'hésitez pas à nous contacter.</p>"
-"\n"
+"    <p>Si vous avez la moindre question, n'hésitez pas à nous contacter.</"
+"p>\n"
 "    <p>Merci de choisir ${object.company_id.name or 'us'}!</p>\n"
 "    <br/>\n"
 "    <br/>\n"
@@ -117,14 +117,14 @@ msgstr ""
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
 "#DDD;\">\n"
-"            <strong style=\"text-transform:uppercase;\""
-">${object.company_id.name}</strong></h3>\n"
+"            <strong style=\"text-transform:uppercase;\">${object.company_id."
+"name}</strong></h3>\n"
 "    </div>\n"
 "    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
 "16px; background-color: #F2F2F2;\">\n"
 "        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"            ${object.company_id.partner_id.sudo().with_context(show_address="
-"True, html_format=True).name_get()[0][1] | safe}\n"
+"            ${object.company_id.partner_id.sudo()."
+"with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"
 "            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
@@ -135,8 +135,8 @@ msgstr ""
 "        % endif\n"
 "        % if object.company_id.website:\n"
 "            <div>\n"
-"                Site web: <a href=\"${object.company_id.website}\""
-">${object.company_id.website}</a>\n"
+"                Site web: <a href=\"${object.company_id.website}\">${object."
+"company_id.website}</a>\n"
 "            </div>\n"
 "        %endif\n"
 "        <p></p>\n"
@@ -150,14 +150,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrat (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Date de fin de la période de facturation"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Date de début de la période de facturation"
 
@@ -168,7 +184,9 @@ msgstr "<strong>Contrat: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Date de début: </strong>"
 
 #. module: contract
@@ -212,48 +230,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prix unitaire</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "Compte analytique du contrat"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Générer factures récurrente pour les contrats"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Ligne du compte analytique"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Compte analytique"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Prix automatique?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Cliquer pour créer un nouveau modèle de contrat."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Cliquer pour créer un nouveau contrat."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Entreprise"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "Rédiger courriel"
@@ -265,154 +392,294 @@ msgstr "Contact"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contrat"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "Le contrat '%s' ne peut pas démarrer après la date de fin"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Ligne de contrat"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Ligne de contrat"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Type de contrat"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Modèle de contrat"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Modèle de contrat"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Modèle de contrat"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Modèle de contrat"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Type de contrat"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "Le contrat '%s' ne peut pas démarrer après la date de fin"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Ligne de contrat"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Modèle de contrat"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contrats"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Créer une facture visible"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Créer les factures"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Date"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Récurrence"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Client"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Contrat client"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Date de fin"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Date depuis"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Date de début"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Date jusqu'à"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Date depuis la période de facturation"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Date de la prochaine facture"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Date jusqu'à la période de facturation"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Jour(s)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Description"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Remise (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Remise doit être inférieur ou égale à 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -421,44 +688,90 @@ msgstr ""
 "à 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nom à afficher"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Finis"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Générer factures récurrente pour les contrats"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Générer les factures récurrentes automatiquement"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Grouper par..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Grouper par..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -467,125 +780,334 @@ msgstr ""
 "Si c'est le marché, le prix sera obtenu automatiquement de la liste de prix "
 "des produits. Sinon, Il vous sera possible de les saisir manuellement"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Facture"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Facture"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Facture"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Ligne de facture"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Répéter chaque (Jours/Semaine/Mois/Année)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Factures"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Type de facture"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Type de facture"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Journal"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Date de la prochaine facture"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 "Légende (pour les marqueurs dans la description des lignes de facturation)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mois"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Dernier jour du mois"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nom"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Prochaine facture"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Prochaine facture"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contrat"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Partenaire (Toujours faux)"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "Partenaires et personnes à charge"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Date de début"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Sil vous plait définissez %s un journal pour l'entreprise '%s'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Port payé"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pré payé"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Ligne de contrat"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Liste de prix"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Article"
 
@@ -597,41 +1119,82 @@ msgid "Purchase Contracts"
 msgstr "Contrats d'achat"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Quantité"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Récurrence"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Factures récurrentes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Récurrence"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Ligne de contrat"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Répéter Chaque"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Répéter chaque (Jours/Semaine/Mois/Année)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Responsable"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Responsable"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -640,19 +1203,21 @@ msgid "Sale Contracts"
 msgstr "Contrats de vente"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "Envoyé par courriel"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Séquence"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Séquence d'affichage de la ligne du contrat"
 
@@ -667,140 +1232,370 @@ msgid "Show the sale contracts for this partner"
 msgstr "Montrer les contrats de vente de ce partenaire"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Prix spécifique"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 "Spécifier l'intervalle pour la génération des facturations automatiques."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+"Spécifier l'intervalle pour la génération des facturations automatiques."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 "Préciser si la date de génération est 'depuis' ou 'jusqu'à' la date de "
 "facturation"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Sous-total"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Ligne de contrat"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Fournisseur"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Contrats de fournisseur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Prix Unitaire"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unité de Mesure"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "TVA  :"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Valide"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Semaine(s)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Année(s)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, 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:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 "Vous ne pouvez pas avoir la prochaine date de facturation avant la date de "
 "début de contrat  '%s'."
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Vous devez sélectionner un client pour le contrat %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Vous devez sélectionner un  fournisseur pour ce contrat %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Vous devez revoir les dates de début et de fin!\n"
-"%s"
+"Vous ne pouvez pas avoir la prochaine date de facturation avant la date de "
+"début de contrat  '%s'."
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "Vous devez fournir un client pour le contrat '%s'"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"Vous ne pouvez pas avoir la prochaine date de facturation avant la date de "
+"début de contrat  '%s'."
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr ""
 "Vous devez fournir la date de prochaine facturation pour le contrat '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "Vous devez fournir une date de début pour le contrat '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Contrats de vente"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Compte analytique du contrat"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Montrer les factures récurrentes"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Ligne du compte analytique"
+
+#~ msgid "Date From"
+#~ msgstr "Date depuis"
+
+#~ msgid "Date To"
+#~ msgstr "Date jusqu'à"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Date depuis la période de facturation"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Date jusqu'à la période de facturation"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Générer les factures récurrentes automatiquement"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "Partenaires et personnes à charge"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Vous devez sélectionner un client pour le contrat %s!"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Vous devez sélectionner un  fournisseur pour ce contrat %s!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Vous devez revoir les dates de début et de fin!\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "Vous devez fournir un client pour le contrat '%s'"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "Vous devez fournir une date de début pour le contrat '%s'"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Montrer les factures récurrentes"
diff --git a/contract/i18n/fr_CA.po b/contract/i18n/fr_CA.po
index 7502c221..34a9521e 100644
--- a/contract/i18n/fr_CA.po
+++ b/contract/i18n/fr_CA.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "Identifiant"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Dernière mise à jour le"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nom"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/fr_CH.po b/contract/i18n/fr_CH.po
index 07735d2e..d77c4bbc 100644
--- a/contract/i18n/fr_CH.po
+++ b/contract/i18n/fr_CH.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Modifié le"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Modifié par"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/gl.po b/contract/i18n/gl.po
index 71727044..9ad42e89 100644
--- a/contract/i18n/gl.po
+++ b/contract/i18n/gl.po
@@ -147,14 +147,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrato (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Data fin do periodo facturado"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Data inicio do periodo facturado"
 
@@ -165,7 +181,9 @@ msgstr "<strong>Contrato: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Data de inicio: </strong>"
 
 #. module: contract
@@ -209,48 +227,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prezo unidade</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "Contratos Conta Analítica"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Ver líneas contables analíticas"
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Xerar facturas recorrentes desde os contratos"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Conta analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "¿Prezo automático?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Pulse para crear un novo modelo de contrato."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Pulse para crear un contrato novo."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Compañía"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "Compoñer correo electrónico"
@@ -262,154 +389,294 @@ msgstr "Contacto"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "A data de inicio do contrato '%s' non pode ser superior á data de fin"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Líneas de contrato"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Líneas de contrato"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Tipos de contrato"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Modelo de contrato"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Modelo de contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Modelos de contrato"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Modelos de contrato"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Tipos de contrato"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "A data de inicio do contrato '%s' non pode ser superior á data de fin"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Modelos de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Visibilidade de crear factura"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Crear facturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Recorrencia"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Cliente"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Contratos de cliente"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Data fin"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Data inicio"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Data de inicio"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Data fin"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Data do periodo facturado"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Próxima data de factura"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Data do periodo facturado"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Día(s)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Descrición"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto debería de ser menor ou igual a 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -418,44 +685,90 @@ msgstr ""
 "100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nome amosado"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Rematado"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Xerar facturas recorrentes desde os contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Xerar facturas recorrentes automaticamente"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Agrupar por..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -464,124 +777,333 @@ msgstr ""
 "Se está marcado, o prezo obterase automaticamente aplicando a tarifa ao "
 "producto. Se non, poderá introducir un prezo manual"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Factura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Factura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Factura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Liñas de factura"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Repetir cada (días/semana/mes/ano)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Facturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tipo de facturación"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tipo de facturación"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Diario"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Próxima data de factura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Modificado por última vez o"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "ültima actualización por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Lenda (para os marcadores dentro da descrición das liñas de factura)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mes(es)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Mes(es) último día"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nome"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Factura seguinte"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Factura seguinte"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Empresa (Sempre falso)"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "Empresa e contactos"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Data de inicio"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, 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'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Post-pago"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pre-pago"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Lista de prezos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Produto"
 
@@ -593,41 +1115,82 @@ msgid "Purchase Contracts"
 msgstr "Contratos de compras"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Cantidade"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Recorrencia"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Facturas recorrentes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Recorrencia"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Repetir cada"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Repetir cada (días/semana/mes/ano)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Responsable"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Responsable"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -636,19 +1199,21 @@ msgid "Sale Contracts"
 msgstr "Contratos de vendas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "Enviar por correo electrónico"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Secuencia da liña de contrato cando se mostra nos contratos"
 
@@ -663,136 +1228,365 @@ msgid "Show the sale contracts for this partner"
 msgstr "Amosa os contratos de vendas para esta empresa/contacto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Prezo específico"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Especifica o intervalo para a xeración de facturas automática."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Especifica o intervalo para a xeración de facturas automática."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr "Especifica se a data do proceso é dende ou ata a data de facturación"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Subtotal"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Líneas de contrato"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Proveedor"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Contratos do proveedor"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Prezo unidade"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unidade de medida"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "NIF:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Válido"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Semana(s)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, 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:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 "Non pode ter unha data para a seguinte factura anterior á data de inicio do "
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Seleccione un cliente para este contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Ten que seleccionar un proveedor para o contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Debe revisar as datas de inicio e de fin\n"
-"%s"
+"Non pode ter unha data para a seguinte factura anterior á data de inicio do "
+"contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "Debe especificar un cliente para o contrato '%s'"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"Non pode ter unha data para a seguinte factura anterior á data de inicio do "
+"contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr "Debe fornecer unha data de próxima factura para o contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "Debe fornecer unha data de inicio para o contrato '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Contratos de vendas"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "'account.analytic.invoice.line'"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Contratos Conta Analítica"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Mostrar facturas recorrentes"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Ver líneas contables analíticas"
+
+#~ msgid "Date From"
+#~ msgstr "Data inicio"
+
+#~ msgid "Date To"
+#~ msgstr "Data fin"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Data do periodo facturado"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Data do periodo facturado"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Xerar facturas recorrentes automaticamente"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "Empresa e contactos"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Seleccione un cliente para este contrato %s!"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Ten que seleccionar un proveedor para o contrato %s!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Debe revisar as datas de inicio e de fin\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "Debe especificar un cliente para o contrato '%s'"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "Debe fornecer unha data de inicio para o contrato '%s'"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "'account.analytic.invoice.line'"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Mostrar facturas recorrentes"
diff --git a/contract/i18n/gl_ES.po b/contract/i18n/gl_ES.po
index fd248c14..b666877b 100644
--- a/contract/i18n/gl_ES.po
+++ b/contract/i18n/gl_ES.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/he.po b/contract/i18n/he.po
index ba2508f6..74d71c1a 100644
--- a/contract/i18n/he.po
+++ b/contract/i18n/he.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "נוצר על ידי"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "מזהה"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "עודכן לאחרונה על"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על ידי"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/hi_IN.po b/contract/i18n/hi_IN.po
index fc3a32da..8d112f62 100644
--- a/contract/i18n/hi_IN.po
+++ b/contract/i18n/hi_IN.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: code:addons/contract/models/contract_line.py:321
+#, python-format
+msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: code:addons/contract/models/contract_line.py:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "विश्लेषणात्मक खाता"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,324 +327,702 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "अनुबंध"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "अनुबंध टेम्पलेट"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "अनुबंध टेम्पलेट"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Lines"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "अनुबंध टेम्पलेट"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "अनुबंध"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract template lines"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "अनुबंध"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "द्वारा बनाया गया"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "को निर्मित"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "अनुबंध"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "दिन()"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "विवरण"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "छूट (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "आईडी"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "बीजक"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "बीजक"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "बीजक"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Line"
+msgstr "बीजक"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "चालान"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "पत्रिका"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "अंतिम बार अद्यतन किया गया"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "अंतिम बार संशोधित"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "द्वारा अंतिम अद्यतन"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "अंतिम बार अद्यतन किया गया"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "माह(महीने)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "नाम"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "अनुबंध"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "अनुबंध"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "प्रोडक्ट"
 
@@ -534,41 +1035,73 @@ msgid "Purchase Contracts"
 msgstr "अनुबंध"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "संख्या"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "अनुबंध"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -578,19 +1111,21 @@ msgid "Sale Contracts"
 msgstr "अनुबंध"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -605,133 +1140,301 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "उप कुल"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "अनुबंध"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "अनुबंध"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "यूनिट मूल्य"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "माप की इकाई"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "अनुबंध"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr ""
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po
index d46761c4..b7d5b8ce 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#KRAJ#</strong>: Završni datum obračunatog perioda"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Početni datum obračunatog perioda"
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,49 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-#, fuzzy
-msgid "Account Analytic Contract"
-msgstr "Stavke analitike"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, python-format
+msgid "A contract line with a successor can't be set to auto-renew"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Stavke analitike"
+#: code:addons/contract/models/contract_line.py:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analitički konto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Kliknite za kreiranje novog ugovora."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,156 +327,287 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Ugovor"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Ugovor"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Ugovor"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Ugovor"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+msgid "Contract Template Line"
+msgstr "Ugovor"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+msgid "Contract Template Lines"
+msgstr "Ugovor"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Ugovor"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+msgid "Contract template lines"
+msgstr "Ugovor"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Kreiraj račune"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Datum sljedećeg računa"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Dan(a)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Opis"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popusti bi trebali biti manji ili jednaki 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -363,168 +616,418 @@ msgstr ""
 "jednak 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Naziv "
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Automatski generira ponavljajuće račune"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Grupiraj po..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Račun"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Račun"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Račun"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Stavke računa"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Računi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Vrsta izdavanja računa"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Vrsta izdavanja računa"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Datum sljedećeg računa"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažuriranje"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Legenda ( za markere unutar opisa stavaka računa)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mjesec(i)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Mjesec(i) zadnji dan"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Sljedeći račun"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Sljedeći račun"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Ugovor"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Cjenik"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Proizvod"
 
@@ -537,41 +1040,75 @@ msgid "Purchase Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Ponavljajući računi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Ponovi svakih"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -581,19 +1118,21 @@ msgid "Sale Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -608,133 +1147,311 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Ugovori"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Jedinica mjere"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Tjedan(i)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Godina(e)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
-msgid "You must first select a Customer for Contract %s!"
+msgid ""
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Ugovori"
 
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
+#, fuzzy
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Stavke analitike"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Stavke analitike"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr ""
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Automatski generira ponavljajuće račune"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po
index 5977c105..40e1aba0 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#KRAJ#</strong>: Krajnji datum perioda računa"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#POČETAK#</strong>: Početni datum perioda računa"
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,49 +168,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-#, fuzzy
-msgid "Account Analytic Contract"
-msgstr "account.analytic.contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Stavke analitičkog dnevnika"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Konto analitike"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Kliknite za kreiranje novog predloška ugovora"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Kliknite za kreiranje novog ugovora."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -206,156 +328,292 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Ugovor"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Predložak ugovora"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Predložak ugovora"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Predložak ugovora"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Predložak ugovora"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Predložak ugovora"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Predlošci ugovora"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Predlošci ugovora"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Predložak ugovora"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Predlošci ugovora"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Kreiraj račune"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Ponavljanje"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Datum sljedećeg računa"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Dan(a)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Opis"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popust treba biti manji ili jednak 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -364,168 +622,420 @@ msgstr ""
 "ili jednak 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Generiraj ponavljajuće račune automatski"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Grupiraj po..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Račun"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Račun"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Račun"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Stavke računa"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Ponavljaj svakih (Dana/Tjedana/Mjesec/Godina)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Računi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tip izdavanja računa"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tip izdavanja računa"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Datum sljedećeg računa"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Kazalo (za markere unutar opisa stavaka računa)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mjesec(i)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Mjesec(i) zadnji dan"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Sljedeći račun"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Sljedeći račun"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Ugovor"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, fuzzy, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Plaćanje po isporuci"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Avansno plaćanje"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Cjenik"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Proizvod"
 
@@ -538,41 +1048,79 @@ msgid "Purchase Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Ponavljajući računi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Ponavljanje"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Ugovori"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Ponovi svakih"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Ponavljaj svakih (Dana/Tjedana/Mjesec/Godina)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -582,19 +1130,21 @@ msgid "Sale Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -609,133 +1159,323 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Odredite interval za automatsko generiranje računa."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Odredite interval za automatsko generiranje računa."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr "Navedite da li je datum obrade 'od' ili 'do' datuma računa"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Podzbroj"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Ugovori"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Ugovori"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Jedinična cijena"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Jedinica mjere"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Tjedan(a)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Godina(e)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Prvo morate odabrati partnera za Ugovor %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, fuzzy, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Prvo morate odabrati partnera za Ugovor %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Ugovori"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Prikaži ponavljajuće račune"
+#, fuzzy
+#~ msgid "Account Analytic Contract"
+#~ msgstr "account.analytic.contract"
+
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Stavke analitičkog dnevnika"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Generiraj ponavljajuće račune automatski"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Prvo morate odabrati partnera za Ugovor %s!"
+
+#, fuzzy
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Prvo morate odabrati partnera za Ugovor %s!"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Prikaži ponavljajuće račune"
diff --git a/contract/i18n/hu.po b/contract/i18n/hu.po
index f1390298..e57c104d 100644
--- a/contract/i18n/hu.po
+++ b/contract/i18n/hu.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analitikus gyűjtőkód könyvelés"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +326,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "Azonosító ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Utoljára frissítve ekkor"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítve, által"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve ekkor"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Név"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1011,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1085,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1114,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/id.po b/contract/i18n/id.po
index 3dbe12ef..7ed66d36 100644
--- a/contract/i18n/id.po
+++ b/contract/i18n/id.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Diperbaharui pada"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Diperbaharui oleh"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nama"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/it.po b/contract/i18n/it.po
index 1706f703..f6dd8b3e 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "Contratto ${object.company_id.name} (Rif. ${object.name or 'n/d'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: data finale del periodo fatturato"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: data iniziale del periodo fatturato"
 
@@ -107,7 +123,9 @@ msgstr "<strong>Contratto: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Data inizio: </strong>"
 
 #. module: contract
@@ -151,48 +169,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prezzo unitario</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "Contratto analitico del conto"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Righe analitiche del conto"
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Conto analitico"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Prezzo automatico?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Fare clic per creare un nuovo modello di contratto."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Fare clic per creare un nuovo contratto."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Azienda"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,156 +329,296 @@ msgstr "Contatto"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contratto"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
-"La data iniziale del contratto \"%s\" non può essere successiva alla data "
-"finale"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Righe contratto"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Righe contratto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Tipo contratto"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Modello di contratto"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Modello di contratto"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Modelli di contratto"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Modelli di contratto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Tipo contratto"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr ""
+"La data iniziale del contratto \"%s\" non può essere successiva alla data "
+"finale"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Righe contratto"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Modelli di contratto"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contratti"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Crea fatture"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creato il"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Ricorrenza"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Cliente"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Contratti cliente"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Data finale"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Dalla data"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Data iniziale"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Alla data"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Data dal periodo fatturato"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Data prossima fattura"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Data al periodo fatturato"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Giorni"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Descrizione"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Sconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Lo sconto dovrebbe essere minore o uguale a 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -361,169 +626,424 @@ msgstr ""
 "Sconto applicato alle fatture generate. Dovrebbe essere minore o uguale a 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Genera automaticamente fatture ricorrenti"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Raggruppa per..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Fattura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Fattura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Fattura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Righe fattura"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Ripeti ogni (giorno/settimana/mese/anno)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Fatture"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tipo fatturazione"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tipo fatturazione"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Registro"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Data prossima fattura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ultimo aggiornamento di"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Ultimo aggiornamento il"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 "Legenda (per i marcatori all'interno della descrizione delle righe fattura)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mesi"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Ultimo giorno del mese"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nome"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Fattura successiva"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Fattura successiva"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contratto"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Partner (sempre \"Falso\")"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Data iniziale"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Definire un registro vendite per l'azienda \"%s\"."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Post-pagata"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pre-pagata"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Righe contratto"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Listino prezzi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Prodotto"
 
@@ -535,41 +1055,82 @@ msgid "Purchase Contracts"
 msgstr "Contratti di acquisto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Quantità"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Fatture ricorrenti"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Ricorrenza"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Righe contratto"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Ripeti ogni"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Ripeti ogni (giorno/settimana/mese/anno)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Responsabile"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Responsabile"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -578,19 +1139,21 @@ msgid "Sale Contracts"
 msgstr "Contratti di vendita"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Sequenza di riga durante la visualizzazione dei contratti"
 
@@ -605,134 +1168,336 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Specificare l'intervallo per la generazione automatica delle fatture"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Specificare l'intervallo per la generazione automatica delle fatture"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 "Specificare se la data di elaborazione è \"dalla\" o \"alla\" data di "
 "fatturazione"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Sub totale"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Righe contratto"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Fornitore"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Contratti fornitore"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Prezzo unitario"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unità di misura"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "IVA:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
-msgstr "Settimane"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
-msgstr "Anni"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
+msgstr "Settimane"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Prima è necessario selezionare un cliente per il contratto %s."
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
+msgstr "Anni"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Prima è necessario selezionare un fornitore per il contratto %s."
+msgid "You can't delay a contract line invoiced at least one time."
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Contratti di vendita"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Mostra fatture ricorrenti"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Contratto analitico del conto"
+
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Righe analitiche del conto"
+
+#~ msgid "Date From"
+#~ msgstr "Dalla data"
+
+#~ msgid "Date To"
+#~ msgstr "Alla data"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Data dal periodo fatturato"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Data al periodo fatturato"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Genera automaticamente fatture ricorrenti"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Prima è necessario selezionare un cliente per il contratto %s."
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Prima è necessario selezionare un fornitore per il contratto %s."
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Mostra fatture ricorrenti"
diff --git a/contract/i18n/ja.po b/contract/i18n/ja.po
index a0037a4d..594f2709 100644
--- a/contract/i18n/ja.po
+++ b/contract/i18n/ja.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "作成者"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "作成日"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "最終更新日"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "名前"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/ko.po b/contract/i18n/ko.po
index c0d89ef9..75227d30 100644
--- a/contract/i18n/ko.po
+++ b/contract/i18n/ko.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "작성자"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "작성일"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "최근 갱신 날짜"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/lt.po b/contract/i18n/lt.po
index 41062810..96d023cd 100644
--- a/contract/i18n/lt.po
+++ b/contract/i18n/lt.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Paskutinį kartą atnaujinta"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Paskutini kartą atnaujino"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/lt_LT.po b/contract/i18n/lt_LT.po
index ef60add4..fd9cd145 100644
--- a/contract/i18n/lt_LT.po
+++ b/contract/i18n/lt_LT.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,48 +168,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,322 +326,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Paskutinį kartą atnaujinta"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -532,41 +1011,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -575,19 +1085,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -602,132 +1114,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/lv.po b/contract/i18n/lv.po
index 760b16bf..e19c160f 100644
--- a/contract/i18n/lv.po
+++ b/contract/i18n/lv.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Pēdējās izmaiņas"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nosaukums"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/mk.po b/contract/i18n/mk.po
index bee35847..23dadc59 100644
--- a/contract/i18n/mk.po
+++ b/contract/i18n/mk.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Последно ажурирање на"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Име"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/mn.po b/contract/i18n/mn.po
index 538a31bb..9c053031 100644
--- a/contract/i18n/mn.po
+++ b/contract/i18n/mn.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Үүсгэгч"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн огноо"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Сүүлийн засвар хийсэн огноо"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлийн засвар хийсэн"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Нэр"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/nb.po b/contract/i18n/nb.po
index cb8e8bb0..5092cd4d 100644
--- a/contract/i18n/nb.po
+++ b/contract/i18n/nb.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Opprettet"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Sist oppdatert"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Navn"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/nb_NO.po b/contract/i18n/nb_NO.po
index 4b8cd9a4..6a67234a 100644
--- a/contract/i18n/nb_NO.po
+++ b/contract/i18n/nb_NO.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Laget av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Laget den"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Sist oppdatert den"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po
index 4e1a2a10..f9727a3e 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -150,14 +150,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contract (Ref ${object.name or 'n/b'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Einddatum van de facturatieperiode"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Startdatum van de facturatie periode"
 
@@ -168,7 +184,9 @@ msgstr "<strong>Contract: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Start Datum: </strong>"
 
 #. module: contract
@@ -212,49 +230,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prijs per eenheid</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
 #, fuzzy
-msgid "Account Analytic Contract"
-msgstr "Kostenplaatsenboekingen"
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Genereer terugkerende facturen van contracten"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Kostenplaatsenboekingen"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Kostenplaats"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Automatische-prijs?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Klik om een nieuwe contractsjabloon te maken."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Klik voor het aanmaken van een nieuw contract."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Bedrijf"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "Email opstellen"
@@ -266,156 +392,295 @@ msgstr "Contactpersoon"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contract"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "Contract '%s' start datum kan niet later zijn dan eind datum"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Contract Regels"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Contract Regels"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Contract Sjabloon"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Contract Sjabloon"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Contract Sjabloon"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Contract Sjablonen"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Contract Sjablonen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Contract Sjabloon"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "Contract '%s' start datum kan niet later zijn dan eind datum"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Contract Regels"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Contract Sjablonen"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Facturen aanmaken"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Herhaling"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Eind datum"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Begin datum"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Start datum"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Tot datum"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Datum van gefactureerde periode"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Datum volgende factuur"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Datum tot gefactureerde periode"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Dag(en)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Omschrijving"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Korting (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "De korting moet kleiner of gelijk aan 100 zijn"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -424,44 +689,90 @@ msgstr ""
 "kleiner of gelijk naan 100 zijn"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Weergave naam"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Voltooid"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Genereer terugkerende facturen van contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Periodieke facturering"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Groepeer op..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Groepeer op..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -471,124 +782,333 @@ msgstr ""
 "prijslijst op het product toe te passen. Zo niet, dan kunt u een handmatige "
 "prijs invoeren"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Factuur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Factuur"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Factuur"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Sjablonen factuurregels"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Herhaal elke (dag/week/maand/jaar)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Facturen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Factuur soort"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Factuur soort"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Dagboek"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Datum volgende factuur"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Laatste bijgewerkt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Legenda (voor de markeringen binnen een factuurregel omschrijving)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Maand(en)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Maand(en) laatste dag"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naam"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Volgende factuur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Volgende factuur"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contract"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Start datum"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, fuzzy, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "U dient een verkoopboek te definiëren voor het bedrijf '%s'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Post-paid"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pre-paid"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Contract Regels"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Prijslijst"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Product"
 
@@ -601,41 +1121,82 @@ msgid "Purchase Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Herhaling"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Periodieke facturen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Herhaling"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Contract Regels"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Herhaal elke"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Herhaal elke (dag/week/maand/jaar)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Verantwoordelijke"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -645,19 +1206,21 @@ msgid "Sale Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "Verzenden via e-mail"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Reeks"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Volgorde van de contractregel bij het weergeven van contracten"
 
@@ -674,137 +1237,362 @@ msgid "Show the sale contracts for this partner"
 msgstr "Toon de contracten voor deze relatie"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Specifieke prijs"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Specificeer het interval voor het aanmaken van de herhalende facturen."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Specificeer het interval voor het aanmaken van de herhalende facturen."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 "Specificeer als de verwerkingsdatum de 'van' of  't/m' factuur datum is"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Subtotaal"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Contract Regels"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Prijs per eenheid"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Maateenheid"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "BTW:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Geldig"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Week/weken"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Jaar"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
-"U kunt geen volgende factuurdatum vóór het begin van het contract '%s' hebben"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Er moet eerst een klant worden ingesteld op contract %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:433
 #, fuzzy, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Er moet eerst een klant worden ingesteld op contract %s!"
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
+msgstr ""
+"U kunt geen volgende factuurdatum vóór het begin van het contract '%s' hebben"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Controller de start en eind datum!\n"
-"%s"
+"U kunt geen volgende factuurdatum vóór het begin van het contract '%s' hebben"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "U moet een klant voor het contract opgeven '%s'"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"U kunt geen volgende factuurdatum vóór het begin van het contract '%s' hebben"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr "U moet een volgende factuurdatum opgeven voor contract '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "U moet een start datum opgeven voor contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Contracten"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#, fuzzy
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Kostenplaatsenboekingen"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Laat herhaalde facturen zien"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Kostenplaatsenboekingen"
+
+#~ msgid "Date From"
+#~ msgstr "Begin datum"
+
+#~ msgid "Date To"
+#~ msgstr "Tot datum"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Datum van gefactureerde periode"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Datum tot gefactureerde periode"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Periodieke facturering"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Er moet eerst een klant worden ingesteld op contract %s!"
+
+#, fuzzy
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Er moet eerst een klant worden ingesteld op contract %s!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Controller de start en eind datum!\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "U moet een klant voor het contract opgeven '%s'"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "U moet een start datum opgeven voor contract '%s'"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Laat herhaalde facturen zien"
diff --git a/contract/i18n/nl_BE.po b/contract/i18n/nl_BE.po
index 9df646c7..5a267002 100644
--- a/contract/i18n/nl_BE.po
+++ b/contract/i18n/nl_BE.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Gemaakt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Gemaakt op"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Laatst bijgewerkt op"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naam"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/nl_NL.po b/contract/i18n/nl_NL.po
index 06d123ad..a02bd7c6 100644
--- a/contract/i18n/nl_NL.po
+++ b/contract/i18n/nl_NL.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,324 +325,702 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contract"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Contractsjabloon"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Contractsjabloon"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Contractsjabloon"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Contractsjabloon"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Contractsjabloon"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Lines"
+msgstr "Contractsjabloon"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Contractsjabloon"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Contracten"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract template lines"
+msgstr "Contractsjabloon"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Factuur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Factuur"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Factuur"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Line"
+msgstr "Factuur"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Facturen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Laatst bijgewerkt op"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Laatst aangepast op"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naam"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contract"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Contracten"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -534,41 +1033,73 @@ msgid "Purchase Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Contracten"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -578,19 +1109,21 @@ msgid "Sale Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -605,133 +1138,298 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Contracten"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Contracten"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr ""
-
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Contracten"
diff --git a/contract/i18n/pl.po b/contract/i18n/pl.po
index 439baadc..e37c5025 100644
--- a/contract/i18n/pl.po
+++ b/contract/i18n/pl.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,48 +168,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,322 +326,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Utworzone przez"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Data utworzenia"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Data ostatniej modyfikacji"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio modyfikowane przez"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Data ostatniej modyfikacji"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nazwa"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -532,41 +1011,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -575,19 +1085,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -602,132 +1114,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po
index aa2eb35e..aec9a17c 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -151,14 +151,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrato (Refª ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Data final do período de faturação"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Data inicial do período de faturação"
 
@@ -169,7 +185,9 @@ msgstr "<strong>Contrato: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Data Inicial: </strong>"
 
 #. module: contract
@@ -213,48 +231,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Preço Unitário</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "Contrato Analítico da Conta"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Linhas de Conta Analítica"
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Gerar Faturas Recorrentes a partir dos Contratos"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Conta Analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Preço-Auto?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Clique para criar um novo modelo de contrato."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Clique para criar um novo contrato."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "Escrever E-mail"
@@ -266,154 +393,294 @@ msgstr "Contacto"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%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"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Linhas de Contrato"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Linhas de Contrato"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "Tipo de Contrato"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Modelo de Contrato"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Modelo de Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Modelos de Contratos"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Modelos de Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "Tipo de Contrato"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "A data de início do contrato '%s' não pode ser posterior à data de fim"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Linhas de Contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Modelos de Contratos"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Visibilidade de Criação de Faturas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Criar faturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Recorrência"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "Cliente"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "Contratos de Clientes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Data de Fim"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "Data de Início"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Data de Início"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "Data de Fim"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "Data inicial do período de faturação"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Data da Próxima Fatura"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "Data final do período de faturação"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Dia(s)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Descrição"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto deve ser igual ou inferior a 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -421,44 +688,90 @@ msgstr ""
 "Desconto que é aplicado nas faturas geradas. Deve ser igual ou inferior a 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Concluído"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Gerar Faturas Recorrentes a partir dos Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Gerar faturas recorrentes automaticamente"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Agrupar Por..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -467,124 +780,333 @@ msgstr ""
 "Se estiver marcado, o preço será obtido automaticamente aplicando a lista de "
 "preços do produto. Caso contrário, poderá introduzir manualmente o preço"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Linha de Fatura"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Repatir a cada (Dia/Semana/Mês/Ano)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Faturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tipo de faturação"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tipo de faturação"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Diário"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Data da Próxima Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Legenda (para a descrição dos marcadores nas linhas de fatura)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mes(es)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Mes(es) no último dia"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nome"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Próxima Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Próxima Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "Parceiro (sempre Falso)"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "Parceiros e dependentes"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Data de Início"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Por favor, defina um diário %s para a empresa '%s'."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Pós-pago"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pré-pago"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Linhas de Contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Lista de Preços"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Produto"
 
@@ -596,41 +1118,82 @@ msgid "Purchase Contracts"
 msgstr "Contratos de Compras"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Recorrência"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Faturas Recorrentes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Recorrência"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Linhas de Contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Repetir a cada"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Repatir a cada (Dia/Semana/Mês/Ano)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Responsável"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Responsável"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -639,19 +1202,21 @@ msgid "Sale Contracts"
 msgstr "Contratos de Vendas"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "Enviar por Email"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Sequência"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "Sequência da linha na visualização de contratos"
 
@@ -666,137 +1231,364 @@ msgid "Show the sale contracts for this partner"
 msgstr "Mostrar os contratos de vendas para este parceiro"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "Preço Específico"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Especifique o intervalo para a geração automática de faturas."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Especifique o intervalo para a geração automática de faturas."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 "Especifique se a data de processamento é 'de' ou 'até' relativamente à data "
 "da fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Subtotal"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Linhas de Contrato"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "Fornecedor"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "Contratos de Fornecedores"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Preço Unitário"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unidade de Medida"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "IVA:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Válido"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Semana(s)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
-"Não pode ter uma data da próxima fatura anterior à do próprio contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Deve primeiro selecionar um Cliente para o Contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Deve primeiro selecionar um Fornecedor para o Contrato %s!"
+#: code:addons/contract/models/contract_line.py:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
+msgstr ""
+"Não pode ter uma data da próxima fatura anterior à do próprio contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
-"Tem que rever as datas de início e fim!\n"
-"%s"
+"Não pode ter uma data da próxima fatura anterior à do próprio contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "Tem que indicar um cliente para o contrato '%s'"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr ""
+"Não pode ter uma data da próxima fatura anterior à do próprio contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr "Tem que indicar a próxima data de faturação para o contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "Tem que indicar uma data de início para o contrato '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "Contratos de Vendas"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Contrato Analítico da Conta"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Mostrar faturas recorrentes"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Linhas de Conta Analítica"
+
+#~ msgid "Date From"
+#~ msgstr "Data de Início"
+
+#~ msgid "Date To"
+#~ msgstr "Data de Fim"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "Data inicial do período de faturação"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "Data final do período de faturação"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Gerar faturas recorrentes automaticamente"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "Parceiros e dependentes"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Deve primeiro selecionar um Cliente para o Contrato %s!"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Deve primeiro selecionar um Fornecedor para o Contrato %s!"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tem que rever as datas de início e fim!\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "Tem que indicar um cliente para o contrato '%s'"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "Tem que indicar uma data de início para o contrato '%s'"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Mostrar faturas recorrentes"
diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po
index e7221810..c65e18b4 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2018-04-27 01:12+0000\n"
 "PO-Revision-Date: 2019-09-03 03:23+0000\n"
 "Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
-"23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrato (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#END#</strong>: Data final do período faturado"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#START#</strong>: Data de início do período faturado"
 
@@ -108,7 +124,9 @@ msgstr "<strong>Contrato: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Data de Início: </strong>"
 
 #. module: contract
@@ -152,48 +170,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Preço Unitário</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Conta analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Clique para criar um novo contrato."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,324 +330,707 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Contrato"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Contrato"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Contrato"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Contrato"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+msgid "Contract Template Line"
+msgstr "Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+msgid "Contract Template Lines"
+msgstr "Contrato"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Contrato"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Contratos"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+msgid "Contract template lines"
+msgstr "Contrato"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Criar faturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Dia da próxima fatura"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Día(s)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Descrição"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Desconto deve ser menor ou igual a 100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr "O desconto aplicado nas faturas geradas. Deve ser menor ou igual a 100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Gerar faturas recorrentes automaticamente"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Agrupar por..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "Identificação"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Linhas da fatura"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Repete cada (Dia/Semana/Mês/Ano)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Faturas"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Tipos de faturamento"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Tipos de faturamento"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Dia da próxima fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Última atualização em"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Mes(es)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Ultimo dia do(s) mes(es)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nome"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Próxima fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Próxima fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Contrato"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Pos-pago"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Pre-pago"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Contratos"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Lista de preço"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Produto"
 
@@ -535,41 +1043,79 @@ msgid "Purchase Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Faturas recorrentes"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Contratos"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Repete cada"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Repete cada (Dia/Semana/Mês/Ano)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "<strong>Responsible: </strong>"
+msgid "Responsible User"
+msgstr "<strong>Responsável: </strong>"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -579,19 +1125,21 @@ msgid "Sale Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -606,133 +1154,313 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Especifique o intervalo para a geração automática da fatura."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Especifique o intervalo para a geração automática da fatura."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Sub total"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Contratos"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Contratos"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Preço unitário"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Unidade de medida"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Semana(s)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, fuzzy, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Contratos"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Mostrar faturas recorrentes"
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Gerar faturas recorrentes automaticamente"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!"
+
+#, fuzzy
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Primeiro você deve selecionar um Cliente para o contrato %s!"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Mostrar faturas recorrentes"
diff --git a/contract/i18n/pt_PT.po b/contract/i18n/pt_PT.po
index fb0c95b5..cd1632f7 100644
--- a/contract/i18n/pt_PT.po
+++ b/contract/i18n/pt_PT.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Contrato (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,48 +168,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Conta Analítica"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,322 +328,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nome a Apresentar"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Atualizado pela última vez em"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação em"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nome"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -532,41 +1013,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -575,19 +1087,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -602,132 +1116,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/ro.po b/contract/i18n/ro.po
index 32bd72b3..1e78bd1a 100644
--- a/contract/i18n/ro.po
+++ b/contract/i18n/ro.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Cont analitic"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +327,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Creat de"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Creat la"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Ultima actualizare la"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizare făcută de"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Nume"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1012,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1086,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1115,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/ru.po b/contract/i18n/ru.po
index 35fe639f..73f8ee97 100644
--- a/contract/i18n/ru.po
+++ b/contract/i18n/ru.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,48 +168,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,324 +326,698 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Договоры"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+msgid "Contract Template Line"
+msgstr "Договоры"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+msgid "Contract Template Lines"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Договоры"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+msgid "Contract template lines"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Договоры"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Создан"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Договоры"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Описание"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Счёт-фактура"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Счёт-фактура"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Счёт-фактура"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Line"
+msgstr "Счёт-фактура"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Счета-фактуры"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Последний раз обновлено"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновлено"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Название"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+msgid "Old Contract"
+msgstr "Договоры"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -535,41 +1030,73 @@ msgid "Purchase Contracts"
 msgstr "Договоры"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Договоры"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -579,19 +1106,21 @@ msgid "Sale Contracts"
 msgstr "Договоры"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -606,133 +1135,298 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Договоры"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Договоры"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr ""
-
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Договоры"
diff --git a/contract/i18n/sk.po b/contract/i18n/sk.po
index 32ceeed5..dabd8880 100644
--- a/contract/i18n/sk.po
+++ b/contract/i18n/sk.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Naposledy upravené"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravil"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravené"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/sk_SK.po b/contract/i18n/sk_SK.po
index 747d35b9..b021be84 100644
--- a/contract/i18n/sk_SK.po
+++ b/contract/i18n/sk_SK.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analytický účet"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +327,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/sl.po b/contract/i18n/sl.po
index 95fae5cf..5777ce75 100644
--- a/contract/i18n/sl.po
+++ b/contract/i18n/sl.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analitični konto"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +327,682 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Ustvaril"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Ustvarjeno"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Opis"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
-msgid "Generate Recurring Invoices from Contracts"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
+msgid "Generate Recurring Invoices from Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Združi po..."
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Združi po..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Zadnjič posodobljeno"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Zadnjič posodobil"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Naziv"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Proizvod"
 
@@ -531,41 +1014,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1088,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1117,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/sr.po b/contract/i18n/sr.po
index 2503dc54..487b4872 100644
--- a/contract/i18n/sr.po
+++ b/contract/i18n/sr.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
-msgstr "Kreiran"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr "Kreiran"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/sr@latin.po b/contract/i18n/sr@latin.po
index 7fab51bf..4654e4eb 100644
--- a/contract/i18n/sr@latin.po
+++ b/contract/i18n/sr@latin.po
@@ -90,14 +90,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,48 +168,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -205,322 +326,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
-msgstr "Kreiran"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr "Kreiran"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -532,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -575,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -602,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/sv.po b/contract/i18n/sv.po
index 101d9984..924fa169 100644
--- a/contract/i18n/sv.po
+++ b/contract/i18n/sv.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Senast uppdaterad"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Namn"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/th.po b/contract/i18n/th.po
index 3d78da69..32bd2db9 100644
--- a/contract/i18n/th.po
+++ b/contract/i18n/th.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "รหัส"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "ชื่อ"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1009,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1083,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1112,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po
index 75fec7f3..19007dd3 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -151,14 +151,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} Sözleşme (Ref ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#SONLANMA#</strong>: Faturalanma dönemin bitiş tarihi"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#BAŞLAMA#</strong>: Faturalanma dönemin başlama tarihi"
 
@@ -169,7 +185,9 @@ msgstr "<strong>Sözleşme: </strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>Başlama Tarihi : </strong>"
 
 #. module: contract
@@ -213,49 +231,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Birim Fiyat</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
 #, fuzzy
-msgid "Account Analytic Contract"
-msgstr "Analitik Hesap Satırı"
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "Sözleşmelerden Tekrarlanan Faturalar Oluşturun"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Analitik Hesap Satırı"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analitik Hesap"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "Otomatik Fiyat?"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "Yeni bir sözleşme şablonu oluşturmak için tıklayın."
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Yeni bir sözleşme oluşturmak için tıklayın."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "Firma"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "E-posta Oluştur"
@@ -267,156 +393,295 @@ msgstr "Kontak"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Sözleşme"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "Sözleşme '%s' başlangıç tarihi, bitiş tarihinden sonra olamaz"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "Sözleşme Satırları"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "Sözleşme Satırları"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Sözleşme Şablonu"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "Sözleşme Şablonu"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "Sözleşme Şablonu"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "Sözleşme Şablonları"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "Sözleşme Şablonları"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Sözleşme Şablonu"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "Sözleşme '%s' başlangıç tarihi, bitiş tarihinden sonra olamaz"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "Sözleşme Satırları"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "Sözleşme Şablonları"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "Fatura Görünürlüğü Oluştur"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Faturalar oluştur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Oluşturuldu"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "Tekrarlayan"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "Sonlanma Tarihi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "Başlama Tarihi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Sonraki Fatura Tarihi"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Gün(ler)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Açıklama"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -424,44 +689,90 @@ msgstr ""
 "Üretilen faturalarda uygulanan indirim. 100'den az veya ona eşit olmalıdır"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Ad Görünümü"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "Sonlanmış"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "Sözleşmelerden Tekrarlanan Faturalar Oluşturun"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Otomatik olarak tekrarlanan faturalar oluştur"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Grupla ..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Grupla ..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
@@ -470,124 +781,333 @@ msgstr ""
 "Bu işaretliyse, Fiyat fiyat listesinden ürüne otomatik olarak uygulayarak "
 "elde edilir. Değilse, manuel fiyat uygulayabilirsiniz."
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Fatura Satırları"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Tekrarlama Her (Gün / Hafta / Ay / Yıl) "
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Faturalar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Fatura türü"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Fatura türü"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Yevmiye"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Sonraki Fatura Tarihi"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Son Değiştirilme"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Son Güncelleyen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Son Güncelleme"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Açıklamalar (fatura satırlarındaki tanımlayıcılar için)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Ay(lar)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Ay(lar) son günü"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Adı"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Sonraki Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Sonraki Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "Başlama Tarihi"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, 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."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Sonradan-Ödemeli"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Ön-Ödemeli"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "Sözleşme Satırları"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Fiyat Listesi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Ürün"
 
@@ -600,41 +1120,82 @@ msgid "Purchase Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Miktar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "Tekrarlayan"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Tekrarlayan Faturalar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "Tekrarlayan"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "Sözleşme Satırları"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Tekrar Aralığı"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Tekrarlama Her (Gün / Hafta / Ay / Yıl) "
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "Sorumlu"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "Sorumlu"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -644,19 +1205,21 @@ msgid "Sale Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "E-posta ile Gönderme"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "Sıra"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -673,133 +1236,321 @@ msgid "Show the sale contracts for this partner"
 msgstr "Bu iş ortağı için sözleşmeleri göster"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Alt Toplam"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "Sözleşme Satırları"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Birim Fiyat"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Ölçü Birimi"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "KDV:"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "Geçerli"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Hafta(lar)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Yıl(lar)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Önce Sözleşme %s için bir Müşteri seçmelisiniz!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, fuzzy, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Önce Sözleşme %s için bir Müşteri seçmelisiniz!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Sözleşmeler"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Tekrarlayan Faturalar Göster"
+#, fuzzy
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Analitik Hesap Satırı"
+
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Analitik Hesap Satırı"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Otomatik olarak tekrarlanan faturalar oluştur"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Önce Sözleşme %s için bir Müşteri seçmelisiniz!"
+
+#, fuzzy
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Önce Sözleşme %s için bir Müşteri seçmelisiniz!"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Tekrarlayan Faturalar Göster"
diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po
index 0ea9b3d9..5c6ee8ee 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<Strong> #Bitiş # </ strong>: Faturalandırılan dönemin bitiş tarihi"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 "<Strong> #Başlama # </ strong>: Faturalandırılan dönemin başlangıç tarihi"
@@ -108,7 +124,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -152,49 +168,155 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-#, fuzzy
-msgid "Account Analytic Contract"
-msgstr "Analitik Hesap Satırları"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "Analitik Hesap Satırları"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "Analitik Hesap"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "Yeni bir sözleşme oluşturmak için tıklayın."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -206,156 +328,287 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "Sözleşme"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr ""
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+msgid "Contract Line"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+msgid "Contract Line Wizard"
+msgstr "Sözleşme"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "Contract Name"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+msgid "Contract Template Line"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+msgid "Contract Template Lines"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 #, fuzzy
 msgid "Contract Type"
 msgstr "Sözleşme"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contracts"
+msgid "Contract lines"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+msgid "Contract template lines"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "Faturalar Oluştur"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Oluşturulma"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 #, fuzzy
 msgid "Customer Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "Sonraki Fatura Tarihi"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "Gün(ler)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "Açıklama"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
@@ -363,168 +616,420 @@ msgstr ""
 "Üretilen faturalarda uygulanan indirim. 100'den az veya ona eşit olmalıdır"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "Ad Görünümü"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "Otomatik olarak tekrarlanan faturalar oluştur"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "Grupla ..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "Grupla ..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "Fatura"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "Fatura Satırları"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "Tekrarlama sıklığı(Gün /Hafta /Ay /Yıl)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "Faturalar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "Fatura türü"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "Fatura türü"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "Yevmiye"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "Sonraki Fatura Tarihi"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "Son Güncelleme"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Son Güncelleyen"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Son Güncelleme"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "Açıklamalar (fatura satırlarındaki tanımlayıcılar için)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "Ay(lar)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "Ay(ların) Son Günü"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "Sonraki Fatura"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "Sonraki Fatura"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "Sözleşme"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, 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."
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "Sonradan Ödemeli"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "Ön Ödemeli"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+msgid "Predecessor Contract Line"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "Fiyat Listesi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "Ürün"
 
@@ -537,41 +1042,77 @@ msgid "Purchase Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "Miktar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "Tekrarlayan Faturalar"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+msgid "Renew Contract lines"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "Tekrarlama Sıklığı"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "Tekrarlama sıklığı(Gün /Hafta /Ay /Yıl)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -581,19 +1122,21 @@ msgid "Sale Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -608,133 +1151,323 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "Otomatik fatura üretimi için Aralık'ı belirtin."
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "Otomatik fatura üretimi için Aralık'ı belirtin."
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "Alt Toplam"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+msgid "Successor Contract Line"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 #, fuzzy
 msgid "Supplier Contracts"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "Birim Fiyat"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "Ölçü Birimi"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "Hafta(lar)"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Year(s)"
 msgstr "Yıl(lar)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, fuzzy, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!"
-
-#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+msgid "e.g. Contract XYZ"
+msgstr "Sözleşmeler"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ Tekrarlanan faturaları göster"
+#, fuzzy
+#~ msgid "Account Analytic Contract"
+#~ msgstr "Analitik Hesap Satırları"
+
+#~ msgid "Account Analytic Lines"
+#~ msgstr "Analitik Hesap Satırları"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "Otomatik olarak tekrarlanan faturalar oluştur"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!"
+
+#, fuzzy
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ Tekrarlanan faturaları göster"
diff --git a/contract/i18n/uk.po b/contract/i18n/uk.po
index 2bb5da5e..74ed7a3f 100644
--- a/contract/i18n/uk.po
+++ b/contract/i18n/uk.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Створив"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Створено"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Дата останньої зміни"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє відредаговано"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Дата останньої зміни"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/vi.po b/contract/i18n/vi.po
index 3d8d3cab..2c92c6ee 100644
--- a/contract/i18n/vi.po
+++ b/contract/i18n/vi.po
@@ -88,14 +88,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -106,7 +122,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -150,48 +166,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -203,322 +324,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
-msgstr "Tạo trên"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr "Tạo trên"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Tên"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -530,41 +1007,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -573,19 +1081,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -600,132 +1110,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/vi_VN.po b/contract/i18n/vi_VN.po
index 9dce02b9..cf4d260d 100644
--- a/contract/i18n/vi_VN.po
+++ b/contract/i18n/vi_VN.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,680 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, 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:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "Tạo bởi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "Tạo vào"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr ""
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr ""
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Last Updated on"
+msgid "Last Date Invoiced"
+msgstr "Cập nhật lần cuối vào"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật lần cuối bởi"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "Tên"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1010,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1084,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1113,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""
diff --git a/contract/i18n/zh_CN.po b/contract/i18n/zh_CN.po
index 8b3203e3..650dc103 100644
--- a/contract/i18n/zh_CN.po
+++ b/contract/i18n/zh_CN.po
@@ -116,14 +116,14 @@ msgstr ""
 "background-repeat: repeat no-repeat;\">\n"
 "        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
 "#DDD;\">\n"
-"            <strong style=\"text-transform:uppercase;\""
-">${object.company_id.name}</strong></h3>\n"
+"            <strong style=\"text-transform:uppercase;\">${object.company_id."
+"name}</strong></h3>\n"
 "    </div>\n"
 "    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
 "16px; background-color: #F2F2F2;\">\n"
 "        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"            ${object.company_id.partner_id.sudo().with_context(show_address="
-"True, html_format=True).name_get()[0][1] | safe}\n"
+"            ${object.company_id.partner_id.sudo()."
+"with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"
 "            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
@@ -134,8 +134,8 @@ msgstr ""
 "        % endif\n"
 "        % if object.company_id.website:\n"
 "            <div>\n"
-"                网址：<a href=\"${object.company_id.website}\""
-">${object.company_id.website}</a>\n"
+"                网址：<a href=\"${object.company_id.website}\">${object."
+"company_id.website}</a>\n"
 "            </div>\n"
 "        %endif\n"
 "        <p></p>\n"
@@ -149,14 +149,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr "${object.company_id.name} 合同(参考 ${object.name or 'n/a'})"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr "<strong>#结束#</strong>: 发票日期的结束日期"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr "<strong>#开始#</strong>: 发票日期的开始日期"
 
@@ -167,7 +183,9 @@ msgstr "<strong>合同：</strong>"
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+#, fuzzy
+#| msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr "<strong>开始日期： </strong>"
 
 #. module: contract
@@ -211,48 +229,157 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>单价</strong>"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
-msgstr "账户分析合同"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
-msgstr "账户分析行"
+#: code:addons/contract/models/contract_line.py:321
+#, python-format
+msgid "A contract line with a successor can't be set to auto-renew"
+msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: code:addons/contract/models/contract_line.py:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+#, fuzzy
+#| msgid "Generate Recurring Invoices from Contracts"
+msgid "Abstract Recurring Contract"
+msgstr "从合同生成定期发票"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+#, fuzzy
+#| msgid "Analytic Account"
+msgid "Analytic account"
 msgstr "分析账户"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr "自动价格？"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr "单击以创建新的合同模板。"
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr "单击以创建新合同。"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr "公司"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr "编写Email"
@@ -264,322 +391,717 @@ msgstr "联系人"
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr "合同"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
-msgstr "合同'%s'的开始日期不能晚于结束日期"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line"
+msgstr "合同行"
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model:ir.model,name:contract.model_contract_line_wizard
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract Line Wizard"
 msgstr "合同行"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Contract Type"
+msgid "Contract Name"
+msgstr "合同类型"
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr "合同模板"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+#, fuzzy
+#| msgid "Contract Template"
+msgid "Contract Template Line"
+msgstr "合同模板"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract Template Lines"
+msgstr "合同模板"
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr "合同模板"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr "合同类型"
 
 #. module: contract
+#: code:addons/contract/models/contract_line.py:482
+#, fuzzy, python-format
+#| msgid "Contract '%s' start date can't be later than end date"
+msgid "Contract line '%s' start date can't be later than end date"
+msgstr "合同'%s'的开始日期不能晚于结束日期"
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Contract lines"
+msgstr "合同行"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+#, fuzzy
+#| msgid "Contract Templates"
+msgid "Contract template lines"
+msgstr "合同模板"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
 #: model:ir.ui.menu,name:contract.menu_config_contract
 msgid "Contracts"
 msgstr "合同"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr "创建可见性发票"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Create invoices"
 msgstr "创建发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
 msgid "Created by"
 msgstr "创建者"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
 msgid "Created on"
 msgstr "创建时间"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Currency"
+msgstr "重新发起"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
 msgid "Customer"
 msgstr "客户"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
 msgid "Customer Contracts"
 msgstr "客户合同"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Date End"
 msgstr "结束于"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
-msgstr "开始于"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
 msgid "Date Start"
 msgstr "开始日期"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
-msgstr "日期到"
-
-#. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
-msgstr "发票开具日期"
-
-#. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
 msgid "Date of Next Invoice"
 msgstr "下一个发票的日期"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
-msgstr "发票期限的日期"
-
-#. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr "天"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr "说明"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr "折扣(%)"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "折扣应小于或等于100"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr "在生成的发票中应用的折扣。它应该小于或等于100"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr "已完成"
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr "从合同生成定期发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
-msgstr "自动生成定期发票"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+#, fuzzy
+#| msgid "Group By..."
+msgid "Group"
+msgstr "分组..."
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr "分组..."
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr "如果已标记，将自动将价格表应用于产品。如果没有，您将能够引入手动价格"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr "发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Count"
+msgstr "发票"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Invoice"
+msgid "Invoice Every"
+msgstr "发票"
+
+#. module: contract
+#: model:ir.model,name:contract.model_account_invoice_line
+#, fuzzy
+#| msgid "Invoice Lines"
+msgid "Invoice Line"
 msgstr "发票行"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr "重复间隔 (日/周/月/年)"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr "发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Invoicing contact"
+msgstr "发票类型"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr "发票类型"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr "日记账"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+#, fuzzy
+#| msgid "Date of Next Invoice"
+msgid "Last Date Invoiced"
+msgstr "下一个发票的日期"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr "最后修改时间"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr "最后更新时间"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr "图例（用于发票行内的标记）"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr "月"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr "月底"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "名称"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr "下一张发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+#, fuzzy
+#| msgid "Next Invoice"
+msgid "Next Invoice Date"
+msgstr "下一张发票"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+#, fuzzy
+#| msgid "Contract"
+msgid "Old Contract"
+msgstr "合同"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr "合作伙伴（总是空）"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
-msgstr "合作伙伴和合作伙伴关联的"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#, fuzzy
+#| msgid "Date Start"
+msgid "Plan Start"
+msgstr "开始日期"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "请为定义一个%s日记账，公司 '%s'。"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr "后付"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr "预付"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Predecessor Contract Line"
+msgstr "合同行"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr "价格表"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr "产品"
 
@@ -591,41 +1113,82 @@ msgid "Purchase Contracts"
 msgstr "采购合同"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr "数量"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr "重新发起"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr "重新发起发票"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+#, fuzzy
+#| msgid "Recurrence"
+msgid "Reference"
+msgstr "重新发起"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Renew Contract lines"
+msgstr "合同行"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat Every"
+msgid "Renew Every"
 msgstr "重复"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+#, fuzzy
+#| msgid "Repeat every (Days/Week/Month/Year)"
+msgid "Renew every (Days/Week/Month/Year)"
 msgstr "重复间隔 (日/周/月/年)"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr "负责人"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+#, fuzzy
+#| msgid "Responsible"
+msgid "Responsible User"
+msgstr "负责人"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -634,19 +1197,21 @@ msgid "Sale Contracts"
 msgstr "销售合同"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr "通过Email发送"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr "序列"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr "显示合同时合同行的序列"
 
@@ -661,134 +1226,362 @@ msgid "Show the sale contracts for this partner"
 msgstr "显示此合作伙伴的销售合同"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr "实际价格"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr "指定自动发票生成的间隔。"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+#, fuzzy
+#| msgid "Specify Interval for automatic invoice generation."
+msgid "Specify Interval for automatic renewal."
+msgstr "指定自动发票生成的间隔。"
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr "指定处理日期是“从”还是“到”发票日期"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr "小计"
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+#, fuzzy
+#| msgid "Contract Lines"
+msgid "Successor Contract Line"
+msgstr "合同行"
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr "供应商"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr "供应商合同"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr "单价"
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr "计量单位"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr "增值税："
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+#, fuzzy
+#| msgid "Valid"
+msgid "Validate"
 msgstr "有效"
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
-msgstr "供应商账单"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Week(s)"
 msgstr "周"
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
-msgstr "年"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
-msgstr "在合同'%s'开始之前不能有下一个发票日期"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
+msgstr "年"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Customer for Contract %s!"
-msgstr "您必须先选择合同%s的客户！"
+msgid "You can't delay a contract line invoiced at least one time."
+msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
-#, python-format
-msgid "You must first select a Supplier for Contract %s!"
-msgstr "您必须先选择合同%s的供应商！"
+#: code:addons/contract/models/contract_line.py:433
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
+msgstr "在合同'%s'开始之前不能有下一个发票日期"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
-#, python-format
+#: code:addons/contract/models/contract_line.py:453
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
 msgid ""
-"You must review start and end dates!\n"
-"%s"
-msgstr ""
-"您必须查看开始和结束日期！\n"
-"%s"
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
+msgstr "在合同'%s'开始之前不能有下一个发票日期"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
-#, python-format
-msgid "You must supply a customer for the contract '%s'"
-msgstr "您必须为合同'%s'提供客户"
+#: code:addons/contract/models/contract_line.py:445
+#, fuzzy, python-format
+#| msgid ""
+#| "You can't have a next invoicing date before the start of the contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
+msgstr "在合同'%s'开始之前不能有下一个发票日期"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
-#, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+#: code:addons/contract/models/contract_line.py:469
+#, 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'"
 msgstr "您必须为合同'%s'提供下一个开票日期"
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
-#, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr "必须提供合同'%s'的开始日期"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#, fuzzy
+#| msgid "Sale Contracts"
+msgid "e.g. Contract XYZ"
+msgstr "销售合同"
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
-msgstr "account.analytic.invoice.line"
+#~ msgid "Account Analytic Contract"
+#~ msgstr "账户分析合同"
 
-#. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
-msgstr "⇒ 显示定期发票"
+#~ msgid "Account Analytic Lines"
+#~ msgstr "账户分析行"
+
+#~ msgid "Date From"
+#~ msgstr "开始于"
+
+#~ msgid "Date To"
+#~ msgstr "日期到"
+
+#~ msgid "Date from invoiced period"
+#~ msgstr "发票开具日期"
+
+#~ msgid "Date to invoiced period"
+#~ msgstr "发票期限的日期"
+
+#~ msgid "Generate recurring invoices automatically"
+#~ msgstr "自动生成定期发票"
+
+#~ msgid "Partner and dependents"
+#~ msgstr "合作伙伴和合作伙伴关联的"
+
+#~ msgid "Vendor Bills"
+#~ msgstr "供应商账单"
+
+#~ msgid "You must first select a Customer for Contract %s!"
+#~ msgstr "您必须先选择合同%s的客户！"
+
+#~ msgid "You must first select a Supplier for Contract %s!"
+#~ msgstr "您必须先选择合同%s的供应商！"
+
+#~ msgid ""
+#~ "You must review start and end dates!\n"
+#~ "%s"
+#~ msgstr ""
+#~ "您必须查看开始和结束日期！\n"
+#~ "%s"
+
+#~ msgid "You must supply a customer for the contract '%s'"
+#~ msgstr "您必须为合同'%s'提供客户"
+
+#~ msgid "You must supply a start date for contract '%s'"
+#~ msgstr "必须提供合同'%s'的开始日期"
+
+#~ msgid "account.analytic.invoice.line"
+#~ msgstr "account.analytic.invoice.line"
+
+#~ msgid "⇒ Show recurring invoices"
+#~ msgstr "⇒ 显示定期发票"
diff --git a/contract/i18n/zh_TW.po b/contract/i18n/zh_TW.po
index d35da133..ad38ec9d 100644
--- a/contract/i18n/zh_TW.po
+++ b/contract/i18n/zh_TW.po
@@ -89,14 +89,30 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#END#</strong>: End date\n"
+"                                    of\n"
+"                                    the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid ""
+"<strong>#START#</strong>: Start\n"
+"                                    date\n"
+"                                    of the\n"
+"                                    invoiced period"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
@@ -107,7 +123,7 @@ msgstr ""
 
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
-msgid "<strong>Date Start: </strong>"
+msgid "<strong>Date Start</strong>"
 msgstr ""
 
 #. module: contract
@@ -151,48 +167,153 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "Account Analytic Contract"
+#: code:addons/contract/models/contract_line.py:424
+#, python-format
+msgid "A canceled contract line can't be set to auto-renew"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:321
+#, 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:333
+#, python-format
+msgid "A contract line with a successor must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract
+msgid "Abstract Recurring Contract"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_abstract_contract_line
+msgid "Abstract Recurring Contract Line"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Account Analytic Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction
+msgid "Action Needed"
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__active
+#: model:ir.model.fields,field_description:contract.field_contract_line__active
+msgid "Active"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:328
+#, python-format
+msgid "An auto-renew line must have a end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__analytic_account_id
+msgid "Analytic account"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Archived"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Are you sure you want to cancel this line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Associated Partner"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__is_auto_renew
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_auto_renew
+msgid "Auto Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Cancel"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_cancel_allowed
+msgid "Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:890
+#, python-format
+msgid "Cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_canceled
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__is_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.actions.act_window,help:contract.contract_template_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model_terms:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: model_terms:ir.actions.act_window,help:contract.action_customer_contract
+#: model_terms:ir.actions.act_window,help:contract.action_supplier_contract
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__company_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__company_id
+#: selection:contract.line,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__company_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__company_id
 msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:342
+#: code:addons/contract/models/contract.py:302
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -204,322 +325,678 @@ msgstr ""
 
 #. module: contract
 #: model:ir.actions.report,name:contract.report_contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__analytic_account_id
-#: model:ir.model.fields,field_description:contract.field_account_invoice__contract_id
+#: model:ir.model,name:contract.model_contract_contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__contract_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__contract_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:138
-#, python-format
-msgid "Contract '%s' start date can't be later than end date"
+#: model:ir.model,name:contract.model_contract_line
+#: model:ir.model.fields,field_description:contract.field_account_invoice_line__contract_line_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__contract_line_id
+msgid "Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model,name:contract.model_contract_line_wizard
+msgid "Contract Line Wizard"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__predecessor_contract_line_id
+msgid "Contract Line origin of this one."
 msgstr ""
 
 #. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract_line
-msgid "Contract Lines"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Contract Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_template_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_contract_template
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_template_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Contract Template"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.account_analytic_contract_action
-#: model:ir.ui.menu,name:contract.account_analytic_contract_menu
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: model:ir.model,name:contract.model_contract_template_line
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_line_form_view
+msgid "Contract Template Line"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
+msgid "Contract Template Lines"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.contract_template_action
+#: model:ir.ui.menu,name:contract.contract_template_menu
 msgid "Contract Templates"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__contract_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__contract_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_type
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_type
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.menu,name:contract.menu_config_contract
-msgid "Contracts"
+#: code:addons/contract/models/contract_line.py:482
+#, python-format
+msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
-msgid "Create Invoice Visibility"
+#: code:addons/contract/models/contract_line.py:919
+#, python-format
+msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "Create invoices"
+#: code:addons/contract/models/contract_line.py:354
+#, python-format
+msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_uid
-msgid "Created by"
+#: code:addons/contract/models/contract_line.py:345
+#, python-format
+msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__create_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__create_date
-msgid "Created on"
-msgstr "建立於"
+#: code:addons/contract/models/contract_line.py:898
+#, python-format
+msgid "Contract line canceled: %s<br/>- "
+msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__partner_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
-msgid "Customer"
+#: code:addons/contract/models/contract_line.py:692
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                            stopped: <br/>\n"
+"                            - <strong>End</strong>: {old_end} -- {new_end}\n"
+"                            "
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_sale_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_sale_overdue_all
-msgid "Customer Contracts"
+#: code:addons/contract/models/contract_line.py:770
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                    planned a successor: <br/>\n"
+"                    - <strong>Start</strong>: {new_date_start}\n"
+"                    <br/>\n"
+"                    - <strong>End</strong>: {new_date_end}\n"
+"                    "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_end
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Date End"
+#: code:addons/contract/models/contract_line.py:1048
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                renewed: <br/>\n"
+"                - <strong>Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_from
-msgid "Date From"
+#: code:addons/contract/models/contract_line.py:878
+#, python-format
+msgid ""
+"Contract line for <strong>{product}</strong>\n"
+"                suspended: <br/>\n"
+"                - <strong>Suspension Start</strong>: {new_date_start}\n"
+"                <br/>\n"
+"                - <strong>Suspension End</strong>: {new_date_end}\n"
+"                "
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__date_start
-msgid "Date Start"
+#: code:addons/contract/models/contract_line.py:1098
+#, python-format
+msgid "Contract line must be canceled before delete"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__date_to
-msgid "Date To"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__contract_line_ids
+msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_from
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_from
-msgid "Date from invoiced period"
+#: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
+msgid "Contract template lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_next_date
-msgid "Date of Next Invoice"
+#: model:ir.model.fields,field_description:contract.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:contract.field_res_users__contract_ids
+#: model:ir.ui.menu,name:contract.menu_config_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_invoice_visibility
+msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__date_to
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__date_to
-msgid "Date to invoiced period"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Create invoices"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__create_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__create_date
+msgid "Created on"
+msgstr "建立於"
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_customer_form_view
+msgid "Customer"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.act_window,name:contract.action_customer_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_customer
+msgid "Customer Contracts"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_end
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_end
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "Date End"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__date_start
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__date_start
+msgid "Date Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_next_date
+msgid "Date of Next Invoice"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Day(s)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__name
 msgid "Description"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__discount
 msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_contract_line.py:179
+#: code:addons/contract/models/abstract_contract_line.py:173
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__discount
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__discount
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_line__discount
+#: model:ir.model.fields,help:contract.field_contract_template_line__discount
 msgid ""
 "Discount that is applied in generated invoices. It should be less or equal "
 "to 100"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__display_name
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template__display_name
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Finished"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.server,name:contract.account_analytic_cron_for_invoice_ir_actions_server
-#: model:ir.cron,cron_name:contract.account_analytic_cron_for_invoice
-#: model:ir.cron,name:contract.account_analytic_cron_for_invoice
+#: model:ir.model.fields,field_description:contract.field_contract_contract__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_cron_for_invoice_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_cron_for_invoice
+#: model:ir.cron,name:contract.contract_cron_for_invoice
 msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
-msgid "Generate recurring invoices automatically"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__group_id
+msgid "Group"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Group By..."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__id
+#: model:ir.model.fields,field_description:contract.field_contract_line__id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__id
+#: model:ir.model.fields,field_description:contract.field_contract_template__id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__id
 msgid "ID"
 msgstr "ID"
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__automatic_price
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_contract_template_line__automatic_price
 msgid ""
 "If this is marked, the price will be obtained automatically applying the "
 "pricelist to the product. If not, you will be able to introduce a manual "
 "price"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__successor_contract_line_id
+msgid ""
+"In case of restart after suspension, this field contain the new contract "
+"line created."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
+msgid "In progress"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "In-progress"
+msgstr ""
+
 #. module: contract
 #: model:ir.model,name:contract.model_account_invoice
 msgid "Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoice_line_ids
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoice_line_ids
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
-msgid "Invoice Lines"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_interval
+msgid "Invoice Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_recurring_invoices
+#: model:ir.model,name:contract.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_interval
+msgid "Invoice every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_invoicing_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__invoice_partner_id
+msgid "Invoicing contact"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Invoicing type"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__journal_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__journal_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Is suspension without end date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__journal_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__journal_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Journal"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line____last_update
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_line__last_date_invoiced
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__last_date_invoiced
+msgid "Last Date Invoiced"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_contract____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template____last_update
+#: model:ir.model.fields,field_description:contract.field_contract_template_line____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_uid
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_contract__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template__write_date
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_form_view
 msgid "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__manual_renew_needed
+msgid "Manual renew needed"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
 msgid "Month(s)"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
 msgid "Month(s) last day"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_contract__name
+#: model:ir.model.fields,field_description:contract.field_contract_template__name
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_tree_view
 msgid "Name"
 msgstr "名稱"
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_search_view
 msgid "Next Invoice"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_line_wizard__recurring_next_date
+msgid "Next Invoice Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_account_invoice__old_contract_id
+msgid "Old Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "Other Information"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__partner_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Partner and dependents"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__payment_term_id
+msgid "Payment Terms"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Plan Start"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_plan_successor_allowed
+msgid "Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:753
+#, python-format
+msgid "Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:220
+#: code:addons/contract/models/contract.py:264
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Post-paid"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_invoicing_type:0
-#: selection:account.analytic.contract,recurring_invoicing_type:0
+#: selection:contract.abstract.contract.line,recurring_invoicing_type:0
+#: selection:contract.line,recurring_invoicing_type:0
+#: selection:contract.template.line,recurring_invoicing_type:0
 msgid "Pre-paid"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__pricelist_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__pricelist_id
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_line__predecessor_contract_line_id
+msgid "Predecessor Contract Line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_contract__pricelist_id
+#: model:ir.model.fields,field_description:contract.field_contract_template__pricelist_id
+#: model_terms:ir.ui.view,arch_db:contract.contract_template_search_view
 msgid "Pricelist"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__product_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__product_id
 msgid "Product"
 msgstr ""
 
@@ -531,41 +1008,72 @@ msgid "Purchase Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__quantity
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__quantity
 msgid "Quantity"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_rule_type
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__recurring_rule_type
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Recurring Invoices"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat Every"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__code
+msgid "Reference"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Renew"
+msgstr ""
+
+#. module: contract
+#: model:ir.actions.server,name:contract.contract_line_cron_for_renew_ir_actions_server
+#: model:ir.cron,cron_name:contract.contract_line_cron_for_renew
+#: model:ir.cron,name:contract.contract_line_cron_for_renew
+msgid "Renew Contract lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_interval
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_interval
-msgid "Repeat every (Days/Week/Month/Year)"
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew Every"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_interval
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_interval
+msgid "Renew every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Renewal type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__user_id
 msgid "Responsible"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
 #: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count
@@ -574,19 +1082,21 @@ msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 msgid "Send by Email"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_contract_line__sequence
-#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_contract_template_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
@@ -601,132 +1111,295 @@ msgid "Show the sale contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__specific_price
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__specific_price
 msgid "Specific Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_rule_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_rule_type
 msgid "Specify Interval for automatic invoice generation."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,help:contract.field_account_analytic_account__recurring_invoicing_type
-#: model:ir.model.fields,help:contract.field_account_analytic_contract__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_line__auto_renew_rule_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__auto_renew_rule_type
+msgid "Specify Interval for automatic renewal."
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_line__recurring_invoicing_type
+#: model:ir.model.fields,help:contract.field_contract_template_line__recurring_invoicing_type
 msgid "Specify if process date is 'from' or 'to' invoicing date"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_subtotal
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__state
+msgid "State"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_contract__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+msgid "Stop Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Stop Plan Successor"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_allowed
+msgid "Stop allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:672
+#, python-format
+msgid "Stop not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_stop_plan_successor_allowed
+msgid "Stop/Plan successor allowed?"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:814
+#, python-format
+msgid "Stop/Plan successor not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,contract_type:0
-#: selection:account.analytic.contract,contract_type:0
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model:ir.model.fields,field_description:contract.field_contract_line__successor_contract_line_id
+msgid "Successor Contract Line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract,contract_type:0
+#: selection:contract.contract,contract_type:0
+#: selection:contract.template,contract_type:0
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_supplier_form_view
 msgid "Supplier"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_purchase_overdue_all
+#: model:ir.actions.act_window,name:contract.action_supplier_contract
+#: model:ir.ui.menu,name:contract.menu_contract_contract_supplier
 msgid "Supplier Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__price_unit
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_unit
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension End Date"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+msgid "Suspension Start Date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_interval
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_interval
+msgid "Termination Notice Before"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_rule_type
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__termination_notice_rule_type
+msgid "Termination Notice type"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__termination_notice_date
+msgid "Termination notice date"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_line__manual_renew_needed
+#: model:ir.model.fields,help:contract.field_contract_line_wizard__manual_renew_needed
+msgid ""
+"This flag is used to make a difference between a definitive stopand "
+"temporary one for which a user is not able to plan asuccessor in advance"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "To renew"
+msgstr ""
+
+#. module: contract
+#: selection:contract.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_line__is_un_cancel_allowed
+msgid "Un-Cancel allowed?"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_tree_view
+msgid "Un-cancel"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/contract_line.py:911
+#, python-format
+msgid "Un-cancel not allowed for this line"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_line__price_unit
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__price_unit
 msgid "Unit Price"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line__uom_id
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming"
+msgstr ""
+
+#. module: contract
+#: selection:contract.line,state:0
+msgid "Upcoming Close"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
-msgid "Valid"
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_stop_plan_successor_form_view
+#: model_terms:ir.ui.view,arch_db:contract.contract_line_wizard_uncancel_form_view
+msgid "Validate"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,name:contract.act_purchase_recurring_invoices
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:contract.field_contract_contract__website_message_ids
+msgid "Website Messages"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Week(s)"
+#: model:ir.model.fields,help:contract.field_contract_contract__website_message_ids
+msgid "Website communication history"
 msgstr ""
 
 #. module: contract
-#: selection:account.analytic.account,recurring_rule_type:0
-#: selection:account.analytic.contract,recurring_rule_type:0
-msgid "Year(s)"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.abstract.contract.line,termination_notice_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.line,termination_notice_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+#: selection:contract.template.line,termination_notice_rule_type:0
+msgid "Week(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:111
-#, python-format
-msgid ""
-"You can't have a next invoicing date before the start of the contract '%s'"
+#: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
+msgid "With running contracts"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:211
-#, python-format
-msgid "You must first select a Customer for Contract %s!"
+#: selection:contract.abstract.contract.line,auto_renew_rule_type:0
+#: selection:contract.abstract.contract.line,recurring_rule_type:0
+#: selection:contract.line,auto_renew_rule_type:0
+#: selection:contract.line,recurring_rule_type:0
+#: selection:contract.template.line,auto_renew_rule_type:0
+#: selection:contract.template.line,recurring_rule_type:0
+msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:207
+#: code:addons/contract/models/contract_line.py:647
 #, python-format
-msgid "You must first select a Supplier for Contract %s!"
+msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:294
+#: code:addons/contract/models/contract_line.py:433
 #, python-format
 msgid ""
-"You must review start and end dates!\n"
-"%s"
+"You can't have a date of next invoice anterior to the start of the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:102
+#: code:addons/contract/models/contract_line.py:453
 #, python-format
-msgid "You must supply a customer for the contract '%s'"
+msgid ""
+"You can't have the end date before the date of last invoice for the contract "
+"line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:120
+#: code:addons/contract/models/contract_line.py:445
 #, python-format
-msgid "You must supply a next invoicing date for contract '%s'"
+msgid ""
+"You can't have the start date after the date of last invoice for the "
+"contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/account_analytic_account.py:129
+#: code:addons/contract/models/contract_line.py:469
 #, python-format
-msgid "You must supply a start date for contract '%s'"
-msgstr ""
-
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_invoice_line
-msgid "account.analytic.invoice.line"
+msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-msgid "⇒ Show recurring invoices"
+#: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
+msgid "e.g. Contract XYZ"
 msgstr ""