diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 4fad58ad8..60831f929 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Contracts Management - Recurring', - 'version': '11.0.1.1.0', + 'version': '11.0.1.2.0', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "OpenERP SA, " diff --git a/contract/i18n/de.po b/contract/i18n/de.po index 918488dbc..22c0b0797 100644 --- a/contract/i18n/de.po +++ b/contract/i18n/de.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2017 +# Ricardo Gross , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-12-16 02:56+0000\n" +"PO-Revision-Date: 2017-12-16 02:56+0000\n" +"Last-Translator: Ricardo Gross , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,7 +137,7 @@ msgstr "" #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document msgid "Unit Price" -msgstr "" +msgstr "preis pro Stück" #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form @@ -153,7 +154,7 @@ msgstr "Kostenstelle" #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." -msgstr "" +msgstr "Klicken um eine neue Vertragsvorlage zu erstellen." #. module: contract #: model:ir.actions.act_window,help:contract.action_account_analytic_overdue_all @@ -161,15 +162,15 @@ msgid "Click to create a new contract." msgstr "Klicken, um neuen Vertrag anzulegen." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" -msgstr "" +msgstr "E-Mail verfassen" #. module: contract #: model:ir.model,name:contract.model_res_partner msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: contract #: model:ir.actions.report,name:contract.report_contract @@ -179,6 +180,12 @@ msgstr "" msgid "Contract" msgstr "Vertrag" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +215,11 @@ msgstr "" msgid "Contracts" msgstr "Verträge" +#. module: contract +#: 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 msgid "Create invoices" @@ -329,14 +341,10 @@ msgstr "Rechnungspositionen" msgid "Invoices" msgstr "Rechnungen" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "" @@ -402,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Legen Sie bitte ein Verkaufsjournal für das Unternehmen '%s' fest." @@ -485,6 +493,11 @@ msgstr "" 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" +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 @@ -538,19 +551,44 @@ msgid "Year(s)" msgstr "Jahr(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "Sie müssen zunächst einen Kunden für den Vertrag '%s' auswählen." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -561,11 +599,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/es.po b/contract/i18n/es.po index 9c15557ca..a75c7ddeb 100644 --- a/contract/i18n/es.po +++ b/contract/i18n/es.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Contrato: " #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document msgid "Date Start: " -msgstr "Fecha inicio: " +msgstr "Fecha de inicio: " #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document @@ -200,15 +200,15 @@ msgstr "Cuenta analítica" #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." -msgstr "Pinche para crear una nueva plantilla de contrato" +msgstr "Pulse para crear una nueva plantilla de contrato." #. module: contract #: model:ir.actions.act_window,help:contract.action_account_analytic_overdue_all msgid "Click to create a new contract." -msgstr "Pinche para crear un contrato nuevo. " +msgstr "Pulse para crear un contrato nuevo. " #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "Componer correo electrónico" @@ -226,6 +226,13 @@ msgstr "Contacto" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" +"La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -255,6 +262,11 @@ msgstr "Plantillas de contrato" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: 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 msgid "Create invoices" @@ -283,7 +295,7 @@ msgstr "Fecha fin" #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" -msgstr "Fecha inicio" +msgstr "Fecha de inicio" #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date @@ -377,14 +389,10 @@ msgstr "Líneas de factura" msgid "Invoices" msgstr "Facturas" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Tipo Facturación" - #. 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.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Tipo de facturación" @@ -451,10 +459,10 @@ msgid "Partner and dependents" msgstr "Empresa y contactos" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." -msgstr "Por favor define un diario de ventas para la compañía '%s'." +msgstr "Por favor defina un diario de ventas para la compañía '%s'." #. module: contract #: selection:account.analytic.account,recurring_invoicing_type:0 @@ -532,7 +540,12 @@ msgstr "Secuencia" #: 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 línea de contrato cuando se visualizan los contratos" +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" +msgstr "Muestra los contratos para esta empresa/contacto" #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type @@ -573,7 +586,7 @@ msgstr "NIF:" #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search msgid "Valid" -msgstr "Vigente" +msgstr "Válido" #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 @@ -588,13 +601,22 @@ msgid "Year(s)" msgstr "Año(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" +"No puede tener una fecha de próxima factura anterior a la fecha de inicio " +"del contrato '%s'" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" @@ -603,6 +625,24 @@ msgstr "" "Debe revisar las fechas de inicio y de fin\n" "%s" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "Debe especificar un cliente para el contrato '%s'" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "Debe suministrar una fecha de próxima factura para el contrato '%s'" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -613,11 +653,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "Mostrar los contratos de este partner" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po index 93141862a..c87f621db 100644 --- a/contract/i18n/fr.po +++ b/contract/i18n/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Contrat" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "" msgid "Contracts" msgstr "Contrats" +#. module: contract +#: 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 msgid "Create invoices" @@ -328,14 +339,10 @@ msgstr "" msgid "Invoices" msgstr "Factures" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Type de facture" @@ -401,7 +408,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -484,6 +491,11 @@ msgstr "" 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" +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 @@ -537,19 +549,44 @@ msgid "Year(s)" msgstr "Année(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -560,11 +597,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po index 3f84e6ddb..759541e6b 100644 --- a/contract/i18n/hr.po +++ b/contract/i18n/hr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Kliknite za kreiranje novog ugovora." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Ugovor" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "" msgid "Contracts" msgstr "Ugovori" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Stavke računa" msgid "Invoices" msgstr "Računi" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Vrsta izdavanja računa" @@ -403,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -486,6 +493,11 @@ msgstr "" 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" +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 @@ -539,19 +551,44 @@ msgid "Year(s)" msgstr "Godina(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -562,11 +599,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po index 51c4c36f9..be6b83da2 100644 --- a/contract/i18n/hr_HR.po +++ b/contract/i18n/hr_HR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Kliknite za kreiranje novog ugovora." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Ugovor" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "Predlošci ugovora" msgid "Contracts" msgstr "Ugovori" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Stavke računa" msgid "Invoices" msgstr "Računi" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Tip izdavanja računa" @@ -403,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'." @@ -486,6 +493,11 @@ msgstr "" 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" +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 @@ -539,19 +551,44 @@ msgid "Year(s)" msgstr "Godina(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -562,11 +599,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/it.po b/contract/i18n/it.po index 2a37ed728..2cdfa077a 100644 --- a/contract/i18n/it.po +++ b/contract/i18n/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Cliccare per creare un nuovo contratto" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Contratto" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "Template di contratto" msgid "Contracts" msgstr "Contratti" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Righe fattura" msgid "Invoices" msgstr "Fatture" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Tipo fatturazione" @@ -404,7 +411,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Definire un sezionale vendite per l'azienda '%s'." @@ -487,6 +494,11 @@ msgstr "" 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" +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 @@ -541,19 +553,44 @@ msgid "Year(s)" msgstr "Anno(i)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -564,11 +601,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po index a709f6bf8..a3293647a 100644 --- a/contract/i18n/nl.po +++ b/contract/i18n/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Klik voor het aanmaken van een nieuw contract" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Contract" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "" msgid "Contracts" msgstr "Contracten" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Sjablonen factuurregels" msgid "Invoices" msgstr "Facturen" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Factuur soort" @@ -403,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "U dient een verkoopboek te definiëren voor het bedrijf '%s'." @@ -486,6 +493,11 @@ msgstr "" 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" +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 @@ -541,19 +553,44 @@ msgid "Year(s)" msgstr "Jaar" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -564,11 +601,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po index 0863126ec..fbd5d6ab3 100644 --- a/contract/i18n/pt.po +++ b/contract/i18n/pt.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Clique para criar um novo contrato." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "Modelos de Contratos" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Linha de Fatura" msgid "Invoices" msgstr "Faturas" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Tipo de faturação" @@ -403,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Por favor, defina um diário de vendas para a empresa '%s'." @@ -486,6 +493,11 @@ msgstr "" 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" +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 @@ -541,19 +553,44 @@ msgid "Year(s)" msgstr "Ano(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -564,11 +601,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po index bda330f68..238aaaafa 100644 --- a/contract/i18n/pt_BR.po +++ b/contract/i18n/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Clique para criar um novo contrato." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: 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 msgid "Create invoices" @@ -329,14 +340,10 @@ msgstr "Linhas da fatura" msgid "Invoices" msgstr "Faturas" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Tipos de faturamento" @@ -402,7 +409,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -485,6 +492,11 @@ msgstr "" 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" +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 @@ -538,19 +550,44 @@ msgid "Year(s)" msgstr "Ano(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -561,11 +598,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po index b0dc1d1f2..faafdb1bd 100644 --- a/contract/i18n/tr.po +++ b/contract/i18n/tr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,7 @@ msgid "Click to create a new contract." msgstr "Yeni bir sözleşme oluşturmak için tıklayın." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +179,12 @@ msgstr "" msgid "Contract" msgstr "Sözleşme" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +214,11 @@ msgstr "Sözleşme Şablonları" msgid "Contracts" msgstr "Sözleşmeler" +#. module: contract +#: 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 msgid "Create invoices" @@ -329,14 +340,10 @@ msgstr "Fatura Satırları" msgid "Invoices" msgstr "Faturalar" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Fatura türü" @@ -402,7 +409,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Lütfen '%s' firması için bir satış yevmiyesi tanımlayın." @@ -485,6 +492,11 @@ msgstr "" 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" +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 @@ -538,19 +550,44 @@ msgid "Year(s)" msgstr "Yıl(lar)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -561,11 +598,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po index a9fa5d4b4..cd00b2e2f 100644 --- a/contract/i18n/tr_TR.po +++ b/contract/i18n/tr_TR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2017-12-11 09:28+0000\n" +"PO-Revision-Date: 2017-12-11 09:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -162,7 +162,7 @@ msgid "Click to create a new contract." msgstr "Yeni bir sözleşme oluşturmak için tıklayın." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: code:addons/contract/models/account_analytic_account.py:323 #, python-format msgid "Compose Email" msgstr "" @@ -180,6 +180,12 @@ msgstr "" msgid "Contract" msgstr "Sözleşme" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:140 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -209,6 +215,11 @@ msgstr "" msgid "Contracts" msgstr "Sözleşmeler" +#. module: contract +#: 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 msgid "Create invoices" @@ -330,14 +341,10 @@ msgstr "Fatura Satırları" msgid "Invoices" msgstr "Faturalar" -#. module: contract -#: model: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_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search msgid "Invoicing type" msgstr "Fatura türü" @@ -403,7 +410,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:226 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Lütfen '%s' şirketi için bir satış yevmiyesi tanımlayın." @@ -486,6 +493,11 @@ msgstr "" 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" +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 @@ -539,19 +551,44 @@ msgid "Year(s)" msgstr "Yıl(lar)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:113 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:218 #, 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:217 +#: code:addons/contract/models/account_analytic_account.py:275 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:104 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:122 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:131 +#, python-format +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" @@ -562,11 +599,6 @@ msgstr "" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/contract/models/account_analytic_account.py b/contract/models/account_analytic_account.py index de6464c69..1e1a1db35 100644 --- a/contract/models/account_analytic_account.py +++ b/contract/models/account_analytic_account.py @@ -50,6 +50,17 @@ class AccountAnalyticAccount(models.Model): index=True, default=lambda self: self.env.user, ) + create_invoice_visibility = fields.Boolean( + compute='_compute_create_invoice_visibility', + ) + + @api.depends('recurring_next_date', 'date_end') + def _compute_create_invoice_visibility(self): + for contract in self: + contract.create_invoice_visibility = ( + not contract.date_end or + contract.recurring_next_date <= contract.date_end + ) @api.onchange('contract_template_id') def _onchange_contract_template_id(self): @@ -76,15 +87,60 @@ class AccountAnalyticAccount(models.Model): )): self[field_name] = self.contract_template_id[field_name] - @api.onchange('recurring_invoices') - def _onchange_recurring_invoices(self): - if self.date_start and self.recurring_invoices: + @api.onchange('date_start') + def _onchange_date_start(self): + if self.date_start: self.recurring_next_date = self.date_start @api.onchange('partner_id') def _onchange_partner_id(self): self.pricelist_id = self.partner_id.property_product_pricelist.id + @api.constrains('partner_id', 'recurring_invoices') + def _check_partner_id_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.partner_id: + raise ValidationError( + _("You must supply a customer for the contract '%s'") % + contract.name + ) + + @api.constrains('recurring_next_date', 'date_start') + def _check_recurring_next_date_start_date(self): + for contract in self.filtered('recurring_next_date'): + if contract.date_start > contract.recurring_next_date: + raise ValidationError( + _("You can't have a next invoicing date before the start " + "of the contract '%s'") % contract.name + ) + + @api.constrains('recurring_next_date', 'recurring_invoices') + def _check_recurring_next_date_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.recurring_next_date: + raise ValidationError( + _("You must supply a next invoicing date for contract " + "'%s'") % contract.name + ) + + @api.constrains('date_start', 'recurring_invoices') + def _check_date_start_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.date_start: + raise ValidationError( + _("You must supply a start date for contract '%s'") % + contract.name + ) + + @api.constrains('date_start', 'date_end') + def _check_start_end_dates(self): + for contract in self.filtered('date_end'): + if contract.date_start > contract.date_end: + raise ValidationError( + _("Contract '%s' start date can't be later than end date") + % contract.name + ) + @api.multi def _convert_contract_lines(self, contract): self.ensure_one() @@ -204,8 +260,8 @@ class AccountAnalyticAccount(models.Model): @api.multi def recurring_create_invoice(self): - """ - Create invoices from contracts + """Create invoices from contracts + :return: invoices created """ invoices = self.env['account.invoice'] @@ -213,9 +269,12 @@ class AccountAnalyticAccount(models.Model): ref_date = contract.recurring_next_date or fields.Date.today() if (contract.date_start > ref_date or contract.date_end and contract.date_end < ref_date): + if self.env.context.get('cron'): + continue # Don't fail on cron jobs raise ValidationError( _("You must review start and end dates!\n%s") % - contract.name) + contract.name + ) old_date = fields.Date.from_string(ref_date) new_date = old_date + self.get_relative_delta( contract.recurring_rule_type, contract.recurring_interval) @@ -223,20 +282,20 @@ class AccountAnalyticAccount(models.Model): ctx.update({ 'old_date': old_date, 'next_date': new_date, - # Force company for correct evaluate domain access rules + # Force company for correct evaluation of domain access rules 'force_company': contract.company_id.id, }) # Re-read contract with correct company invoices |= contract.with_context(ctx)._create_invoice() contract.write({ - 'recurring_next_date': new_date.strftime('%Y-%m-%d') + 'recurring_next_date': fields.Date.to_string(new_date) }) return invoices @api.model def cron_recurring_create_invoice(self): today = fields.Date.today() - contracts = self.search([ + contracts = self.with_context(cron=True).search([ ('recurring_invoices', '=', True), ('recurring_next_date', '<=', today), '|', diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py index 0746c0e91..c82baf0bc 100644 --- a/contract/tests/test_contract.py +++ b/contract/tests/test_contract.py @@ -64,18 +64,14 @@ class TestContract(TestContractBase): res = self.acct_line._onchange_product_id() self.assertIn('uom_id', res['domain']) self.acct_line.price_unit = 100.0 - - self.contract.partner_id = False with self.assertRaises(ValidationError): - self.contract.recurring_create_invoice() + self.contract.partner_id = False self.contract.partner_id = self.partner.id - self.contract.recurring_create_invoice() self.invoice_monthly = self.env['account.invoice'].search( [('contract_id', '=', self.contract.id)]) self.assertTrue(self.invoice_monthly) self.assertEqual(self.contract.recurring_next_date, '2016-03-29') - self.inv_line = self.invoice_monthly.invoice_line_ids[0] self.assertTrue(self.inv_line.invoice_line_tax_ids) self.assertAlmostEqual(self.inv_line.price_subtotal, 50.0) @@ -128,11 +124,11 @@ class TestContract(TestContractBase): self.assertEqual(self.contract.pricelist_id, self.contract.partner_id.property_product_pricelist) - def test_onchange_recurring_invoices(self): - self.contract.recurring_next_date = False - self.contract._onchange_recurring_invoices() - self.assertEqual(self.contract.recurring_next_date, - self.contract.date_start) + def test_onchange_date_start(self): + date = '2016-01-01' + self.contract.date_start = date + self.contract._onchange_date_start() + self.assertEqual(self.contract.recurring_next_date, date) def test_uom(self): uom_litre = self.env.ref('product.product_uom_litre') @@ -159,6 +155,31 @@ class TestContract(TestContractBase): with self.assertRaises(ValidationError): contract_no_journal.recurring_create_invoice() + def test_check_date_end(self): + with self.assertRaises(ValidationError): + self.contract.date_end = '2015-12-31' + + def test_check_recurring_next_date_start_date(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'date_start': '2017-01-01', + 'recurring_next_date': '2016-01-01', + }) + + def test_check_recurring_next_date_recurring_invoices(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'recurring_invoices': True, + 'recurring_next_date': False, + }) + + def test_check_date_start_recurring_invoices(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'recurring_invoices': True, + 'date_start': False, + }) + def test_onchange_contract_template_id(self): """It should change the contract values to match the template.""" self.contract.contract_template_id = self.template @@ -240,24 +261,14 @@ class TestContract(TestContractBase): self.contract.copy() self.assertEqual(self.partner.contract_count, count) - def test_date_end(self): - """It should don't create invoices from finished contract.""" - AccountInvoice = self.env['account.invoice'] - self.contract.date_end = '2015-12-31' - with self.assertRaises(ValidationError): - self.contract.recurring_create_invoice() - init_count = AccountInvoice.search_count( - [('contract_id', '=', self.contract.id)]) - self.contract.cron_recurring_create_invoice() - last_count = AccountInvoice.search_count( - [('contract_id', '=', self.contract.id)]) - self.assertEqual(last_count, init_count) - def test_same_date_start_and_date_end(self): """It should create one invoice with same start and end date.""" AccountInvoice = self.env['account.invoice'] - self.contract.date_start = self.contract.date_end = fields.Date.today() - self.contract.recurring_next_date = self.contract.date_start + self.contract.write({ + 'date_start': fields.Date.today(), + 'date_end': fields.Date.today(), + 'recurring_next_date': fields.Date.today(), + }) init_count = AccountInvoice.search_count( [('contract_id', '=', self.contract.id)]) self.contract.cron_recurring_create_invoice() @@ -266,3 +277,15 @@ class TestContract(TestContractBase): self.assertEqual(last_count, init_count + 1) with self.assertRaises(ValidationError): self.contract.recurring_create_invoice() + + def test_compute_create_invoice_visibility(self): + self.contract.write({ + 'recurring_next_date': '2017-01-01', + 'date_start': '2016-01-01', + 'date_end': False, + }) + self.assertTrue(self.contract.create_invoice_visibility) + self.contract.date_end = '2017-01-01' + self.assertTrue(self.contract.create_invoice_visibility) + self.contract.date_end = '2016-01-01' + self.assertFalse(self.contract.create_invoice_visibility) diff --git a/contract/views/account_analytic_account_view.xml b/contract/views/account_analytic_account_view.xml index 3058a09ef..1d2680416 100644 --- a/contract/views/account_analytic_account_view.xml +++ b/contract/views/account_analytic_account_view.xml @@ -8,6 +8,9 @@ primary + + {'required': [('recurring_invoices', '=', True)]} +