diff --git a/contract/i18n/contract.pot b/contract/i18n/contract.pot
index 2d567363..fda17b92 100644
--- a/contract/i18n/contract.pot
+++ b/contract/i18n/contract.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -71,98 +71,105 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.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 "<strong>#END#</strong>: End date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.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 "<strong>#START#</strong>: Start date of the invoiced period"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Contract: </strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Date Start: </strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Description</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Partner:</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Quantity</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Recurring Items</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Responsible: </strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Total</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model:ir.model,name:contract.model_account_analytic_contract
+msgid "Account Analytic Contract"
+msgstr ""
+
+#. module: contract
+#: model_terms:ir.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 ""
 
 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_account
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_analytic_account_id
+#: 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"
 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_account_analytic_contract_line__automatic_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__automatic_price
 msgid "Auto-price?"
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,help:contract.account_analytic_contract_action
+#: model_terms:ir.actions.act_window,help:contract.account_analytic_contract_action
 msgid "Click to create a new contract template."
 msgstr ""
 
 #. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_purchase_overdue_all
-#: model:ir.actions.act_window,help:contract.action_account_analytic_sale_overdue_all
+#: 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
 msgid "Click to create a new contract."
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id
+#: 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
 msgid "Company"
 msgstr ""
 
@@ -179,8 +186,8 @@ 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.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:mail.template,report_name:contract.email_contract_template
 msgid "Contract"
 msgstr ""
@@ -197,25 +204,23 @@ msgid "Contract Lines"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account_contract_template_id
-#: model:ir.model.fields,field_description:contract.field_project_project_contract_template_id
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: 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
 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:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_tree
+#: 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
 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:ir.model.fields,field_description:contract.field_project_project_contract_type
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: 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
 msgid "Contract Type"
 msgstr ""
 
@@ -225,34 +230,34 @@ 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_project_project_create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
 msgid "Create Invoice Visibility"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 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_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"
 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_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 ""
 
 #. module: contract
 #: selection:account.analytic.account,contract_type:0
 #: selection:account.analytic.contract,contract_type:0
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_sale_form
+#: 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"
 msgstr ""
 
@@ -263,44 +268,42 @@ msgid "Customer Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_end
-#: model:ir.model.fields,field_description:contract.field_project_project_date_end
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: 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"
 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
+#: 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_account_analytic_account__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
+#: 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
+#: 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_project_project_recurring_next_date
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__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
+#: 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 ""
 
@@ -311,14 +314,14 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
 msgid "Discount (%)"
 msgstr ""
 
@@ -329,20 +332,20 @@ 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_account_analytic_contract_line__discount
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_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_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
 msgid "Display Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Finished"
 msgstr ""
 
@@ -354,26 +357,25 @@ msgid "Generate Recurring Invoices from Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoices
-#: model:ir.model.fields,field_description:contract.field_project_project_recurring_invoices
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__recurring_invoices
 msgid "Generate recurring invoices automatically"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 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_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
 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_account_analytic_contract_line__automatic_price
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_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 ""
 
@@ -383,10 +385,9 @@ 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:ir.model.fields,field_description:contract.field_project_project_recurring_invoice_line_ids
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: 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"
 msgstr ""
 
@@ -396,45 +397,43 @@ 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:ir.model.fields,field_description:contract.field_project_project_recurring_invoicing_type
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: 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
 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:ir.model.fields,field_description:contract.field_project_project_journal_id
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: 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
 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_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
 msgid "Last Modified on"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_write_uid
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_write_uid
+#: 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
 msgid "Last Updated by"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_write_date
-#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_write_date
+#: 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
 msgid "Last Updated on"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_form
+#: model_terms:ir.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 "Legend (for the markers inside invoice lines description)"
 msgstr ""
 
@@ -451,22 +450,22 @@ 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_account_analytic_contract__name
 msgid "Name"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 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_account_analytic_contract__partner_id
 msgid "Partner (always False)"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Partner and dependents"
 msgstr ""
 
@@ -489,129 +488,121 @@ 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:ir.model.fields,field_description:contract.field_project_project_pricelist_id
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: 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
 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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
 msgid "Product"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_res_partner_purchase_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_purchase_contract_count
-#: model:ir.ui.view,arch_db:contract.view_partner_form
+#: model:ir.model.fields,field_description:contract.field_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
 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_account_analytic_contract_line__quantity
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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:ir.model.fields,field_description:contract.field_project_project_recurring_rule_type
-#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search
+#: 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
 msgid "Recurrence"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: 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
 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
-#: model:ir.model.fields,field_description:contract.field_project_project_recurring_interval
+#: 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"
 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
-#: model:ir.model.fields,help:contract.field_project_project_recurring_interval
+#: 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)"
 msgstr ""
 
 #. module: contract
-#: model:ir.model.fields,field_description:contract.field_account_analytic_account_user_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__user_id
 msgid "Responsible"
 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
-#: model:ir.ui.view,arch_db:contract.view_partner_form
+#: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
 msgid "Sale Contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line__sequence
 msgid "Sequence of the contract line when displaying contracts"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
 msgid "Show the purchase contracts for this partner"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
 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_account_analytic_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_project_project_recurring_rule_type
+#: 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
 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_project_project_recurring_invoicing_type
+#: 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
 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_account_analytic_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
 msgid "Sub Total"
 msgstr ""
 
 #. module: contract
 #: selection:account.analytic.account,contract_type:0
 #: selection:account.analytic.contract,contract_type:0
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_purchase_form
 msgid "Supplier"
 msgstr ""
 
@@ -622,24 +613,24 @@ 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: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
 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_account_analytic_contract_line__uom_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__uom_id
 msgid "Unit of Measure"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
 msgid "VAT:"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
+#: model_terms:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search
 msgid "Valid"
 msgstr ""
 
@@ -698,18 +689,13 @@ msgstr ""
 msgid "You must supply a start date for contract '%s'"
 msgstr ""
 
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "account.analytic.contract"
-msgstr ""
-
 #. module: contract
 #: model:ir.model,name:contract.model_account_analytic_invoice_line
 msgid "account.analytic.invoice.line"
 msgstr ""
 
 #. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
 msgid "⇒ Show recurring invoices"
 msgstr ""