diff --git a/contract/i18n/am.po b/contract/i18n/am.po
index 258739e8..0f17d98f 100644
--- a/contract/i18n/am.po
+++ b/contract/i18n/am.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Última actualización por"
#. 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 "Última actualización en"
#. 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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/ar.po b/contract/i18n/ar.po
index 7b0cae1c..87533a72 100644
--- a/contract/i18n/ar.po
+++ b/contract/i18n/ar.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/bg.po b/contract/i18n/bg.po
index 909add9d..e69a0d69 100644
--- a/contract/i18n/bg.po
+++ b/contract/i18n/bg.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/bs.po b/contract/i18n/bs.po
index 8bf58e1b..95e893eb 100644
--- a/contract/i18n/bs.po
+++ b/contract/i18n/bs.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Kreirano"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 "Naziv"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/ca.po b/contract/i18n/ca.po
index 2e08b9d9..8957421a 100644
--- a/contract/i18n/ca.po
+++ b/contract/i18n/ca.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creat el"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Darrera Actualització per"
#. 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 "Darrera Actualització el"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Nom"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 "account.analytic.invoice.line"
#. 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 ""
diff --git a/contract/i18n/cs.po b/contract/i18n/cs.po
index 3dbc6db4..c50119fd 100644
--- a/contract/i18n/cs.po
+++ b/contract/i18n/cs.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Vytvořeno"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Naposled upraveno"
#. 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 "Naposled upraveno"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Název"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/da.po b/contract/i18n/da.po
index aa13bb3b..bed773a8 100644
--- a/contract/i18n/da.po
+++ b/contract/i18n/da.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Oprettet den"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Sidst opdateret af"
#. 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 "Sidst opdateret den"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Navn"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/de.po b/contract/i18n/de.po
index d42df5b8..8aa7299c 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -108,8 +108,8 @@ msgstr ""
"\n"
"
\n"
"
Bei Fragen zögern Sie bitte nicht, uns zu kontaktieren.
\n"
-" ${object.company_id.name or 'Wir'} bedanken uns für Ihren Auftrag!"
+"p>\n"
"
\n"
"
\n"
"
\n"
"
\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"
" \n"
" % if object.company_id.phone:\n"
"
\n"
" %endif\n"
"
\n"
@@ -150,102 +150,111 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
msgstr "${object.company_id.name} Vertrag (Ref ${object.name or 'n/a'})"
#. 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 "
#END#: End date of the invoiced period"
msgstr "
#END#: Enddatum der Abrechnungsperiode"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Anfangsdatum der Abrechnungsperiode"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
msgstr "
Vertrag: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Date Start: "
msgstr "
Anfangsdatum:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Description"
msgstr "
Beschreibung"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Partner:"
msgstr "
Partner:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Price"
msgstr "
Preis"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Quantity"
msgstr "
Menge"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Recurring Items"
msgstr "
Wiederkehrende Positionen"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Responsible: "
msgstr "
Verantwortlich:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Total"
msgstr "
Gesamt"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Unit Price"
msgstr "
Einzelpreis"
#. 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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "account.analytic.contract"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "Auto-Preis?"
#. 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 "Klicken um eine neue Vertragsvorlage zu erstellen."
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Klicken um neuen Vertrag anzulegen."
#. 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 "Unternehmen"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "E-Mail verfassen"
@@ -257,8 +266,8 @@ 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.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 "Vertrag"
@@ -275,94 +284,108 @@ msgid "Contract Lines"
msgstr "Vertragspositionen"
#. 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 "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: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 "Vertragsvorlagen"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Vertragsvorlage"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "Erzeuge Rechnungen"
#. 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 "Erzeugt durch"
#. 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 "Erzeugt am"
#. 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
+#: 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"
+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
+#, fuzzy
+msgid "Customer Contracts"
+msgstr "Verträ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
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
+#: 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 "Von (Datum)"
#. 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 "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
+#: 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 "bis (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
+#: 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_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 "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
+#: 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"
@@ -373,26 +396,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Rabatt (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -400,14 +423,14 @@ msgstr ""
"Rabatt auf erzeugte Rechnungen. Dieser muss kleiner oder gleich 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_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 "Anzeigebezeichnung"
#. 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 "Beendet"
@@ -419,26 +442,25 @@ msgid "Generate Recurring Invoices from Contracts"
msgstr "Erzeuge wiederkehrende Rechnung des Vertrags"
#. 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 "Erzeuge wiederkehrende Rechnungen automatisch"
#. 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 "Gruppiere..."
#. 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 "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_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 "
@@ -453,10 +475,9 @@ 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: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 "Rechnungspositionen"
@@ -466,45 +487,43 @@ 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: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 "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: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 "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_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 "Zuletzt verändert am"
#. 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 "Zuletzt aktualisiert durch"
#. 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 "Zuletzt aktualisiert am"
#. 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 "Legende (für Markeirungen in Beschreibungen der Rechnungspositionen)"
@@ -521,29 +540,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Name"
#. 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 "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_account_analytic_contract__partner_id
msgid "Partner (always False)"
msgstr "Partner (immer \"False\")"
#. 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 "Partner und Abteilungen"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "Legen Sie bitte ein Verkaufsjournal für das Unternehmen '%s' fest."
#. module: contract
@@ -559,125 +578,155 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Produkt"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Purchase Contracts"
+msgstr "Verträ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
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: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 "Wiederholung"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr "Verantwortlich"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Verträge"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "Reihenfolge der Vertragszeilen bei der Anzeige von Verträgen"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase contracts for this partner"
msgstr "Zeige Verträge für diesen Partner"
#. 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_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the sale contracts for this partner"
+msgstr "Zeige Verträge für diesen Partner"
+
+#. 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
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_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 "Legen Sie das Intervall für 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_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 "Spezifizieren, wenn Prozessdaum ist \"von\" oder \"bis\" Rechnungsdatum"
+msgstr ""
+"Spezifizieren, wenn Prozessdaum ist \"von\" oder \"bis\" Rechnungsdatum"
#. 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 "Zwischensumme"
#. 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
+#: 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
+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
+#, fuzzy
+msgid "Supplier Contracts"
+msgstr "Verträ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
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_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 "Mengeneinheit"
#. 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 "VAT:"
#. 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 "Gültig"
@@ -701,13 +750,19 @@ msgid ""
msgstr "Rechnungsdatum vor Beginn des Vertrags '%s' nicht möglich"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier 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:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -734,17 +789,12 @@ msgstr "Datum der nächsten Rechnung festlegen für Vertrag '%s'"
msgid "You must supply a start date for contract '%s'"
msgstr "Startdatum für Vertrag '%s' festlegen"
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "account.analytic.contract"
-msgstr "account.analytic.contract"
-
#. 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: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 "⇒ Zeige periodische Rechnungen"
diff --git a/contract/i18n/el_GR.po b/contract/i18n/el_GR.po
index 5243623b..6b410e70 100644
--- a/contract/i18n/el_GR.po
+++ b/contract/i18n/el_GR.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/en_GB.po b/contract/i18n/en_GB.po
index 373fcc53..f5976ab9 100644
--- a/contract/i18n/en_GB.po
+++ b/contract/i18n/en_GB.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Created on"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Last Updated by"
#. 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 "Last Updated on"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Name"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es.po b/contract/i18n/es.po
index 07004f7d..7d5123f1 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -148,102 +148,111 @@ 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: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 "
#END#: End date of the invoiced period"
msgstr "
#END#: Fecha fin del periodo facturado"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Fecha inicio del periodo facturado"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
msgstr "
Contrato: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Date Start: "
msgstr "
Fecha de inicio: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Description"
msgstr "
Descripción"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Partner:"
msgstr "
Empresa:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Price"
msgstr "
Precio"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Quantity"
msgstr "
Cantidad"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Recurring Items"
msgstr "
Elementos recurrentes"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Responsible: "
msgstr "
Responsable: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Total"
msgstr "
Total"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Unit Price"
msgstr "
Precio unidad"
#. 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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "account.analytic.contract"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "¿Precio automático?"
#. 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 "Pulse para crear una nueva plantilla de contrato."
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Pulse para crear un contrato nuevo."
#. 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 "Compañía"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "Componer correo electrónico"
@@ -255,8 +264,8 @@ 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.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 "Contrato"
@@ -274,59 +283,61 @@ msgid "Contract Lines"
msgstr "Líneas de contrato"
#. 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 "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: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 "Plantillas de contrato"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Plantilla de contrato"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_project_project_create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
msgid "Create Invoice Visibility"
msgstr "Visibilidad de crear factura"
#. 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 "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_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 "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_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 "Creado en"
#. 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 "Cliente"
@@ -337,44 +348,42 @@ msgid "Customer Contracts"
msgstr "Contratos de cliente"
#. 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 "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
+#: 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_account_analytic_account__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
+#: 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
+#: 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 "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
+#: 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 ""
@@ -385,26 +394,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Descuento (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -413,14 +422,14 @@ 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_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 "Nombre mostrado"
#. 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 "Finalizado"
@@ -432,26 +441,25 @@ 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
-#: 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 "Generar facturas recurrentes automáticamente"
#. 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 "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_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 "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_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 "
@@ -466,10 +474,9 @@ 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: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 "Líneas de factura"
@@ -479,45 +486,43 @@ 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: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 "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: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 "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_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 "Última modificación en"
#. 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 "Última actualización de"
#. 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 "Última actualización en"
#. 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 ""
"Leyenda (para los marcadores dentro de descripción en lineas de factura)"
@@ -535,29 +540,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Nombre"
#. 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 "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_account_analytic_contract__partner_id
msgid "Partner (always False)"
msgstr "Empresa (siempre Falso)"
#. 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 "Empresa y contactos"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "Por favor defina un diario de ventas para la compañía '%s'."
#. module: contract
@@ -573,111 +578,126 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Producto"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Purchase Contracts"
+msgstr "Contratos de cliente"
+
+#. 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
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: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 "Recurrencia"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr "Responsable"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contratos de proveedor"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "Secuencia de la linea de contrato cuando se muestra en los contratos"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase contracts for this partner"
+msgstr "Muestra los contratos para esta empresa/contacto"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the sale contracts for this partner"
msgstr "Muestra los contratos 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_account_analytic_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "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_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 ""
"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_account_analytic_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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: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 "Proveedor"
@@ -688,24 +708,24 @@ 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: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 "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_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 "Unidad de medida"
#. 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 "NIF:"
#. 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 "Válido"
@@ -731,13 +751,19 @@ msgstr ""
"del contrato '%s'"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr "¡Seleccione un cliente para este contrato %s!"
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -764,17 +790,12 @@ msgstr "Debe suministrar una fecha de próxima factura 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'"
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "account.analytic.contract"
-msgstr "account.analytic.contract"
-
#. 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: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 "⇒ Mostrar facturas recurrentes"
diff --git a/contract/i18n/es_AR.po b/contract/i18n/es_AR.po
index 1a9356e6..8be4dec1 100644
--- a/contract/i18n/es_AR.po
+++ b/contract/i18n/es_AR.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Última actualización realizada por"
#. 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 "Última actualización el"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nombre"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_CO.po b/contract/i18n/es_CO.po
index df1044d4..718c4412 100644
--- a/contract/i18n/es_CO.po
+++ b/contract/i18n/es_CO.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_CR.po b/contract/i18n/es_CR.po
index 5c5fcc01..079749d4 100644
--- a/contract/i18n/es_CR.po
+++ b/contract/i18n/es_CR.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Ultima actualización por"
#. 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 "Ultima actualización en"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nombre"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_DO.po b/contract/i18n/es_DO.po
index 64669f25..d51782b4 100644
--- a/contract/i18n/es_DO.po
+++ b/contract/i18n/es_DO.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_EC.po b/contract/i18n/es_EC.po
index 1c576309..d14f0a02 100644
--- a/contract/i18n/es_EC.po
+++ b/contract/i18n/es_EC.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 "Nombre"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_ES.po b/contract/i18n/es_ES.po
index 0b6455a6..20f9eceb 100644
--- a/contract/i18n/es_ES.po
+++ b/contract/i18n/es_ES.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Última actualización por"
#. 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 "Última actualización en"
#. 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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_MX.po b/contract/i18n/es_MX.po
index 3227e9bf..abc60ca5 100644
--- a/contract/i18n/es_MX.po
+++ b/contract/i18n/es_MX.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Ultima actualización por"
#. 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 "Ultima actualización en"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nombre"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_PY.po b/contract/i18n/es_PY.po
index f760698c..20c88313 100644
--- a/contract/i18n/es_PY.po
+++ b/contract/i18n/es_PY.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/es_VE.po b/contract/i18n/es_VE.po
index 4b118f43..9e29904a 100644
--- a/contract/i18n/es_VE.po
+++ b/contract/i18n/es_VE.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Ultima actualización por"
#. 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 "Ultima actualización en"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nombre"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/et.po b/contract/i18n/et.po
index 40f4a948..f29bddc8 100644
--- a/contract/i18n/et.po
+++ b/contract/i18n/et.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "Loodud"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 "Nimi"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/eu.po b/contract/i18n/eu.po
index 11c424bf..a53c4566 100644
--- a/contract/i18n/eu.po
+++ b/contract/i18n/eu.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 "Izena"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/fa.po b/contract/i18n/fa.po
index cfe62ad0..2d624748 100644
--- a/contract/i18n/fa.po
+++ b/contract/i18n/fa.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/fi.po b/contract/i18n/fi.po
index 49739bca..6cfe1d4a 100644
--- a/contract/i18n/fi.po
+++ b/contract/i18n/fi.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Luotu"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 "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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Nimi"
#. 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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Viimeksi muokattu"
#. 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 "Viimeksi päivittänyt"
#. 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 "Viimeksi päivitetty"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Nimi"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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 "Tuote"
#. 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_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
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: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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 "Mittayksikkö"
#. 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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po
index 325903ee..a458bbd4 100644
--- a/contract/i18n/fr.po
+++ b/contract/i18n/fr.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 "Contrat"
@@ -213,94 +221,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Contrat"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Date"
#. 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
+#: 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"
+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
+#, fuzzy
+msgid "Customer Contracts"
+msgstr "Contrats"
+
+#. 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"
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 "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
+#: 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,40 +333,40 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Nom à afficher"
#. 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 ""
@@ -356,26 +378,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 "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_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 "
@@ -388,10 +409,9 @@ 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: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 ""
@@ -401,45 +421,43 @@ 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: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 "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: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 "Dernière modification le"
#. 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 "Dernière mise à jour par"
#. 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 "Dernière mise à jour le"
#. 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 ""
@@ -456,29 +474,29 @@ 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 "Nom"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +512,152 @@ 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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Article"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Purchase Contracts"
+msgstr "Contrats"
+
+#. 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
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: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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr ""
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contrats"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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 "Sous-total"
#. 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
+#: 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
+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
+#, fuzzy
+msgid "Supplier Contracts"
+msgstr "Contrats"
+
+#. 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
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_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 "Unité de Mesure"
#. 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 ""
@@ -636,13 +681,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +718,12 @@ 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 ""
diff --git a/contract/i18n/fr_CA.po b/contract/i18n/fr_CA.po
index 38d1c8a0..51b80f68 100644
--- a/contract/i18n/fr_CA.po
+++ b/contract/i18n/fr_CA.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Créé le"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Afficher le nom"
#. 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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Dernière mise à jour par"
#. 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 "Dernière mise à jour le"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nom"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/fr_CH.po b/contract/i18n/fr_CH.po
index e145160b..1adaddf7 100644
--- a/contract/i18n/fr_CH.po
+++ b/contract/i18n/fr_CH.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Créé le"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Modifié par"
#. 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 "Modifié le"
#. 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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/gl.po b/contract/i18n/gl.po
index 35063417..a95b2420 100644
--- a/contract/i18n/gl.po
+++ b/contract/i18n/gl.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creado en"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Modificado por última vez o"
#. 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 "ültima actualización por"
#. 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 "Última actualización en"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Nome"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/gl_ES.po b/contract/i18n/gl_ES.po
index 0e0af9f9..ac01f56c 100644
--- a/contract/i18n/gl_ES.po
+++ b/contract/i18n/gl_ES.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/he.po b/contract/i18n/he.po
index 0b447fac..1749fb3c 100644
--- a/contract/i18n/he.po
+++ b/contract/i18n/he.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/hi_IN.po b/contract/i18n/hi_IN.po
index e53f80fc..d98f944d 100644
--- a/contract/i18n/hi_IN.po
+++ b/contract/i18n/hi_IN.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 "अनुबंध"
@@ -214,94 +222,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "अनुबंध टेम्पलेट"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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
+#, 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
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 ""
@@ -312,40 +334,40 @@ 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 "छूट (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +379,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 "
@@ -389,10 +410,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 ""
@@ -402,45 +422,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 ""
@@ -457,29 +475,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +513,152 @@ 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_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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "अनुबंध"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+#, 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
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 ""
@@ -637,13 +682,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +719,12 @@ 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 "account.analytic.invoice.line"
#. 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 ""
diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po
index 2413238b..38b8e9d2 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -89,102 +89,111 @@ 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 "
#END#: End date of the invoiced period"
msgstr "
#KRAJ#: Završni datum obračunatog perioda"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Početni datum obračunatog perioda"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "Stavke analitike"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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_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 "Kliknite za kreiranje novog ugovora."
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +205,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 "Ugovor"
@@ -214,94 +223,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Ugovor"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Kreirano"
#. 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
+#: 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"
+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
+#, 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
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 "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
+#: 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 ""
@@ -312,26 +335,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Popust (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -340,14 +363,14 @@ 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_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 "Naziv "
#. 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 ""
@@ -359,26 +382,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 "Automatski generira ponavljajuće račune"
#. 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 "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_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 "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_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 "
@@ -391,10 +413,9 @@ 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: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 "Stavke računa"
@@ -404,45 +425,43 @@ 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: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 "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: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 "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_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 "Zadnje modificirano"
#. 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 "Zadnji ažurirao"
#. 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 "Zadnje ažuriranje"
#. 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 "Legenda ( za markere unutar opisa stavaka računa)"
@@ -459,29 +478,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Naziv"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -497,125 +516,152 @@ 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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Proizvod"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "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
-#: 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 "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
-#: 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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Ugovori"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+#, 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
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 "Jedinica mjere"
#. 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 ""
@@ -639,13 +685,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -670,17 +722,12 @@ 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 "account.analytic.invoice.line"
#. 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 ""
diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po
index 42acb352..9848a2be 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -90,102 +90,111 @@ 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 "
#END#: End date of the invoiced period"
msgstr "
#KRAJ#: Krajnji datum perioda računa"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#POČETAK#: Početni datum perioda računa"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "account.analytic.contract"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "Kliknite za kreiranje novog predloška ugovora"
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Kliknite za kreiranje novog ugovora."
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +206,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 "Ugovor"
@@ -215,94 +224,108 @@ 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 "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: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 "Predlošci ugovora"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Predložak ugovora"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Kreirano"
#. 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
+#: 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"
+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
+#, 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
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 "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
+#: 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 ""
@@ -313,26 +336,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Popust (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -341,14 +364,14 @@ 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_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 "Naziv"
#. 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 ""
@@ -360,26 +383,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 "Generiraj ponavljajuće račune automatski"
#. 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 "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_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 "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_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 "
@@ -392,10 +414,9 @@ 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: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 "Stavke računa"
@@ -405,45 +426,43 @@ 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: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 "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: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 "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_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 "Zadnje modificirano"
#. 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 "Zadnji ažurirao"
#. 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 "Zadnje ažurirano"
#. 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 "Kazalo (za markere unutar opisa stavaka računa)"
@@ -460,29 +479,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Naziv"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'."
#. module: contract
@@ -498,125 +517,152 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Proizvod"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "Ponavljanje"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr ""
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Ugovori"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase contracts for this partner"
+msgstr ""
+
+#. module: contract
+#: 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 "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_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 "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_account_analytic_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
msgid "Sub Total"
msgstr "Podzbroj"
#. 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
+#: 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
+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
+#, 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
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_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 "Jedinica mjere"
#. 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 ""
@@ -640,13 +686,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: 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
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -671,17 +723,12 @@ 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 "account.analytic.contract"
-
#. 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: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 "⇒ Prikaži ponavljajuće račune"
diff --git a/contract/i18n/hu.po b/contract/i18n/hu.po
index 0175f858..9bedcc9f 100644
--- a/contract/i18n/hu.po
+++ b/contract/i18n/hu.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Létrehozás dátuma"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Utoljára frissítve, által"
#. 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 "Utoljára frissítve ekkor"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Név"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/id.po b/contract/i18n/id.po
index e4084264..87e4a355 100644
--- a/contract/i18n/id.po
+++ b/contract/i18n/id.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Dibuat pada"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Diperbaharui oleh"
#. 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 "Diperbaharui pada"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Nama"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/it.po b/contract/i18n/it.po
index 7cd37589..13d9f324 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -88,102 +88,111 @@ 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 "
#END#: End date of the invoiced period"
msgstr "
#END#: Data di fine del periodo fatturato"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Data di inizio del periodo fatturato"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "Righe analitiche"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "Cliccare qui per creare un nuovo template di contratto"
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Cliccare per creare un nuovo contratto"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +204,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 "Contratto"
@@ -213,94 +222,108 @@ 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 "Template 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: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 "Template di contratto"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Template di contratto"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Creato il"
#. 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
+#: 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"
+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
+#, fuzzy
+msgid "Customer Contracts"
+msgstr "Contratti"
+
+#. 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"
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 "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
+#: 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,26 +334,26 @@ msgid "Day(s)"
msgstr "Giorno(i)"
#. 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 "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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Sconto (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -338,14 +361,14 @@ 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_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 "Nome da visualizzare"
#. 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 ""
@@ -357,26 +380,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 "Genera automaticamente fatture ricorrenti"
#. 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 "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_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 "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_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 "
@@ -389,10 +411,9 @@ 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: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 "Righe fattura"
@@ -402,45 +423,43 @@ 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: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 "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: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 "Sezionale"
#. 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 "Ultima modifica il"
#. 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 "Ultimo aggiornamento di"
#. 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 "Ultimo aggiornamento il"
#. 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 ""
"Legenda (per i marcatori all'interno della descrizione delle righe fattura)"
@@ -458,29 +477,29 @@ msgid "Month(s) last day"
msgstr "Ultimo giorno del mese(i)"
#. 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 "Nome"
#. 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 "Prossima fattura"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "Definire un sezionale vendite per l'azienda '%s'."
#. module: contract
@@ -496,125 +515,152 @@ 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: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 "Listino"
#. 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 "Prodotto"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Purchase Contracts"
+msgstr "Contratti"
+
+#. 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
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: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 "Ricorrenza"
#. 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 "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
-#: 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 "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
-#: 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 "Ripeti ogni (Giorni/settimane/mesi/anni)"
#. 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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contratti"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase contracts for this partner"
+msgstr ""
+
+#. module: contract
+#: 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 "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_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 "Specificare se la data di elaborazione è 'dalla' o 'alla' data fattura"
#. 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 "Sub totale"
#. 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
+#: 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
+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
+#, fuzzy
+msgid "Supplier Contracts"
+msgstr "Contratti"
+
+#. 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
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_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 "Unità di misura"
#. 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 ""
@@ -638,13 +684,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr "Bisogna prima selezionare un cliente per il contratto %s!"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr "Bisogna prima selezionare un cliente per il contratto %s!"
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +721,12 @@ 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 "⇒ Mostra fatture ricorrenti"
diff --git a/contract/i18n/ja.po b/contract/i18n/ja.po
index 1a77a1a5..d5313066 100644
--- a/contract/i18n/ja.po
+++ b/contract/i18n/ja.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/ko.po b/contract/i18n/ko.po
index b4bff7f0..9b275df0 100644
--- a/contract/i18n/ko.po
+++ b/contract/i18n/ko.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/lt.po b/contract/i18n/lt.po
index f9032418..e802ae4c 100644
--- a/contract/i18n/lt.po
+++ b/contract/i18n/lt.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Sukurta"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Paskutini kartą atnaujino"
#. 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 "Paskutinį kartą atnaujinta"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Pavadinimas"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/lt_LT.po b/contract/i18n/lt_LT.po
index 016c3a35..edc668e5 100644
--- a/contract/i18n/lt_LT.po
+++ b/contract/i18n/lt_LT.po
@@ -90,102 +90,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +205,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 ""
@@ -215,94 +223,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Sukurta"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -313,40 +333,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -358,26 +378,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 "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_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 "
@@ -390,10 +409,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 ""
@@ -403,45 +421,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 "Paskutinį kartą atnaujino"
#. 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 "Paskutinį kartą atnaujinta"
#. 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 ""
@@ -458,29 +474,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -496,125 +512,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -638,13 +678,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +715,12 @@ 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 ""
diff --git a/contract/i18n/lv.po b/contract/i18n/lv.po
index cdabfee3..c33559e1 100644
--- a/contract/i18n/lv.po
+++ b/contract/i18n/lv.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Izveidots"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Pēdējo reizi atjaunoja"
#. 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 "Pēdējās izmaiņas"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nosaukums"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/mk.po b/contract/i18n/mk.po
index c9b47f92..9f5aa31c 100644
--- a/contract/i18n/mk.po
+++ b/contract/i18n/mk.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/mn.po b/contract/i18n/mn.po
index 4359f046..b2f45e22 100644
--- a/contract/i18n/mn.po
+++ b/contract/i18n/mn.po
@@ -88,102 +88,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/nb.po b/contract/i18n/nb.po
index 26c8d23f..4453b8c1 100644
--- a/contract/i18n/nb.po
+++ b/contract/i18n/nb.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Opprettet"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Sist oppdatert av"
#. 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 "Sist oppdatert"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Navn"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/nb_NO.po b/contract/i18n/nb_NO.po
index 26ebe1b1..10b6c79e 100644
--- a/contract/i18n/nb_NO.po
+++ b/contract/i18n/nb_NO.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Laget den"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Vis navn"
#. 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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Sist endret den"
#. 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 "Sist oppdatert av"
#. 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 "Sist oppdatert den"
#. 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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po
index 7b71f620..4d2ae7d6 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -108,8 +108,8 @@ msgstr ""
"
\n"
"
Mocht u nog vragen hebben, aarzel dan niet om contact met ons op te "
"nemen.
\n"
-"
Wij danken u voor het vertrouwen in ${object.company_id.name or "
-"'us'}!
\n"
+"
Wij danken u voor het vertrouwen in ${object.company_id.name or 'us'}!"
+"
\n"
"
\n"
"
\n"
"
\n"
"
\n"
-" ${object.company_id.name}
\n"
+" ${object.company_id."
+"name}\n"
" \n"
"
\n"
"
\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"
" \n"
" % if object.company_id.phone:\n"
"
\n"
" %endif\n"
"
\n"
@@ -150,102 +150,111 @@ 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: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 "
#END#: End date of the invoiced period"
msgstr "
#END#: Einddatum van de facturatieperiode"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Startdatum van de facturatie periode"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
msgstr "
Contract: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Date Start: "
msgstr "
Start Datum: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Description"
msgstr "
Omschrijving"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Partner:"
msgstr "
Klant:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Price"
msgstr "
Prijs"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Quantity"
msgstr "
Aantal"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Recurring Items"
msgstr "
Terugkerende items"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Responsible: "
msgstr "
Verantwoordelijke: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Total"
msgstr "
Totaal"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Unit Price"
msgstr "
Prijs per eenheid"
#. 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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "Kostenplaatsenboekingen"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "Automatische-prijs?"
#. 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 "Klik om een nieuwe contractsjabloon te maken."
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Klik voor het aanmaken van een nieuw contract."
#. 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 "Bedrijf"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "Email opstellen"
@@ -257,8 +266,8 @@ 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.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 "Contract"
@@ -275,94 +284,108 @@ msgid "Contract Lines"
msgstr "Contract Regels"
#. 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 "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: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 "Contract Sjablonen"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Contract Sjabloon"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Aangemaakt op"
#. 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
+#: 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"
+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
+#, 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
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
+#: 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_account_analytic_account__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
+#: 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
+#: 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_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 "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
+#: 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"
@@ -373,26 +396,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Korting (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -401,14 +424,14 @@ 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_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 "Weergave naam"
#. 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 "Voltooid"
@@ -420,26 +443,25 @@ 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
-#: 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 "Periodieke facturering"
#. 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 "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_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 "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_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 "
@@ -455,10 +477,9 @@ 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: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 "Sjablonen factuurregels"
@@ -468,45 +489,43 @@ 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: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 "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: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 "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_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 "Laatst bijgewerkt op"
#. 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 "Laatste bijgewerkt door"
#. 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 "Laatst bijgewerkt op"
#. 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 "Legenda (voor de markeringen binnen een factuurregel omschrijving)"
@@ -523,29 +542,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Naam"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, 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
@@ -561,125 +580,155 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Product"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "Herhaling"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr "Verantwoordelijke"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contracten"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "Volgorde van de contractregel bij het weergeven van contracten"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase 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_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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_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 "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_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 "Specificeer als de verwerkingsdatum de 'van' of 't/m' factuur datum is"
+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_account_analytic_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
msgid "Sub Total"
msgstr "Subtotaal"
#. 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
+#: 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
+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
+#, 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
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_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 "Maateenheid"
#. 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 "BTW:"
#. 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 "Geldig"
@@ -704,13 +753,19 @@ 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:206
+#: 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:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr "Er moet eerst een klant worden ingesteld op contract %s!"
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -737,17 +792,12 @@ msgstr "U moet een volgende factuurdatum opgeven voor contract '%s'"
msgid "You must supply a start date for contract '%s'"
msgstr "U moet een start datum opgeven voor contract '%s'"
-#. 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 "account.analytic.invoice.line"
#. 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 "⇒ Laat herhaalde facturen zien"
diff --git a/contract/i18n/nl_BE.po b/contract/i18n/nl_BE.po
index 294b86b0..02c558da 100644
--- a/contract/i18n/nl_BE.po
+++ b/contract/i18n/nl_BE.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Gemaakt op"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Laatst bijgewerkt door"
#. 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 "Laatst bijgewerkt op"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Naam"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/nl_NL.po b/contract/i18n/nl_NL.po
index 3318f30a..4d728990 100644
--- a/contract/i18n/nl_NL.po
+++ b/contract/i18n/nl_NL.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 "Contract"
@@ -214,94 +222,108 @@ 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 "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: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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Contractsjabloon"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "Aangemaakt op"
#. 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
+#: 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"
+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
+#, 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
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 ""
@@ -312,40 +334,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +379,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 "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_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 "
@@ -389,10 +410,9 @@ 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: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 ""
@@ -402,45 +422,43 @@ 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: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 "Laatst aangepast op"
#. 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 "Laatst bijgewerkt door"
#. 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 "Laatst bijgewerkt op"
#. 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 ""
@@ -457,29 +475,29 @@ 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 "Naam"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +513,152 @@ 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_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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contracten"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+#, 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
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 ""
@@ -637,13 +682,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +719,12 @@ 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 ""
diff --git a/contract/i18n/pl.po b/contract/i18n/pl.po
index 0b905682..261078ef 100644
--- a/contract/i18n/pl.po
+++ b/contract/i18n/pl.po
@@ -90,102 +90,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +205,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 ""
@@ -215,94 +223,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Data utworzenia"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -313,40 +333,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -358,26 +378,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 "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_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 "
@@ -390,10 +409,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 ""
@@ -403,45 +421,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 "Ostatnio modyfikowane przez"
#. 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 "Data ostatniej modyfikacji"
#. 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 ""
@@ -458,29 +474,29 @@ 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 "Nazwa"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -496,125 +512,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -638,13 +678,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +715,12 @@ 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 ""
diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po
index 940fe4ca..ed66aa38 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -150,102 +150,111 @@ 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: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 "
#END#: End date of the invoiced period"
msgstr "
#END#: Data final do período de faturação"
#. 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 "
#START#: Start date of the invoiced period"
msgstr "
#START#: Data inicial do período de faturação"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Contract: "
msgstr "
Contrato: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Date Start: "
msgstr "
Data Inicial: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Description"
msgstr "
Descrição"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Partner:"
msgstr "
Parceiro:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Price"
msgstr "
Preço"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Quantity"
msgstr "
Quantidade"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Recurring Items"
msgstr "
Itens Recorrentes"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Responsible: "
msgstr "
Responsável: :
"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Total"
msgstr "
Total"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "
Unit Price"
msgstr "
Preço Unitário"
#. 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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "account.analytic.contract"
+
+#. module: contract
+#: model_terms:ir.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"
#. 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 "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: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 "Preço-Auto?"
#. 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 "Clique para criar um novo modelo de contrato."
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Clique para criar um novo contrato."
#. 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 "Empresa"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "Escrever E-mail"
@@ -257,8 +266,8 @@ 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.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 "Contrato"
@@ -275,94 +284,108 @@ msgid "Contract Lines"
msgstr "Linhas de Contrato"
#. 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 "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: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 "Modelos de Contratos"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Modelo de Contrato"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_project_project_create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
msgid "Create Invoice Visibility"
msgstr "Visibilidade de Criação de Faturas"
#. 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 "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_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 "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_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 "Criado em"
#. 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
+#: 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"
+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
+#, 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
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
+#: 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_account_analytic_account__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
+#: 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
+#: 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_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 "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
+#: 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"
@@ -373,26 +396,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Desconto (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -400,14 +423,14 @@ 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_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 "Nome a Apresentar"
#. 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 "Concluído"
@@ -419,26 +442,25 @@ 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
-#: 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 "Gerar faturas recorrentes automaticamente"
#. 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 "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_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 "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_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 "
@@ -453,10 +475,9 @@ 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: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 "Linha de Fatura"
@@ -466,45 +487,43 @@ 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: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 "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: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 "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_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 "Última Modificação Em"
#. 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 "Atualizado pela última vez por"
#. 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 "Atualizado pela última vez em"
#. 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 "Legenda (para a descrição dos marcadores nas linhas de fatura)"
@@ -521,29 +540,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Nome"
#. 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 "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_account_analytic_contract__partner_id
msgid "Partner (always False)"
msgstr "Parceiro (sempre Falso)"
#. 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 "Parceiros e dependentes"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "Por favor, defina um diário de vendas para a empresa '%s'."
#. module: contract
@@ -559,127 +578,156 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Produto"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "Recorrência"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr "Responsável"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contratos"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "Sequência da linha na visualização de contratos"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase contracts for this partner"
+msgstr "Mostrar os contratos para este parceiro"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the sale contracts for this partner"
msgstr "Mostrar os contratos 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_account_analytic_contract_line__specific_price
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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 "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_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 ""
"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_account_analytic_contract_line__price_subtotal
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__price_subtotal
msgid "Sub Total"
msgstr "Subtotal"
#. 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
+#: 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
+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
+#, 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
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_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 "Unidade de Medida"
#. 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 "IVA:"
#. 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 "Válido"
@@ -704,13 +752,19 @@ 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:206
+#: 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:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr "Deve primeiro selecionar um Cliente para o Contrato %s!"
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -737,17 +791,12 @@ msgstr "Tem que indicar a próxima data de faturação 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'"
-#. module: contract
-#: model:ir.model,name:contract.model_account_analytic_contract
-msgid "account.analytic.contract"
-msgstr "account.analytic.contract"
-
#. 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: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 "⇒ Mostrar faturas recorrentes"
diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po
index 4c66ff16..9fc7d199 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -89,102 +89,110 @@ 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 "
#END#: 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 "
#START#: 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 "
Contract: "
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 "
Date Start: "
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 "
Description"
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 "
Partner:"
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 "
Price"
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 "
Quantity"
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 "
Recurring Items"
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 "
Responsible: "
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 "
Total"
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 "
Unit Price"
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 "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: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_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 "Clique para criar um novo contrato."
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 "Contrato"
@@ -214,94 +222,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Contrato"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Criado em"
#. 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
+#: 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"
+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
+#, 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
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 "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
+#: 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 ""
@@ -312,40 +334,40 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "Desconto (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "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_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 "Nome para Mostrar"
#. 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 ""
@@ -357,26 +379,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 "Gerar faturas recorrentes automaticamente"
#. 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 "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_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 "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_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 "
@@ -389,10 +410,9 @@ 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: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 "Linhas da fatura"
@@ -402,45 +422,43 @@ 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: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 "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: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 "Última atualização em"
#. 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 "Última atualização por"
#. 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 "Última atualização em"
#. 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 ""
@@ -457,29 +475,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Nome"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +513,152 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Produto"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr ""
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Contratos"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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 "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_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 "Sub total"
#. 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
+#: 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
+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
+#, 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
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_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 "Unidade de medida"
#. 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 ""
@@ -637,13 +682,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: 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
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +719,12 @@ 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 "⇒ Mostrar faturas recorrentes"
diff --git a/contract/i18n/pt_PT.po b/contract/i18n/pt_PT.po
index ada42387..36571d69 100644
--- a/contract/i18n/pt_PT.po
+++ b/contract/i18n/pt_PT.po
@@ -11,8 +11,8 @@ msgstr ""
"POT-Creation-Date: 2017-11-21 18:22+0000\n"
"PO-Revision-Date: 2018-09-24 22:47+0000\n"
"Last-Translator: Daniel Reis
\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/"
-"23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
"Language: pt_PT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -90,102 +90,110 @@ 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: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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +205,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 ""
@@ -215,94 +223,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Criado em"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -313,40 +333,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Nome a Apresentar"
#. 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 ""
@@ -358,26 +378,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 "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_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 "
@@ -390,10 +409,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 ""
@@ -403,45 +421,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 "Última Modificação em"
#. 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 "Atualizado pela última vez por"
#. 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 "Atualizado pela última vez em"
#. 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 ""
@@ -458,29 +474,29 @@ 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 "Nome"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -496,125 +512,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -638,13 +678,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +715,12 @@ 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 ""
diff --git a/contract/i18n/ro.po b/contract/i18n/ro.po
index 2e57bd2b..c2435a4b 100644
--- a/contract/i18n/ro.po
+++ b/contract/i18n/ro.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Creat la"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Nume Afişat"
#. 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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Ultima actualizare în"
#. 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 "Ultima actualizare făcută de"
#. 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 "Ultima actualizare la"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Nume"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/ru.po b/contract/i18n/ru.po
index 12328014..0b32d07f 100644
--- a/contract/i18n/ru.po
+++ b/contract/i18n/ru.po
@@ -90,102 +90,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +205,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 ""
@@ -215,94 +223,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Договоры"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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
+#, 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
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 ""
@@ -313,40 +335,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -358,26 +380,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 "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_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 "
@@ -390,10 +411,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 ""
@@ -403,45 +423,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 ""
@@ -458,29 +476,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -496,125 +514,152 @@ 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_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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Договоры"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+#, 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
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 ""
@@ -638,13 +683,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +720,12 @@ 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 ""
diff --git a/contract/i18n/sk.po b/contract/i18n/sk.po
index d8b39e0c..6f112847 100644
--- a/contract/i18n/sk.po
+++ b/contract/i18n/sk.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Vytvorené"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Naposledy upravil"
#. 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 "Naposledy upravené"
#. 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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/sk_SK.po b/contract/i18n/sk_SK.po
index 0e188ad2..35821b73 100644
--- a/contract/i18n/sk_SK.po
+++ b/contract/i18n/sk_SK.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/sl.po b/contract/i18n/sl.po
index d63682ab..0cb813f4 100644
--- a/contract/i18n/sl.po
+++ b/contract/i18n/sl.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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 "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: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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Ustvarjeno"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 "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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "Prikazni naziv"
#. 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 ""
@@ -357,26 +377,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 "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_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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Zadnjič spremenjeno"
#. 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 "Zadnjič posodobil"
#. 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 "Zadnjič posodobljeno"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Naziv"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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 "Proizvod"
#. 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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/sr.po b/contract/i18n/sr.po
index 9cac65ac..f5d659b6 100644
--- a/contract/i18n/sr.po
+++ b/contract/i18n/sr.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "Kreiran"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/sr@latin.po b/contract/i18n/sr@latin.po
index b62b4ae7..05908ce8 100644
--- a/contract/i18n/sr@latin.po
+++ b/contract/i18n/sr@latin.po
@@ -90,102 +90,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +205,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 ""
@@ -215,94 +223,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "Kreiran"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -313,40 +333,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -358,26 +378,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 "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_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 "
@@ -390,10 +409,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 ""
@@ -403,45 +421,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 ""
@@ -458,29 +474,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -496,125 +512,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -638,13 +678,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -669,17 +715,12 @@ 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 ""
diff --git a/contract/i18n/sv.po b/contract/i18n/sv.po
index 104f6e70..dbdc95e7 100644
--- a/contract/i18n/sv.po
+++ b/contract/i18n/sv.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 "Skapad den"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 "Senast uppdaterad av"
#. 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 "Senast uppdaterad"
#. 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 ""
@@ -456,29 +472,29 @@ 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 "Namn"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/th.po b/contract/i18n/th.po
index d8b3420a..119be4c4 100644
--- a/contract/i18n/th.po
+++ b/contract/i18n/th.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po
index 723ed25f..36e30b4d 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -151,102 +151,111 @@ 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: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 "#END#: End date of the invoiced period"
msgstr "#SONLANMA#: Faturalanma dönemin bitiş tarihi"
#. 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 "#START#: Start date of the invoiced period"
msgstr "#BAŞLAMA#: Faturalanma dönemin başlama tarihi"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Contract: "
msgstr "Sözleşme: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Date Start: "
msgstr "Başlama Tarihi : "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Description"
msgstr "Açıklama"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Partner:"
msgstr "İş Ortağı:"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Price"
msgstr "Fiyat"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Quantity"
msgstr "Miktar"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Recurring Items"
msgstr "Yinelenen Öğeler"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Responsible: "
msgstr "Sorumlu: "
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Total"
msgstr "Toplam"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Unit Price"
msgstr "Birim Fiyat"
#. 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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "Analitik Hesap Satırı"
+
+#. module: contract
+#: model_terms:ir.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ı"
#. 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 "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: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 "Otomatik Fiyat?"
#. 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 "Yeni bir sözleşme şablonu oluşturmak için tıklayın."
#. module: contract
-#: model:ir.actions.act_window,help:contract.action_account_analytic_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 "Yeni bir sözleşme oluşturmak için tıklayın."
#. 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 "Firma"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "E-posta Oluştur"
@@ -258,8 +267,8 @@ 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.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 "Sözleşme"
@@ -276,94 +285,108 @@ msgid "Contract Lines"
msgstr "Sözleşme Satırları"
#. 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 "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: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 "Sözleşme Şablonları"
#. module: contract
-#: model:ir.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Sözleşme Şablonu"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_project_project_create_invoice_visibility
+#: model:ir.model.fields,field_description:contract.field_account_analytic_account__create_invoice_visibility
msgid "Create Invoice Visibility"
msgstr "Fatura Görünürlüğü Oluştur"
#. 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 "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_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 "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_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 "Oluşturuldu"
#. 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
+#: 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"
+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
+#, 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
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
+#: 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 "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
+#: 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 "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
+#: 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 ""
@@ -374,26 +397,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "İndirim (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -401,14 +424,14 @@ 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_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 "Ad Görünümü"
#. 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 "Sonlanmış"
@@ -420,26 +443,25 @@ 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
-#: 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 "Otomatik olarak tekrarlanan faturalar oluştur"
#. 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 "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_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 "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_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 "
@@ -454,10 +476,9 @@ 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: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 "Fatura Satırları"
@@ -467,45 +488,43 @@ 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: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 "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: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 "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_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 "Son Değiştirilme"
#. 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 "Son Güncelleyen"
#. 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 "Son Güncelleme"
#. 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 "Açıklamalar (fatura satırlarındaki tanımlayıcılar için)"
@@ -522,29 +541,29 @@ 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_account_analytic_contract__name
msgid "Name"
msgstr "Adı"
#. 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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, 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
@@ -560,125 +579,154 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Ürün"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "Tekrarlayan"
#. 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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr "Sorumlu"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form
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_account_analytic_contract_line__sequence
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase contracts for this partner"
+msgstr "Bu iş ortağı için sözleşmeleri göster"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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_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 "Alt Toplam"
#. 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
+#: 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
+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
+#, 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
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_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 "Ölçü Birimi"
#. 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 "KDV:"
#. 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 "Geçerli"
@@ -702,13 +750,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: 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
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -733,17 +787,12 @@ 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 "⇒ Tekrarlayan Faturalar Göster"
diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po
index 16711939..ad7b509e 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -89,103 +89,112 @@ 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 "#END#: End date of the invoiced period"
msgstr " #Bitiş # strong>: Faturalandırılan dönemin bitiş tarihi"
#. 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 "#START#: Start date of the invoiced period"
msgstr ""
" #Başlama # strong>: Faturalandırılan dönemin başlangıç tarihi"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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
+#, fuzzy
+msgid "Account Analytic Contract"
+msgstr "Analitik Hesap Satırları"
+
+#. module: contract
+#: model_terms:ir.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ı"
#. 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 "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: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_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 "Yeni bir sözleşme oluşturmak için tıklayın."
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -197,8 +206,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 "Sözleşme"
@@ -215,94 +224,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "Sözleşme"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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_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 "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_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 "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_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 "Oluşturulma"
#. 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
+#: 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"
+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
+#, 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
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 "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
+#: 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 ""
@@ -313,26 +336,26 @@ 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_account_analytic_contract_line__name
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_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_account_analytic_contract_line__discount
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__discount
msgid "Discount (%)"
msgstr "İndirim (%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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"
@@ -340,14 +363,14 @@ 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_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 "Ad Görünümü"
#. 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 ""
@@ -359,26 +382,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 "Otomatik olarak tekrarlanan faturalar oluştur"
#. 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 "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_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 "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_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 "
@@ -391,10 +413,9 @@ 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: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 "Fatura Satırları"
@@ -404,45 +425,43 @@ 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: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 "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: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 "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_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 "Son Güncelleme"
#. 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 "Son Güncelleyen"
#. 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 "Son Güncelleme"
#. 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 "Açıklamalar (fatura satırlarındaki tanımlayıcılar için)"
@@ -459,29 +478,29 @@ 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_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 "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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, 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
@@ -497,125 +516,152 @@ 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: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 "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_account_analytic_contract_line__product_id
+#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line__product_id
msgid "Product"
msgstr "Ürün"
#. 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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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: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 "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
-#: 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 "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
-#: 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 "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_account_analytic_account__user_id
msgid "Responsible"
msgstr ""
#. module: contract
-#: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "Sözleşmeler"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase contracts for this partner"
+msgstr ""
+
+#. module: contract
+#: 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 "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_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 "Alt Toplam"
#. 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
+#: 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
+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
+#, 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
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_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 "Ölçü Birimi"
#. 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 ""
@@ -639,13 +685,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: 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:284
+#: 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
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -670,17 +722,12 @@ 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 "account.analytic.invoice.line"
#. 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 "⇒ Tekrarlanan faturaları göster"
diff --git a/contract/i18n/uk.po b/contract/i18n/uk.po
index a5f29abf..18a6c603 100644
--- a/contract/i18n/uk.po
+++ b/contract/i18n/uk.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/vi.po b/contract/i18n/vi.po
index a1c9edc7..85fbe942 100644
--- a/contract/i18n/vi.po
+++ b/contract/i18n/vi.po
@@ -88,102 +88,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -195,8 +203,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 ""
@@ -213,94 +221,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "Tạo trên"
#. 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
+#: 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"
+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"
+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"
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,40 +331,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -356,26 +376,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 "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_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 "
@@ -388,10 +407,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 ""
@@ -401,45 +419,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 ""
@@ -456,29 +472,29 @@ 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 "Tên"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -494,125 +510,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -636,13 +676,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -667,17 +713,12 @@ 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 ""
diff --git a/contract/i18n/vi_VN.po b/contract/i18n/vi_VN.po
index 9218c2a4..49db7f84 100644
--- a/contract/i18n/vi_VN.po
+++ b/contract/i18n/vi_VN.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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 "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_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 vào"
#. 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 "Cập nhật lần cuối bởi"
#. 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 "Cập nhật lần cuối vào"
#. 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 ""
@@ -457,29 +473,29 @@ 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 "Tên"
#. 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/zh.po b/contract/i18n/zh.po
index b0da69ee..e0c1c1fb 100644
--- a/contract/i18n/zh.po
+++ b/contract/i18n/zh.po
@@ -146,102 +146,111 @@ msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})"
msgstr "${object.company_id.name} 合同 (Ref ${object.name or 'n/a'})"
#. 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 "#END#: End date of the invoiced period"
msgstr "#END#: 发票期间的结束日期"
#. 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 "#START#: Start date of the invoiced period"
msgstr "#START#: 发票期间的开始日期"
#. module: contract
-#: model:ir.ui.view,arch_db:contract.report_contract_document
+#: model_terms:ir.ui.view,arch_db:contract.report_contract_document
msgid "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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
+#, fuzzy
+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_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 "公司"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr "撰写新邮件"
@@ -253,8 +262,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 "合同"
@@ -271,94 +280,108 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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
+#, fuzzy
+msgid "Contract Type"
+msgstr "合同模版"
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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
+#, 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
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 "到发票期间"
@@ -369,40 +392,40 @@ 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 "折扣比例(%)"
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 "折扣比例应用于通用发票,必须小于或等于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_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 "已完成"
@@ -414,26 +437,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 "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_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 "
@@ -448,10 +470,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 "发票明细"
@@ -461,45 +482,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 "图例(用于发票行描述内的标记)"
@@ -516,29 +535,29 @@ 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 "合作伙伴或依赖人"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
-#, python-format
-msgid "Please define a sale journal for the company '%s'."
+#: code:addons/contract/models/account_analytic_account.py:220
+#, fuzzy, python-format
+msgid "Please define a %s journal for the company '%s'."
msgstr "请定义一个销售凭证,公司 '%s'."
#. module: contract
@@ -554,125 +573,154 @@ 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_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_res_partner__purchase_contract_count
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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
+#, fuzzy
+msgid "Sale Contracts"
+msgstr "合同"
+
+#. module: contract
+#: 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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+msgid "Show the purchase contracts for this partner"
+msgstr "为合作伙伴显示合同"
+
+#. module: contract
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+#, fuzzy
+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
-#: 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
+#: 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
+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
+#, 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
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 "有效"
@@ -696,13 +744,19 @@ msgid ""
msgstr "在合同开始之前您不能有下一个开票日期 '%s'"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr "您必须先选择一个客户作为合同 %s!"
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, fuzzy, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr "您必须先选择一个客户作为合同 %s!"
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -729,17 +783,12 @@ msgstr "您必须为合同设置下一个开票日期 '%s'"
msgid "You must supply a start date for contract '%s'"
msgstr "您必须为合同设置开始日期'%s'"
-#. 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 "⇒ 显示复发发票"
diff --git a/contract/i18n/zh_CN.po b/contract/i18n/zh_CN.po
index 808eafb0..b210fc5a 100644
--- a/contract/i18n/zh_CN.po
+++ b/contract/i18n/zh_CN.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""
diff --git a/contract/i18n/zh_TW.po b/contract/i18n/zh_TW.po
index 25e4902a..a185d7eb 100644
--- a/contract/i18n/zh_TW.po
+++ b/contract/i18n/zh_TW.po
@@ -89,102 +89,110 @@ 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 "#END#: 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 "#START#: 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 "Contract: "
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 "Date Start: "
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 "Description"
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 "Partner:"
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 "Price"
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 "Quantity"
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 "Recurring Items"
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 "Responsible: "
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 "Total"
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 "Unit Price"
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_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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:332
+#: code:addons/contract/models/account_analytic_account.py:342
#, python-format
msgid "Compose Email"
msgstr ""
@@ -196,8 +204,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 ""
@@ -214,94 +222,106 @@ 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.actions.act_window,name:contract.action_account_analytic_overdue_all
-#: model:ir.model.fields,field_description:contract.field_res_partner_contract_count
-#: model:ir.model.fields,field_description:contract.field_res_users_contract_count
-#: model:ir.ui.menu,name:contract.menu_action_account_analytic_overdue_all
+#: 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 ""
+
+#. module: contract
#: model:ir.ui.menu,name:contract.menu_config_contract
-#: model:ir.ui.view,arch_db:contract.view_partner_form
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
-#: 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
+#: 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"
+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"
+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"
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 ""
@@ -312,40 +332,40 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_invoice_line.py:179
+#: code:addons/contract/models/account_analytic_contract_line.py:179
#, 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_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 ""
@@ -357,26 +377,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 "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_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 "
@@ -389,10 +408,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 ""
@@ -402,45 +420,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 ""
@@ -457,29 +473,29 @@ 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 ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:214
+#: code:addons/contract/models/account_analytic_account.py:220
#, python-format
-msgid "Please define a sale journal for the company '%s'."
+msgid "Please define a %s journal for the company '%s'."
msgstr ""
#. module: contract
@@ -495,125 +511,149 @@ 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_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_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
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.ui.view,arch_db:contract.account_analytic_account_recurring_form_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_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
-msgid "Show the contracts for this partner"
+#: model_terms:ir.ui.view,arch_db:contract.view_partner_form
+msgid "Show the purchase 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_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
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
-#: 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
+#: 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
+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
+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
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 ""
@@ -637,13 +677,19 @@ msgid ""
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:206
+#: code:addons/contract/models/account_analytic_account.py:211
#, python-format
msgid "You must first select a Customer for Contract %s!"
msgstr ""
#. module: contract
-#: code:addons/contract/models/account_analytic_account.py:284
+#: code:addons/contract/models/account_analytic_account.py:207
+#, python-format
+msgid "You must first select a Supplier for Contract %s!"
+msgstr ""
+
+#. module: contract
+#: code:addons/contract/models/account_analytic_account.py:294
#, python-format
msgid ""
"You must review start and end dates!\n"
@@ -668,17 +714,12 @@ 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 ""