From f066755e49645b4e5e54010e35dc7826d1526b55 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Wed, 17 Jan 2018 10:22:34 +0100 Subject: [PATCH] [IMP+FIX] contract: Several things: * [IMP] Add computed dates from/to period invoiced (#140) * [IMP] Improve partner contract smartbutton * [FIX] Onchange contract template raise error * [FIX] Invalid pricelist name --- contract/__manifest__.py | 4 +- contract/i18n/ca.po | 97 +++++++++++++--- contract/i18n/de.po | 54 +++++++-- contract/i18n/es.po | 52 +++++++-- contract/i18n/fr.po | 67 +++++++++-- contract/i18n/hi_IN.po | 109 +++++++++++++++--- contract/i18n/hr.po | 67 +++++++++-- contract/i18n/hr_HR.po | 52 +++++++-- contract/i18n/it.po | 52 +++++++-- contract/i18n/nl.po | 52 +++++++-- contract/i18n/nl_NL.po | 109 +++++++++++++++--- contract/i18n/pt.po | 52 +++++++-- contract/i18n/pt_BR.po | 52 +++++++-- contract/i18n/tr.po | 52 +++++++-- contract/i18n/tr_TR.po | 54 +++++++-- contract/models/account_analytic_account.py | 35 +++--- .../models/account_analytic_invoice_line.py | 55 ++++++++- contract/models/res_partner.py | 6 +- .../views/account_analytic_account_view.xml | 9 +- 19 files changed, 856 insertions(+), 174 deletions(-) diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 9d5ac02d9..eaa39d61f 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -1,14 +1,14 @@ # Copyright 2004-2010 OpenERP SA # Copyright 2014-2017 Tecnativa - Pedro M. Baeza # Copyright 2015 Domatix -# Copyright 2016-2017 Tecnativa - Carlos Dauden +# Copyright 2016-2018 Tecnativa - Carlos Dauden # Copyright 2017 Tecnativa - Vicent Cubells # Copyright 2016-2017 LasLabs Inc. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Contracts Management - Recurring', - 'version': '11.0.1.4.0', + 'version': '11.0.1.4.3', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "OpenERP SA, " diff --git a/contract/i18n/ca.po b/contract/i18n/ca.po index 7058b95c8..4c19fe241 100644 --- a/contract/i18n/ca.po +++ b/contract/i18n/ca.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: 2018-01-17 13:50+0000\n" +"PO-Revision-Date: 2018-01-17 13:50+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,12 @@ msgid "Click to create a new contract." msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: 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:309 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +184,12 @@ msgstr "" msgid "Contract" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -208,6 +219,11 @@ msgstr "" msgid "Contracts" msgstr "" +#. 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" @@ -233,16 +249,40 @@ msgstr "Creat el" msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date msgid "Date of Next Invoice" msgstr "" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -262,7 +302,7 @@ msgid "Discount (%)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "" @@ -328,14 +368,10 @@ msgstr "" msgid "Invoices" msgstr "" -#. 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 "" @@ -401,7 +437,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:212 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -484,6 +520,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 +578,44 @@ msgid "Year(s)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:111 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:204 #, 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:261 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:102 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:120 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:129 +#, 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" @@ -558,12 +624,7 @@ 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.view_partner_form -msgid "show the contracts for this partner" -msgstr "" +msgstr "account.analytic.invoice.line" #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form diff --git a/contract/i18n/de.po b/contract/i18n/de.po index 0d9a7dafd..2eace3128 100644 --- a/contract/i18n/de.po +++ b/contract/i18n/de.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -167,7 +167,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "E-Mail verfassen" @@ -198,6 +198,7 @@ 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 msgid "Contract Template" msgstr "" @@ -222,6 +223,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -246,20 +248,46 @@ msgstr "Angelegt 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Datum der nächsten Rechnung" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -279,7 +307,7 @@ msgid "Discount (%)" msgstr "Rabatt (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "Rabatt muss kleiner oder gleich 100 sein" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Erzeuge wiederkehrende Rechnungen automatisch" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Rechnungspositionen" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Journal" @@ -415,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Legen Sie bitte ein Verkaufsjournal für das Unternehmen '%s' fest." @@ -435,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Preisliste" @@ -454,6 +487,7 @@ 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 msgid "Recurrence" msgstr "" @@ -467,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Wiederholung in (Tagen/Wochen/Monaten/Jahren)" @@ -506,12 +542,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -563,13 +601,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" @@ -602,7 +640,7 @@ msgstr "" #. module: contract #: model:ir.model,name:contract.model_account_analytic_invoice_line msgid "account.analytic.invoice.line" -msgstr "" +msgstr "account.analytic.invoice.line" #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form diff --git a/contract/i18n/es.po b/contract/i18n/es.po index ea6be933b..8d9904a7d 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -213,7 +213,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "Componer correo electrónico" @@ -245,6 +245,7 @@ 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 msgid "Contract Template" msgstr "Plantilla de contrato" @@ -269,6 +270,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -293,20 +295,46 @@ 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 msgid "Date End" msgstr "Fecha fin" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: 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 +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Próxima fecha de factura" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -326,7 +354,7 @@ msgid "Discount (%)" msgstr "Descuento (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "El descuento debería ser menor o igual a 100" @@ -362,6 +390,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Generar facturas recurrentes automáticamente." @@ -385,6 +414,7 @@ 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 msgid "Invoice Lines" msgstr "Líneas de factura" @@ -397,6 +427,7 @@ 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 msgid "Invoicing type" msgstr "Tipo de facturación" @@ -404,6 +435,7 @@ 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 msgid "Journal" msgstr "Diario" @@ -464,7 +496,7 @@ msgid "Partner and dependents" msgstr "Empresa y contactos" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Por favor defina un diario de ventas para la compañía '%s'." @@ -484,6 +516,7 @@ 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 msgid "Pricelist" msgstr "Lista de precios" @@ -503,6 +536,7 @@ 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 msgid "Recurrence" msgstr "Recurrencia" @@ -516,12 +550,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Repetir cada (días/semana/mes/año)" @@ -555,12 +591,14 @@ msgstr "Muestra los contratos para esta empresa/contacto" #. 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 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 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" @@ -615,13 +653,13 @@ msgstr "" "del contrato '%s'" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po index c87f621db..1b4b7ece2 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-12-11 09:28+0000\n" -"PO-Revision-Date: 2017-12-11 09:28+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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,12 @@ msgid "Click to create a new contract." msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:323 +#: 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:312 #, python-format msgid "Compose Email" msgstr "" @@ -180,7 +185,7 @@ msgid "Contract" msgstr "Contrat" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:140 +#: code:addons/contract/models/account_analytic_account.py:138 #, python-format msgid "Contract '%s' start date can't be later than end date" msgstr "" @@ -192,6 +197,7 @@ 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 msgid "Contract Template" msgstr "" @@ -216,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -240,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Date de la prochaine facture" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -273,7 +306,7 @@ msgid "Discount (%)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "" @@ -307,6 +340,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "" @@ -330,6 +364,7 @@ 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 msgid "Invoice Lines" msgstr "" @@ -342,6 +377,7 @@ 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 msgid "Invoicing type" msgstr "Type de facture" @@ -349,6 +385,7 @@ 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 msgid "Journal" msgstr "" @@ -408,7 +445,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:226 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -428,6 +465,7 @@ 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 msgid "Pricelist" msgstr "Liste de prix" @@ -447,6 +485,7 @@ 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 msgid "Recurrence" msgstr "" @@ -460,12 +499,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Répéter chaque (Jours/Semaine/Mois/Année)" @@ -499,12 +540,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -549,20 +592,20 @@ msgid "Year(s)" msgstr "Année(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:113 +#: code:addons/contract/models/account_analytic_account.py:111 #, python-format msgid "" "You can't have a next invoicing date before the start of the contract '%s'" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:218 +#: code:addons/contract/models/account_analytic_account.py:206 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:275 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" @@ -570,19 +613,19 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:104 +#: code:addons/contract/models/account_analytic_account.py:102 #, python-format msgid "You must supply a customer for the contract '%s'" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:122 +#: code:addons/contract/models/account_analytic_account.py:120 #, 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 +#: code:addons/contract/models/account_analytic_account.py:129 #, python-format msgid "You must supply a start date for contract '%s'" msgstr "" diff --git a/contract/i18n/hi_IN.po b/contract/i18n/hi_IN.po index 4de74165f..1b0100a2c 100644 --- a/contract/i18n/hi_IN.po +++ b/contract/i18n/hi_IN.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: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,12 @@ msgid "Click to create a new contract." msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: 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:312 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +184,12 @@ msgstr "" msgid "Contract" msgstr "अनुबंध" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +197,7 @@ 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 msgid "Contract Template" msgstr "अनुबंध टेम्पलेट" @@ -208,6 +220,12 @@ msgstr "" 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 +msgid "Create Invoice Visibility" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "Create invoices" @@ -229,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -262,7 +306,7 @@ msgid "Discount (%)" msgstr "छूट (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "" @@ -296,6 +340,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "" @@ -319,6 +364,7 @@ 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 msgid "Invoice Lines" msgstr "" @@ -328,20 +374,18 @@ msgstr "" msgid "Invoices" msgstr "चालान" -#. 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.model.fields,field_description:contract.field_project_project_recurring_invoicing_type +#: 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_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 msgid "Journal" msgstr "पत्रिका" @@ -401,7 +445,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:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -421,6 +465,7 @@ 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 msgid "Pricelist" msgstr "" @@ -440,6 +485,7 @@ 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 msgid "Recurrence" msgstr "" @@ -453,12 +499,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "" @@ -484,15 +532,22 @@ 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 +#: model:ir.model.fields,help:contract.field_project_project_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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -537,19 +592,44 @@ msgid "Year(s)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:111 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:264 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:102 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:120 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:129 +#, 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 +640,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.po b/contract/i18n/hr.po index 759541e6b..e8d2f30ed 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-12-11 09:28+0000\n" -"PO-Revision-Date: 2017-12-11 09:28+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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,12 @@ msgid "Click to create a new contract." msgstr "Kliknite za kreiranje novog ugovora." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:323 +#: 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:312 #, python-format msgid "Compose Email" msgstr "" @@ -180,7 +185,7 @@ msgid "Contract" msgstr "Ugovor" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:140 +#: code:addons/contract/models/account_analytic_account.py:138 #, python-format msgid "Contract '%s' start date can't be later than end date" msgstr "" @@ -192,6 +197,7 @@ 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 msgid "Contract Template" msgstr "" @@ -216,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -240,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Datum sljedećeg računa" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -273,7 +306,7 @@ msgid "Discount (%)" msgstr "Popust (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "Popusti bi trebali biti manji ili jednaki 100" @@ -309,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Automatski generira ponavljajuće račune" @@ -332,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Stavke računa" @@ -344,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Vrsta izdavanja računa" @@ -351,6 +387,7 @@ 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 msgid "Journal" msgstr "Dnevnik" @@ -410,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:226 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -430,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Cjenik" @@ -449,6 +487,7 @@ 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 msgid "Recurrence" msgstr "" @@ -462,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "" @@ -501,12 +542,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -551,20 +594,20 @@ msgid "Year(s)" msgstr "Godina(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:113 +#: code:addons/contract/models/account_analytic_account.py:111 #, python-format msgid "" "You can't have a next invoicing date before the start of the contract '%s'" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:218 +#: code:addons/contract/models/account_analytic_account.py:206 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:275 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" @@ -572,19 +615,19 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:104 +#: code:addons/contract/models/account_analytic_account.py:102 #, python-format msgid "You must supply a customer for the contract '%s'" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:122 +#: code:addons/contract/models/account_analytic_account.py:120 #, 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 +#: code:addons/contract/models/account_analytic_account.py:129 #, python-format msgid "You must supply a start date for contract '%s'" msgstr "" diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po index a3846bd44..be6459734 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "Predložak ugovora" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Datum sljedećeg računa" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "Popust (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "Popust treba biti manji ili jednak 100" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Generiraj ponavljajuće račune automatski" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Stavke računa" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Tip izdavanja računa" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Dnevnik" @@ -415,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'." @@ -435,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Cjenik" @@ -454,6 +487,7 @@ 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 msgid "Recurrence" msgstr "Ponavljanje" @@ -467,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Ponavljaj svakih (Dana/Tjedana/Mjesec/Godina)" @@ -506,12 +542,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "Navedite da li je datum obrade 'od' ili 'do' datuma računa" @@ -563,13 +601,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/it.po b/contract/i18n/it.po index 6dd590d60..04c50b68d 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "Template di contratto" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Data prossima fattura" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "Sconto (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "Lo sconto dovrebbe essere minore o uguale a 100" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Genera automaticamente fatture ricorrenti" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Righe fattura" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Tipo fatturazione" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Sezionale" @@ -416,7 +448,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "Definire un sezionale vendite per l'azienda '%s'." @@ -436,6 +468,7 @@ 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 msgid "Pricelist" msgstr "Listino" @@ -455,6 +488,7 @@ 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 msgid "Recurrence" msgstr "Ricorrenza" @@ -468,12 +502,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Ripeti ogni (Giorni/settimane/mesi/anni)" @@ -507,12 +543,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" "Specificare se la data di elaborazione è 'dalla' o 'alla' data fattura" @@ -565,13 +603,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po index 0b5d21252..37f1034cb 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Datum volgende factuur" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "Korting (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "De korting moet kleiner of gelijk aan 100 zijn" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Periodieke facturering" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Sjablonen factuurregels" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Factuur soort" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Dagboek" @@ -415,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "U dient een verkoopboek te definiëren voor het bedrijf '%s'." @@ -435,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Prijslijst" @@ -454,6 +487,7 @@ 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 msgid "Recurrence" msgstr "" @@ -467,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Herhaal elke (dag/week/maand/jaar)" @@ -506,6 +542,7 @@ 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 msgid "Specify Interval for automatic invoice generation." msgstr "" "Specificeer het interval voor het aanmaken van de herhalende facturen." @@ -513,6 +550,7 @@ 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" "Specificeer als de verwerkingsdatum de 'van' of 't/m' factuur datum is." @@ -565,13 +603,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/nl_NL.po b/contract/i18n/nl_NL.po index 1c2ec004a..da3a50a43 100644 --- a/contract/i18n/nl_NL.po +++ b/contract/i18n/nl_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: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" "MIME-Version: 1.0\n" @@ -161,7 +161,12 @@ msgid "Click to create a new contract." msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: 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:312 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +184,12 @@ msgstr "" msgid "Contract" msgstr "Contract" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +197,7 @@ 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 msgid "Contract Template" msgstr "Contractsjabloon" @@ -208,6 +220,12 @@ msgstr "" 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 +msgid "Create Invoice Visibility" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "Create invoices" @@ -229,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -262,7 +306,7 @@ msgid "Discount (%)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "" @@ -296,6 +340,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "" @@ -319,6 +364,7 @@ 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 msgid "Invoice Lines" msgstr "" @@ -328,20 +374,18 @@ msgstr "" 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.model.fields,field_description:contract.field_project_project_recurring_invoicing_type +#: 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_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 msgid "Journal" msgstr "" @@ -401,7 +445,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:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -421,6 +465,7 @@ 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 msgid "Pricelist" msgstr "" @@ -440,6 +485,7 @@ 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 msgid "Recurrence" msgstr "" @@ -453,12 +499,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "" @@ -484,15 +532,22 @@ 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 +#: model:ir.model.fields,help:contract.field_project_project_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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -537,19 +592,44 @@ msgid "Year(s)" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:111 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:264 #, python-format msgid "" "You must review start and end dates!\n" "%s" msgstr "" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:102 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:120 +#, python-format +msgid "You must supply a next invoicing date for contract '%s'" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:129 +#, 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 +640,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/pt.po b/contract/i18n/pt.po index 9c1983466..ac2751235 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "Modelo de Contrato" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Data da Próxima Fatura" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "Desconto (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "O desconto deve ser igual ou inferior a 100" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Gerar faturas recorrentes automaticamente" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Linha de Fatura" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Tipo de faturação" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Diário" @@ -415,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, 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'." @@ -435,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Lista de Preços" @@ -454,6 +487,7 @@ 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 msgid "Recurrence" msgstr "Recorrência" @@ -467,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Repatir a cada (Dia/Semana/Mês/Ano)" @@ -506,12 +542,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" "Especifique se a data de processamento é 'de' ou 'até' relativamente à data " @@ -565,13 +603,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po index 07314475c..d8865549f 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Dia da próxima fatura" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "Desconto (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "Desconto deve ser menor ou igual a 100" @@ -313,6 +341,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Gerar faturas recorrentes automaticamente" @@ -336,6 +365,7 @@ 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 msgid "Invoice Lines" msgstr "Linhas da fatura" @@ -348,6 +378,7 @@ 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 msgid "Invoicing type" msgstr "Tipos de faturamento" @@ -355,6 +386,7 @@ 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 msgid "Journal" msgstr "" @@ -414,7 +446,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." msgstr "" @@ -434,6 +466,7 @@ 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 msgid "Pricelist" msgstr "Lista de preço" @@ -453,6 +486,7 @@ 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 msgid "Recurrence" msgstr "" @@ -466,12 +500,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Repete cada (Dia/Semana/Mês/Ano)" @@ -505,12 +541,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -562,13 +600,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po index f1d78cc15..43ac28e21 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: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" @@ -166,7 +166,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -197,6 +197,7 @@ 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 msgid "Contract Template" msgstr "Sözleşme Şablonu" @@ -221,6 +222,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -245,20 +247,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Sonraki Fatura Tarihi" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -278,7 +306,7 @@ msgid "Discount (%)" msgstr "İndirim (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "İndirim 100'den az veya ona eşit olmalıdır" @@ -313,6 +341,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Otomatik olarak tekrarlanan faturalar oluştur" @@ -336,6 +365,7 @@ 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 msgid "Invoice Lines" msgstr "Fatura Satırları" @@ -348,6 +378,7 @@ 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 msgid "Invoicing type" msgstr "Fatura türü" @@ -355,6 +386,7 @@ 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 msgid "Journal" msgstr "Yevmiye" @@ -414,7 +446,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, 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." @@ -434,6 +466,7 @@ 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 msgid "Pricelist" msgstr "Fiyat Listesi" @@ -453,6 +486,7 @@ 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 msgid "Recurrence" msgstr "Tekrarlayan" @@ -466,12 +500,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "" @@ -505,12 +541,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -562,13 +600,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po index 2a57fffc5..9c2812e52 100644 --- a/contract/i18n/tr_TR.po +++ b/contract/i18n/tr_TR.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-03 18:38+0000\n" -"PO-Revision-Date: 2018-01-03 18:38+0000\n" +"POT-Creation-Date: 2018-03-30 11:59+0000\n" +"PO-Revision-Date: 2018-03-30 11:59+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Language: tr_TR\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract #: model:mail.template,body_html:contract.email_contract_template @@ -167,7 +167,7 @@ msgid "Company" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:321 +#: code:addons/contract/models/account_analytic_account.py:312 #, python-format msgid "Compose Email" msgstr "" @@ -198,6 +198,7 @@ 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 msgid "Contract Template" msgstr "" @@ -222,6 +223,7 @@ 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 msgid "Create Invoice Visibility" msgstr "" @@ -246,20 +248,46 @@ 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 msgid "Date End" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_from +msgid "Date From" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_date_start msgid "Date Start" msgstr "" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_date_to +msgid "Date To" +msgstr "" + +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_from +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_from +msgid "Date from invoiced period" +msgstr "" + #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_next_date +#: model:ir.model.fields,field_description:contract.field_project_project_recurring_next_date msgid "Date of Next Invoice" msgstr "Sonraki Fatura Tarihi" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_date_to +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_date_to +msgid "Date to invoiced period" +msgstr "" + #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 #: selection:account.analytic.contract,recurring_rule_type:0 @@ -279,7 +307,7 @@ msgid "Discount (%)" msgstr "İndirim (%)" #. module: contract -#: code:addons/contract/models/account_analytic_invoice_line.py:82 +#: code:addons/contract/models/account_analytic_invoice_line.py:135 #, python-format msgid "Discount should be less or equal to 100" msgstr "İndirim 100'den az veya ona eşit olmalıdır" @@ -314,6 +342,7 @@ 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 msgid "Generate recurring invoices automatically" msgstr "Otomatik olarak tekrarlanan faturalar oluştur" @@ -337,6 +366,7 @@ 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 msgid "Invoice Lines" msgstr "Fatura Satırları" @@ -349,6 +379,7 @@ 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 msgid "Invoicing type" msgstr "Fatura türü" @@ -356,6 +387,7 @@ 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 msgid "Journal" msgstr "Yevmiye" @@ -415,7 +447,7 @@ msgid "Partner and dependents" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:224 +#: code:addons/contract/models/account_analytic_account.py:214 #, 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." @@ -435,6 +467,7 @@ 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 msgid "Pricelist" msgstr "Fiyat Listesi" @@ -454,6 +487,7 @@ 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 msgid "Recurrence" msgstr "" @@ -467,12 +501,14 @@ 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 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 msgid "Repeat every (Days/Week/Month/Year)" msgstr "Tekrarlama sıklığı(Gün /Hafta /Ay /Yıl)" @@ -506,12 +542,14 @@ 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 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 msgid "Specify if process date is 'from' or 'to' invoicing date" msgstr "" @@ -563,13 +601,13 @@ msgid "" msgstr "" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:216 +#: code:addons/contract/models/account_analytic_account.py:206 #, 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:273 +#: code:addons/contract/models/account_analytic_account.py:264 #, python-format msgid "" "You must review start and end dates!\n" diff --git a/contract/models/account_analytic_account.py b/contract/models/account_analytic_account.py index 05b2182be..09b99d492 100644 --- a/contract/models/account_analytic_account.py +++ b/contract/models/account_analytic_account.py @@ -1,7 +1,7 @@ # Copyright 2004-2010 OpenERP SA # Copyright 2014 Angel Moya # Copyright 2015 Pedro M. Baeza -# Copyright 2016-2017 Carlos Dauden +# Copyright 2016-2018 Carlos Dauden # Copyright 2016-2017 LasLabs Inc. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -145,6 +145,8 @@ class AccountAnalyticAccount(models.Model): new_lines = [] for contract_line in contract.recurring_invoice_line_ids: vals = contract_line._convert_to_write(contract_line.read()[0]) + # Remove template link field named as analytic account field + vals.pop('analytic_account_id', False) new_lines.append((0, 0, vals)) return new_lines @@ -162,17 +164,9 @@ class AccountAnalyticAccount(models.Model): return relativedelta(years=interval) @api.model - def _insert_markers(self, line, date_start, next_date, date_format): - contract = line.analytic_account_id - if contract.recurring_invoicing_type == 'pre-paid': - date_from = date_start - date_to = next_date - relativedelta(days=1) - else: - date_from = (date_start - - self.get_relative_delta(contract.recurring_rule_type, - contract.recurring_interval) + - relativedelta(days=1)) - date_to = date_start + def _insert_markers(self, line, date_format): + date_from = fields.Date.from_string(line.date_from) + date_to = fields.Date.from_string(line.date_to) name = line.name name = name.replace('#START#', date_from.strftime(date_format)) name = name.replace('#END#', date_to.strftime(date_format)) @@ -191,16 +185,12 @@ class AccountAnalyticAccount(models.Model): invoice_line._onchange_product_id() invoice_line_vals = invoice_line._convert_to_write(invoice_line._cache) # Insert markers - name = line.name contract = line.analytic_account_id - if 'old_date' in self.env.context and 'next_date' in self.env.context: - lang_obj = self.env['res.lang'] - lang = lang_obj.search( - [('code', '=', contract.partner_id.lang)]) - date_format = lang.date_format or '%m/%d/%Y' - name = self._insert_markers( - line, self.env.context['old_date'], - self.env.context['next_date'], date_format) + lang_obj = self.env['res.lang'] + lang = lang_obj.search( + [('code', '=', contract.partner_id.lang)]) + date_format = lang.date_format or '%m/%d/%Y' + name = self._insert_markers(line, date_format) invoice_line_vals.update({ 'name': name, 'account_analytic_id': contract.id, @@ -252,7 +242,8 @@ class AccountAnalyticAccount(models.Model): invoice = self.env['account.invoice'].create(invoice_vals) for line in self.recurring_invoice_line_ids: invoice_line_vals = self._prepare_invoice_line(line, invoice.id) - self.env['account.invoice.line'].create(invoice_line_vals) + if invoice_line_vals: + self.env['account.invoice.line'].create(invoice_line_vals) invoice.compute_taxes() return invoice diff --git a/contract/models/account_analytic_invoice_line.py b/contract/models/account_analytic_invoice_line.py index 7dd96f716..188d4c81a 100644 --- a/contract/models/account_analytic_invoice_line.py +++ b/contract/models/account_analytic_invoice_line.py @@ -1,10 +1,12 @@ # © 2004-2010 OpenERP SA # © 2014 Angel Moya # © 2015 Pedro M. Baeza -# © 2016 Carlos Dauden +# © 2016-2018 Carlos Dauden # Copyright 2016-2017 LasLabs Inc. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from dateutil.relativedelta import relativedelta + from odoo import api, fields, models from odoo.addons import decimal_precision as dp from odoo.exceptions import ValidationError @@ -59,6 +61,16 @@ class AccountAnalyticInvoiceLine(models.Model): default=10, help="Sequence of the contract line when displaying contracts", ) + date_from = fields.Date( + string='Date From', + compute='_compute_date_from', + help='Date from invoiced period', + ) + date_to = fields.Date( + string='Date To', + compute='_compute_date_to', + help='Date to invoiced period', + ) @api.multi @api.depends('quantity', 'price_unit', 'discount') @@ -73,6 +85,47 @@ class AccountAnalyticInvoiceLine(models.Model): else: line.price_subtotal = subtotal + def _compute_date_from(self): + # When call from template line.analytic_account_id comodel is + # 'account.analytic.contract', + if self._name != 'account.analytic.invoice.line': + return + for line in self: + contract = line.analytic_account_id + date_start = ( + self.env.context.get('old_date') or fields.Date.from_string( + contract.recurring_next_date or fields.Date.today()) + ) + if contract.recurring_invoicing_type == 'pre-paid': + date_from = date_start + else: + date_from = (date_start - contract.get_relative_delta( + contract.recurring_rule_type, + contract.recurring_interval) + relativedelta(days=1)) + line.date_from = fields.Date.to_string(date_from) + + def _compute_date_to(self): + # When call from template line.analytic_account_id comodel is + # 'account.analytic.contract', + if self._name != 'account.analytic.invoice.line': + return + for line in self: + contract = line.analytic_account_id + date_start = ( + self.env.context.get('old_date') or fields.Date.from_string( + contract.recurring_next_date or fields.Date.today()) + ) + next_date = ( + self.env.context.get('next_date') or + date_start + contract.get_relative_delta( + contract.recurring_rule_type, contract.recurring_interval) + ) + if contract.recurring_invoicing_type == 'pre-paid': + date_to = next_date - relativedelta(days=1) + else: + date_to = date_start + line.date_to = fields.Date.to_string(date_to) + @api.multi @api.constrains('discount') def _check_discount(self): diff --git a/contract/models/res_partner.py b/contract/models/res_partner.py index cd9c30ce4..f175912a2 100644 --- a/contract/models/res_partner.py +++ b/contract/models/res_partner.py @@ -18,8 +18,7 @@ class ResPartner(models.Model): for partner in self: partner.contract_count = Contract.search_count([ ('recurring_invoices', '=', True), - ('partner_id', '=', partner.id), - ('date_start', '<=', today), + ('partner_id', 'child_of', partner.ids), '|', ('date_end', '=', False), ('date_end', '>=', today), @@ -37,9 +36,10 @@ class ResPartner(models.Model): self.env.context, search_default_recurring_invoices=True, search_default_not_finished=True, + search_default_partner_id=self.id, default_partner_id=self.id, default_recurring_invoices=True, + default_pricelist_id=self.property_product_pricelist.id, ), - domain=[('partner_id', '=', self.id)], ) return res diff --git a/contract/views/account_analytic_account_view.xml b/contract/views/account_analytic_account_view.xml index 1a96b0dc4..b915b90b6 100644 --- a/contract/views/account_analytic_account_view.xml +++ b/contract/views/account_analytic_account_view.xml @@ -116,12 +116,11 @@ account.analytic.account + + + - - - -