diff --git a/ext/3rd-party-addons/contract/README.rst b/ext/3rd-party-addons/contract/README.rst index e2aa831e..267baaef 100644 --- a/ext/3rd-party-addons/contract/README.rst +++ b/ext/3rd-party-addons/contract/README.rst @@ -33,6 +33,8 @@ To use this module, you need to: * Invoicing type: pre-paid or post-paid. #. Add the lines to be invoiced with the product, description, quantity and price. +#. You can mark Auto-price? for having a price automatically obtained applying + the pricelist to the product price. #. You have the possibility to use the markers #START# or #END# in the description field to show the start and end date of the invoiced period. #. Choosing between pre-paid and post-paid, you modify the dates that are shown diff --git a/ext/3rd-party-addons/contract/__manifest__.py b/ext/3rd-party-addons/contract/__manifest__.py index 4fad58ad..b5343ee7 100644 --- a/ext/3rd-party-addons/contract/__manifest__.py +++ b/ext/3rd-party-addons/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.1.0', + 'version': '11.0.2.0.1', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "OpenERP SA, " @@ -19,6 +19,7 @@ 'depends': ['base', 'account', 'analytic'], 'data': [ 'security/ir.model.access.csv', + 'security/contract_security.xml', 'report/report_contract.xml', 'report/contract_views.xml', 'data/contract_cron.xml', diff --git a/ext/3rd-party-addons/contract/i18n/ca.po b/ext/3rd-party-addons/contract/i18n/ca.po index 7058b95c..4c19fe24 100644 --- a/ext/3rd-party-addons/contract/i18n/ca.po +++ b/ext/3rd-party-addons/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/ext/3rd-party-addons/contract/i18n/de.po b/ext/3rd-party-addons/contract/i18n/de.po index 918488db..56ac26f9 100644 --- a/ext/3rd-party-addons/contract/i18n/de.po +++ b/ext/3rd-party-addons/contract/i18n/de.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2017 +# Ricardo Gross , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+0000\n" +"Last-Translator: Ricardo Gross , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,7 +137,7 @@ msgstr "" #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document msgid "Unit Price" -msgstr "" +msgstr "preis pro Stück" #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form @@ -150,10 +151,16 @@ msgstr "Kostenrechnungspositionen" msgid "Analytic Account" msgstr "Kostenstelle" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." -msgstr "" +msgstr "Klicken um eine neue Vertragsvorlage zu erstellen." #. module: contract #: model:ir.actions.act_window,help:contract.action_account_analytic_overdue_all @@ -161,15 +168,20 @@ msgid "Click to create a new contract." msgstr "Klicken, um neuen Vertrag anzulegen." #. 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:332 #, python-format msgid "Compose Email" -msgstr "" +msgstr "E-Mail verfassen" #. module: contract #: model:ir.model,name:contract.model_res_partner msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: contract #: model:ir.actions.report,name:contract.report_contract @@ -179,6 +191,12 @@ msgstr "" msgid "Contract" msgstr "Vertrag" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +204,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 +227,12 @@ msgstr "" msgid "Contracts" msgstr "Verträge" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +254,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 @@ -262,7 +313,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "Rabatt muss kleiner oder gleich 100 sein" @@ -297,6 +348,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" @@ -312,6 +364,15 @@ msgstr "Gruppiere..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -320,6 +381,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" @@ -329,20 +391,18 @@ msgstr "Rechnungspositionen" msgid "Invoices" msgstr "Rechnungen" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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 "Journal" @@ -396,13 +456,18 @@ msgstr "Name" msgid "Next Invoice" msgstr "Nächste Rechnung" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Legen Sie bitte ein Verkaufsjournal für das Unternehmen '%s' fest." @@ -422,6 +487,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" @@ -441,6 +507,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 "" @@ -454,12 +521,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)" @@ -485,15 +554,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 "" @@ -538,19 +620,44 @@ msgid "Year(s)" msgstr "Jahr(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Sie müssen zunächst einen Kunden für den Vertrag '%s' auswählen." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -559,12 +666,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/ext/3rd-party-addons/contract/i18n/es.po b/ext/3rd-party-addons/contract/i18n/es.po index 9c15557c..62820872 100644 --- a/ext/3rd-party-addons/contract/i18n/es.po +++ b/ext/3rd-party-addons/contract/i18n/es.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+0000\n" "Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgstr "Contrato: " #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document msgid "Date Start: " -msgstr "Fecha inicio: " +msgstr "Fecha de inicio: " #. module: contract #: model:ir.ui.view,arch_db:contract.report_contract_document @@ -197,18 +197,29 @@ msgstr "Ver líneas contables analíticas" msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "¿Precio automático?" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." -msgstr "Pinche para crear una nueva plantilla de contrato" +msgstr "Pulse para crear una nueva plantilla de contrato." #. module: contract #: model:ir.actions.act_window,help:contract.action_account_analytic_overdue_all msgid "Click to create a new contract." -msgstr "Pinche para crear un contrato nuevo. " +msgstr "Pulse para crear un contrato nuevo. " #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "Componer correo electrónico" @@ -226,6 +237,13 @@ msgstr "Contacto" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" +"La fecha de inicio del contrato '%s' no puede ser superior a la fecha de fin" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -233,6 +251,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" @@ -255,6 +274,12 @@ msgstr "Plantillas de contrato" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +msgid "Create Invoice Visibility" +msgstr "Visibilidad de crear factura" + #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "Create invoices" @@ -276,20 +301,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 inicio" +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 @@ -309,7 +360,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "El descuento debería ser menor o igual a 100" @@ -345,6 +396,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." @@ -360,6 +412,17 @@ msgstr "Agrupar por..." msgid "ID" msgstr "ID (identificación)" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" +"Si está marcado, el precio se obtendrá automáticamente aplicando la tarifa " +"al producto. Si no, podrá introducir un precio manual" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -368,6 +431,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" @@ -377,20 +441,18 @@ msgstr "Líneas de factura" msgid "Invoices" msgstr "Facturas" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Tipo Facturación" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -445,16 +507,21 @@ msgstr "Nombre" msgid "Next Invoice" msgstr "Próxima factura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "Empresa (siempre Falso)" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search msgid "Partner and dependents" msgstr "Empresa y contactos" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:170 +#: code:addons/contract/models/account_analytic_account.py:214 #, python-format msgid "Please define a sale journal for the company '%s'." -msgstr "Por favor define un diario de ventas para la compañía '%s'." +msgstr "Por favor defina un diario de ventas para la compañía '%s'." #. module: contract #: selection:account.analytic.account,recurring_invoicing_type:0 @@ -471,6 +538,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" @@ -490,6 +558,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" @@ -503,12 +572,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)" @@ -532,17 +603,30 @@ msgstr "Secuencia" #: model:ir.model.fields,help:contract.field_account_analytic_contract_line_sequence #: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_sequence msgid "Sequence of the contract line when displaying contracts" -msgstr "Secuencia de la línea de contrato cuando se visualizan los contratos" +msgstr "Secuencia de la linea de contrato cuando se muestra en los contratos" + +#. module: contract +#: model:ir.ui.view,arch_db:contract.view_partner_form +msgid "Show the contracts for this partner" +msgstr "Muestra los contratos para esta empresa/contacto" + +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "Precio específico" #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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" @@ -573,7 +657,7 @@ msgstr "NIF:" #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search msgid "Valid" -msgstr "Vigente" +msgstr "Válido" #. module: contract #: selection:account.analytic.account,recurring_rule_type:0 @@ -588,13 +672,22 @@ msgid "Year(s)" msgstr "Año(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py:111 +#, python-format +msgid "" +"You can't have a next invoicing date before the start of the contract '%s'" +msgstr "" +"No puede tener una fecha de próxima factura anterior a la fecha de inicio " +"del contrato '%s'" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py: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:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, python-format msgid "" "You must review start and end dates!\n" @@ -603,6 +696,24 @@ msgstr "" "Debe revisar las fechas de inicio y de fin\n" "%s" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:102 +#, python-format +msgid "You must supply a customer for the contract '%s'" +msgstr "Debe especificar un cliente para el contrato '%s'" + +#. 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 "Debe suministrar una fecha de próxima factura para el contrato '%s'" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:129 +#, python-format +msgid "You must supply a start date for contract '%s'" +msgstr "Debe suministrar una fecha de inicio para el contrato '%s'" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract msgid "account.analytic.contract" @@ -613,11 +724,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "Mostrar los contratos de este partner" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/ext/3rd-party-addons/contract/i18n/fr.po b/ext/3rd-party-addons/contract/i18n/fr.po index 93141862..1b4b7ece 100644 --- a/ext/3rd-party-addons/contract/i18n/fr.po +++ b/ext/3rd-party-addons/contract/i18n/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 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: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 "Contrat" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. 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 "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 "" + #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "Create invoices" @@ -229,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 @@ -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 "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 "" @@ -328,20 +374,18 @@ msgstr "" msgid "Invoices" msgstr "Factures" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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 "Liste de prix" @@ -440,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 "" @@ -453,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)" @@ -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 "Année(s)" #. 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/ext/3rd-party-addons/contract/i18n/hi_IN.po b/ext/3rd-party-addons/contract/i18n/hi_IN.po index 4de74165..1b0100a2 100644 --- a/ext/3rd-party-addons/contract/i18n/hi_IN.po +++ b/ext/3rd-party-addons/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/ext/3rd-party-addons/contract/i18n/hr.po b/ext/3rd-party-addons/contract/i18n/hr.po index 3f84e6dd..7a2109e2 100644 --- a/ext/3rd-party-addons/contract/i18n/hr.po +++ b/ext/3rd-party-addons/contract/i18n/hr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Stavke analitike" msgid "Analytic Account" msgstr "Analitički konto" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Kliknite za kreiranje novog ugovora." #. 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:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Ugovor" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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 +226,12 @@ msgstr "" msgid "Contracts" msgstr "Ugovori" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "Popusti bi trebali biti manji ili jednaki 100" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Grupiraj po..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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" @@ -330,20 +391,18 @@ msgstr "Stavke računa" msgid "Invoices" msgstr "Računi" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -397,13 +456,18 @@ msgstr "Naziv" msgid "Next Invoice" msgstr "Sljedeći račun" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "" @@ -423,6 +487,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" @@ -442,6 +507,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 "" @@ -455,12 +521,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 "" @@ -486,15 +554,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 "" @@ -539,19 +620,44 @@ msgid "Year(s)" msgstr "Godina(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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:284 #, 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" @@ -562,11 +668,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/ext/3rd-party-addons/contract/i18n/hr_HR.po b/ext/3rd-party-addons/contract/i18n/hr_HR.po index 51c4c36f..705381fe 100644 --- a/ext/3rd-party-addons/contract/i18n/hr_HR.po +++ b/ext/3rd-party-addons/contract/i18n/hr_HR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Stavke analitičkog dnevnika" msgid "Analytic Account" msgstr "Konto analitike" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Kliknite za kreiranje novog ugovora." #. 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:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Ugovor" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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" @@ -208,6 +226,12 @@ msgstr "Predlošci ugovora" msgid "Contracts" msgstr "Ugovori" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "Popust treba biti manji ili jednak 100" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Grupiraj po..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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" @@ -330,20 +391,18 @@ msgstr "Stavke računa" msgid "Invoices" msgstr "Računi" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Tip izdavanja računa" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -397,13 +456,18 @@ msgstr "Naziv" msgid "Next Invoice" msgstr "Sljedeći račun" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Molimo definirajte dnevnik prodaje za poduzeće '%s'." @@ -423,6 +487,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" @@ -442,6 +507,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" @@ -455,12 +521,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)" @@ -486,15 +554,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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" @@ -539,19 +620,44 @@ msgid "Year(s)" msgstr "Godina(e)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Prvo morate odabrati partnera za Ugovor %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -562,11 +668,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/ext/3rd-party-addons/contract/i18n/it.po b/ext/3rd-party-addons/contract/i18n/it.po index 2a37ed72..47f5d0d7 100644 --- a/ext/3rd-party-addons/contract/i18n/it.po +++ b/ext/3rd-party-addons/contract/i18n/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Righe analitiche" msgid "Analytic Account" msgstr "Conto Analitico" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Cliccare per creare un nuovo contratto" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Contratto" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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" @@ -208,6 +226,12 @@ msgstr "Template di contratto" msgid "Contracts" msgstr "Contratti" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "Lo sconto dovrebbe essere minore o uguale a 100" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Raggruppa per..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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" @@ -330,20 +391,18 @@ msgstr "Righe fattura" msgid "Invoices" msgstr "Fatture" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Tipo fatturazione" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -398,13 +457,18 @@ msgstr "Nome" msgid "Next Invoice" msgstr "Prossima fattura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Definire un sezionale vendite per l'azienda '%s'." @@ -424,6 +488,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" @@ -443,6 +508,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" @@ -456,12 +522,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)" @@ -487,15 +555,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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" @@ -541,19 +622,44 @@ msgid "Year(s)" msgstr "Anno(i)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Bisogna prima selezionare un cliente per il contratto %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -564,11 +670,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/ext/3rd-party-addons/contract/i18n/nl.po b/ext/3rd-party-addons/contract/i18n/nl.po index a709f6bf..090f59de 100644 --- a/ext/3rd-party-addons/contract/i18n/nl.po +++ b/ext/3rd-party-addons/contract/i18n/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Kostenplaatsenboekingen" msgid "Analytic Account" msgstr "Kostenplaats" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Klik voor het aanmaken van een nieuw contract" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,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 +203,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 +226,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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "De korting moet kleiner of gelijk aan 100 zijn" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Groepeer op..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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" @@ -330,20 +391,18 @@ msgstr "Sjablonen factuurregels" msgid "Invoices" msgstr "Facturen" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -397,13 +456,18 @@ msgstr "Naam" msgid "Next Invoice" msgstr "Volgende factuur" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "U dient een verkoopboek te definiëren voor het bedrijf '%s'." @@ -423,6 +487,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" @@ -442,6 +507,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 "" @@ -455,12 +521,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)" @@ -486,9 +554,21 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type msgid "Specify Interval for automatic invoice generation." msgstr "" "Specificeer het interval voor het aanmaken van de herhalende facturen." @@ -496,6 +576,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." @@ -541,19 +622,44 @@ msgid "Year(s)" msgstr "Jaar" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 " Er moet eerst een klant worden ingesteld op contract %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -564,11 +670,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/ext/3rd-party-addons/contract/i18n/nl_NL.po b/ext/3rd-party-addons/contract/i18n/nl_NL.po index 1c2ec004..da3a50a4 100644 --- a/ext/3rd-party-addons/contract/i18n/nl_NL.po +++ b/ext/3rd-party-addons/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/ext/3rd-party-addons/contract/i18n/pt.po b/ext/3rd-party-addons/contract/i18n/pt.po index 0863126e..701298aa 100644 --- a/ext/3rd-party-addons/contract/i18n/pt.po +++ b/ext/3rd-party-addons/contract/i18n/pt.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Linhas de Conta Analítica" msgid "Analytic Account" msgstr "Conta Analítica" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Clique para criar um novo contrato." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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" @@ -208,6 +226,12 @@ msgstr "Modelos de Contratos" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "O desconto deve ser igual ou inferior a 100" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Agrupar Por..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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" @@ -330,20 +391,18 @@ msgstr "Linha de Fatura" msgid "Invoices" msgstr "Faturas" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Tipo de Faturação" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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" @@ -397,13 +456,18 @@ msgstr "Nome" msgid "Next Invoice" msgstr "Próxima Fatura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Por favor, defina um diário de vendas para a empresa '%s'." @@ -423,6 +487,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" @@ -442,6 +507,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" @@ -455,12 +521,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)" @@ -486,15 +554,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 " @@ -541,19 +622,44 @@ msgid "Year(s)" msgstr "Ano(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Deve primeiro selecionar um Cliente para o Contrato %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -564,11 +670,6 @@ msgstr "account.analytic.contract" msgid "account.analytic.invoice.line" msgstr "account.analytic.invoice.line" -#. module: contract -#: model:ir.ui.view,arch_db:contract.view_partner_form -msgid "show the contracts for this partner" -msgstr "" - #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "⇒ Show recurring invoices" diff --git a/ext/3rd-party-addons/contract/i18n/pt_BR.po b/ext/3rd-party-addons/contract/i18n/pt_BR.po index bda330f6..2a6b4ea5 100644 --- a/ext/3rd-party-addons/contract/i18n/pt_BR.po +++ b/ext/3rd-party-addons/contract/i18n/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conta analítica" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Clique para criar um novo contrato." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Contrato" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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 +226,12 @@ msgstr "" msgid "Contracts" msgstr "Contratos" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "Desconto deve ser menor ou igual a 100" @@ -297,6 +347,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" @@ -312,6 +363,15 @@ msgstr "Agrupar por..." msgid "ID" msgstr "Identificação" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -320,6 +380,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" @@ -329,20 +390,18 @@ msgstr "Linhas da fatura" msgid "Invoices" msgstr "Faturas" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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" #. 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 "" @@ -396,13 +455,18 @@ msgstr "Nome" msgid "Next Invoice" msgstr "Próxima fatura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "" @@ -422,6 +486,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" @@ -441,6 +506,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 "" @@ -454,12 +520,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)" @@ -485,15 +553,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 "" @@ -538,19 +619,44 @@ msgid "Year(s)" msgstr "Ano(s)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Primeiro você deve selecionar um Cliente para o contrato %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -561,11 +667,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/ext/3rd-party-addons/contract/i18n/tr.po b/ext/3rd-party-addons/contract/i18n/tr.po index b0dc1d1f..072b4e55 100644 --- a/ext/3rd-party-addons/contract/i18n/tr.po +++ b/ext/3rd-party-addons/contract/i18n/tr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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" @@ -150,6 +150,12 @@ msgstr "Analitik Hesap Satırı" msgid "Analytic Account" msgstr "Analitik Hesap" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -161,7 +167,12 @@ msgid "Click to create a new contract." msgstr "Yeni bir sözleşme oluşturmak için tıklayın." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -179,6 +190,12 @@ msgstr "" msgid "Contract" msgstr "Sözleşme" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -186,6 +203,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" @@ -208,6 +226,12 @@ msgstr "Sözleşme Şablonları" msgid "Contracts" msgstr "Sözleşmeler" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: 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 +253,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 @@ -262,7 +312,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "İndirim 100'den az veya ona eşit olmalıdır" @@ -297,6 +347,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" @@ -312,6 +363,15 @@ msgstr "Grupla ..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -320,6 +380,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ı" @@ -329,20 +390,18 @@ msgstr "Fatura Satırları" msgid "Invoices" msgstr "Faturalar" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "Fatura Türü" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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ü" #. 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" @@ -396,13 +455,18 @@ msgstr "Adı" msgid "Next Invoice" msgstr "Sonraki Fatura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Lütfen '%s' firması için bir satış yevmiyesi tanımlayın." @@ -422,6 +486,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" @@ -441,6 +506,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" @@ -454,12 +520,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 "" @@ -485,15 +553,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 "" @@ -538,19 +619,44 @@ msgid "Year(s)" msgstr "Yıl(lar)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Önce Sözleşme %s için bir Müşteri seçmelisiniz!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -561,11 +667,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/ext/3rd-party-addons/contract/i18n/tr_TR.po b/ext/3rd-party-addons/contract/i18n/tr_TR.po index a9fa5d4b..66a52963 100644 --- a/ext/3rd-party-addons/contract/i18n/tr_TR.po +++ b/ext/3rd-party-addons/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: 2017-11-21 18:22+0000\n" -"PO-Revision-Date: 2017-11-21 18:22+0000\n" +"POT-Creation-Date: 2018-04-06 21:09+0000\n" +"PO-Revision-Date: 2018-04-06 21:09+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 @@ -151,6 +151,12 @@ msgstr "Analitik Hesap Satırları" msgid "Analytic Account" msgstr "Analitik Hesap" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_automatic_price +msgid "Auto-price?" +msgstr "" + #. module: contract #: model:ir.actions.act_window,help:contract.account_analytic_contract_action msgid "Click to create a new contract template." @@ -162,7 +168,12 @@ msgid "Click to create a new contract." msgstr "Yeni bir sözleşme oluşturmak için tıklayın." #. module: contract -#: code:addons/contract/models/account_analytic_account.py:264 +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_company_id +msgid "Company" +msgstr "" + +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:332 #, python-format msgid "Compose Email" msgstr "" @@ -180,6 +191,12 @@ msgstr "" msgid "Contract" msgstr "Sözleşme" +#. module: contract +#: code:addons/contract/models/account_analytic_account.py:138 +#, python-format +msgid "Contract '%s' start date can't be later than end date" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_analytic_contract_line msgid "Contract Lines" @@ -187,6 +204,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 "" @@ -209,6 +227,12 @@ msgstr "" msgid "Contracts" msgstr "Sözleşmeler" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_account_create_invoice_visibility +#: model:ir.model.fields,field_description:contract.field_project_project_create_invoice_visibility +msgid "Create Invoice Visibility" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.account_analytic_account_recurring_form_form msgid "Create invoices" @@ -230,20 +254,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 @@ -263,7 +313,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:177 #, python-format msgid "Discount should be less or equal to 100" msgstr "İndirim 100'den az veya ona eşit olmalıdır" @@ -298,6 +348,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" @@ -313,6 +364,15 @@ msgstr "Grupla ..." msgid "ID" msgstr "ID" +#. module: contract +#: model:ir.model.fields,help:contract.field_account_analytic_contract_line_automatic_price +#: model:ir.model.fields,help:contract.field_account_analytic_invoice_line_automatic_price +msgid "" +"If this is marked, the price will be obtained automatically applying the " +"pricelist to the product. If not, you will be able to introduce a manual " +"price" +msgstr "" + #. module: contract #: model:ir.model,name:contract.model_account_invoice msgid "Invoice" @@ -321,6 +381,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ı" @@ -330,20 +391,18 @@ msgstr "Fatura Satırları" msgid "Invoices" msgstr "Faturalar" -#. module: contract -#: model:ir.ui.view,arch_db:contract.account_analytic_contract_view_search -msgid "Invoicing Type" -msgstr "" - #. module: contract #: model:ir.model.fields,field_description:contract.field_account_analytic_account_recurring_invoicing_type #: model:ir.model.fields,field_description:contract.field_account_analytic_contract_recurring_invoicing_type +#: model:ir.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ü" #. 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" @@ -397,13 +456,18 @@ msgstr "" msgid "Next Invoice" msgstr "Sonraki Fatura" +#. module: contract +#: model:ir.model.fields,field_description:contract.field_account_analytic_contract_partner_id +msgid "Partner (always False)" +msgstr "" + #. module: contract #: model:ir.ui.view,arch_db:contract.view_account_analytic_account_contract_search 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 "Lütfen '%s' şirketi için bir satış yevmiyesi tanımlayın." @@ -423,6 +487,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" @@ -442,6 +507,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 "" @@ -455,12 +521,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)" @@ -486,15 +554,28 @@ 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,field_description:contract.field_account_analytic_contract_line_specific_price +#: model:ir.model.fields,field_description:contract.field_account_analytic_invoice_line_specific_price +msgid "Specific Price" +msgstr "" + #. module: contract #: model:ir.model.fields,help:contract.field_account_analytic_account_recurring_rule_type #: model:ir.model.fields,help:contract.field_account_analytic_contract_recurring_rule_type +#: model:ir.model.fields,help:contract.field_project_project_recurring_rule_type 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 "" @@ -539,19 +620,44 @@ msgid "Year(s)" msgstr "Yıl(lar)" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:162 +#: code:addons/contract/models/account_analytic_account.py: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 "Önce bir Müşteri Sözleşmesi seçmelisiniz %s!" #. module: contract -#: code:addons/contract/models/account_analytic_account.py:217 +#: code:addons/contract/models/account_analytic_account.py:284 #, 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" @@ -562,11 +668,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/ext/3rd-party-addons/contract/migrations/11.0.2.0.0/pre-migration.py b/ext/3rd-party-addons/contract/migrations/11.0.2.0.0/pre-migration.py new file mode 100644 index 00000000..b97bb7a0 --- /dev/null +++ b/ext/3rd-party-addons/contract/migrations/11.0.2.0.0/pre-migration.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright 2015-2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +def migrate(cr, version): + """Rename column for specific price for keeping backwards compatibility.""" + if not version: + return + cr.execute( + "ALTER TABLE account_analytic_invoice_line " + "RENAME price_unit TO specific_price" + ) diff --git a/ext/3rd-party-addons/contract/models/account_analytic_account.py b/ext/3rd-party-addons/contract/models/account_analytic_account.py index de6464c6..31ccf503 100644 --- a/ext/3rd-party-addons/contract/models/account_analytic_account.py +++ b/ext/3rd-party-addons/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). @@ -50,6 +50,17 @@ class AccountAnalyticAccount(models.Model): index=True, default=lambda self: self.env.user, ) + create_invoice_visibility = fields.Boolean( + compute='_compute_create_invoice_visibility', + ) + + @api.depends('recurring_next_date', 'date_end') + def _compute_create_invoice_visibility(self): + for contract in self: + contract.create_invoice_visibility = ( + not contract.date_end or + contract.recurring_next_date <= contract.date_end + ) @api.onchange('contract_template_id') def _onchange_contract_template_id(self): @@ -60,15 +71,13 @@ class AccountAnalyticAccount(models.Model): deletion ensures that any errant lines that are created are also deleted. """ - contract = self.contract_template_id - + if not contract: + return for field_name, field in contract._fields.items(): - if field.name == 'recurring_invoice_line_ids': lines = self._convert_contract_lines(contract) self.recurring_invoice_line_ids = lines - elif not any(( field.compute, field.related, field.automatic, field.readonly, field.company_dependent, @@ -76,21 +85,68 @@ class AccountAnalyticAccount(models.Model): )): self[field_name] = self.contract_template_id[field_name] - @api.onchange('recurring_invoices') - def _onchange_recurring_invoices(self): - if self.date_start and self.recurring_invoices: + @api.onchange('date_start') + def _onchange_date_start(self): + if self.date_start: self.recurring_next_date = self.date_start @api.onchange('partner_id') def _onchange_partner_id(self): self.pricelist_id = self.partner_id.property_product_pricelist.id + @api.constrains('partner_id', 'recurring_invoices') + def _check_partner_id_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.partner_id: + raise ValidationError( + _("You must supply a customer for the contract '%s'") % + contract.name + ) + + @api.constrains('recurring_next_date', 'date_start') + def _check_recurring_next_date_start_date(self): + for contract in self.filtered('recurring_next_date'): + if contract.date_start > contract.recurring_next_date: + raise ValidationError( + _("You can't have a next invoicing date before the start " + "of the contract '%s'") % contract.name + ) + + @api.constrains('recurring_next_date', 'recurring_invoices') + def _check_recurring_next_date_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.recurring_next_date: + raise ValidationError( + _("You must supply a next invoicing date for contract " + "'%s'") % contract.name + ) + + @api.constrains('date_start', 'recurring_invoices') + def _check_date_start_recurring_invoices(self): + for contract in self.filtered('recurring_invoices'): + if not contract.date_start: + raise ValidationError( + _("You must supply a start date for contract '%s'") % + contract.name + ) + + @api.constrains('date_start', 'date_end') + def _check_start_end_dates(self): + for contract in self.filtered('date_end'): + if contract.date_start > contract.date_end: + raise ValidationError( + _("Contract '%s' start date can't be later than end date") + % contract.name + ) + @api.multi def _convert_contract_lines(self, contract): self.ensure_one() 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 @@ -108,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)) @@ -137,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, @@ -192,20 +236,41 @@ class AccountAnalyticAccount(models.Model): return invoice._convert_to_write(invoice._cache) @api.multi - def _create_invoice(self): + def _prepare_invoice_update(self, invoice): + vals = self._prepare_invoice() + update_vals = { + 'contract_id': self.id, + 'date_invoice': vals.get('date_invoice', False), + 'reference': ' '.join(filter(None, [ + invoice.reference, vals.get('reference')])), + 'origin': ' '.join(filter(None, [ + invoice.origin, vals.get('origin')])), + } + return update_vals + + @api.multi + def _create_invoice(self, invoice=False): + """ + :param invoice: If not False add lines to this invoice + :return: invoice created or updated + """ self.ensure_one() - invoice_vals = self._prepare_invoice() - invoice = self.env['account.invoice'].create(invoice_vals) + if invoice and invoice.state == 'draft': + invoice.update(self._prepare_invoice_update(invoice)) + else: + invoice = self.env['account.invoice'].create( + self._prepare_invoice()) 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 @api.multi def recurring_create_invoice(self): - """ - Create invoices from contracts + """Create invoices from contracts + :return: invoices created """ invoices = self.env['account.invoice'] @@ -213,9 +278,12 @@ class AccountAnalyticAccount(models.Model): ref_date = contract.recurring_next_date or fields.Date.today() if (contract.date_start > ref_date or contract.date_end and contract.date_end < ref_date): + if self.env.context.get('cron'): + continue # Don't fail on cron jobs raise ValidationError( _("You must review start and end dates!\n%s") % - contract.name) + contract.name + ) old_date = fields.Date.from_string(ref_date) new_date = old_date + self.get_relative_delta( contract.recurring_rule_type, contract.recurring_interval) @@ -223,20 +291,20 @@ class AccountAnalyticAccount(models.Model): ctx.update({ 'old_date': old_date, 'next_date': new_date, - # Force company for correct evaluate domain access rules + # Force company for correct evaluation of domain access rules 'force_company': contract.company_id.id, }) # Re-read contract with correct company invoices |= contract.with_context(ctx)._create_invoice() contract.write({ - 'recurring_next_date': new_date.strftime('%Y-%m-%d') + 'recurring_next_date': fields.Date.to_string(new_date) }) return invoices @api.model def cron_recurring_create_invoice(self): today = fields.Date.today() - contracts = self.search([ + contracts = self.with_context(cron=True).search([ ('recurring_invoices', '=', True), ('recurring_next_date', '<=', today), '|', diff --git a/ext/3rd-party-addons/contract/models/account_analytic_contract.py b/ext/3rd-party-addons/contract/models/account_analytic_contract.py index acd69893..6f04a9e5 100644 --- a/ext/3rd-party-addons/contract/models/account_analytic_contract.py +++ b/ext/3rd-party-addons/contract/models/account_analytic_contract.py @@ -1,8 +1,9 @@ -# © 2004-2010 OpenERP SA -# © 2014 Angel Moya -# © 2015 Pedro M. Baeza -# © 2016 Carlos Dauden +# -*- coding: utf-8 -*- +# Copyright 2004-2010 OpenERP SA +# Copyright 2014 Angel Moya +# Copyright 2016 Carlos Dauden # Copyright 2016-2017 LasLabs Inc. +# Copyright 2015-2017 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models @@ -14,11 +15,17 @@ class AccountAnalyticContract(models.Model): # These fields will not be synced to the contract NO_SYNC = [ 'name', + 'partner_id', ] name = fields.Char( required=True, ) + # Needed for avoiding errors on several inherited behaviors + partner_id = fields.Many2one( + comodel_name="res.partner", + string="Partner (always False)", + ) pricelist_id = fields.Many2one( comodel_name='product.pricelist', string='Pricelist', @@ -59,6 +66,12 @@ class AccountAnalyticContract(models.Model): default=lambda s: s._default_journal(), domain="[('type', '=', 'sale'),('company_id', '=', company_id)]", ) + company_id = fields.Many2one( + 'res.company', + string='Company', + required=True, + default=lambda self: self.env.user.company_id, + ) @api.model def _default_journal(self): diff --git a/ext/3rd-party-addons/contract/models/account_analytic_invoice_line.py b/ext/3rd-party-addons/contract/models/account_analytic_invoice_line.py index 7dd96f71..75fd22df 100644 --- a/ext/3rd-party-addons/contract/models/account_analytic_invoice_line.py +++ b/ext/3rd-party-addons/contract/models/account_analytic_invoice_line.py @@ -1,10 +1,13 @@ -# © 2004-2010 OpenERP SA -# © 2014 Angel Moya -# © 2015 Pedro M. Baeza -# © 2016 Carlos Dauden +# -*- coding: utf-8 -*- +# Copyright 2004-2010 OpenERP SA +# Copyright 2014 Angel Moya +# Copyright 2016 Carlos Dauden # Copyright 2016-2017 LasLabs Inc. +# Copyright 2015-2017 Tecnativa - Pedro M. Baeza # 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 @@ -39,9 +42,19 @@ class AccountAnalyticInvoiceLine(models.Model): string='Unit of Measure', required=True, ) + automatic_price = fields.Boolean( + string="Auto-price?", + help="If this is marked, the price will be obtained automatically " + "applying the pricelist to the product. If not, you will be " + "able to introduce a manual price", + ) + specific_price = fields.Float( + string='Specific Price', + ) price_unit = fields.Float( - 'Unit Price', - required=True, + string='Unit Price', + compute="_compute_price_unit", + inverse="_inverse_price_unit", ) price_subtotal = fields.Float( compute='_compute_price_subtotal', @@ -59,6 +72,47 @@ 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.depends( + 'automatic_price', + 'specific_price', + 'product_id', + 'quantity', + 'analytic_account_id.pricelist_id', + 'analytic_account_id.partner_id', + ) + def _compute_price_unit(self): + """Get the specific price if no auto-price, and the price obtained + from the pricelist otherwise. + """ + for line in self: + if line.automatic_price: + product = line.product_id.with_context( + quantity=line.quantity, + pricelist=line.analytic_account_id.pricelist_id.id, + partner=line.analytic_account_id.partner_id.id, + date=line.env.context.get('old_date', fields.Date.today()), + ) + line.price_unit = product.price + else: + line.price_unit = line.specific_price + + # Tip in https://github.com/odoo/odoo/issues/23891#issuecomment-376910788 + @api.onchange('price_unit') + def _inverse_price_unit(self): + """Store the specific price in the no auto-price records.""" + for line in self.filtered(lambda x: not x.automatic_price): + line.specific_price = line.price_unit @api.multi @api.depends('quantity', 'price_unit', 'discount') @@ -73,6 +127,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): @@ -97,12 +192,12 @@ class AccountAnalyticInvoiceLine(models.Model): if self.analytic_account_id._name == 'account.analytic.account': date = ( self.analytic_account_id.recurring_next_date or - fields.Datetime.now() + fields.Date.today() ) partner = self.analytic_account_id.partner_id else: - date = fields.Datetime.now() + date = fields.Date.today() partner = self.env.user.partner_id product = self.product_id.with_context( diff --git a/ext/3rd-party-addons/contract/models/res_partner.py b/ext/3rd-party-addons/contract/models/res_partner.py index cd9c30ce..f175912a 100644 --- a/ext/3rd-party-addons/contract/models/res_partner.py +++ b/ext/3rd-party-addons/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/ext/3rd-party-addons/contract/security/contract_security.xml b/ext/3rd-party-addons/contract/security/contract_security.xml new file mode 100644 index 00000000..3884e6ef --- /dev/null +++ b/ext/3rd-party-addons/contract/security/contract_security.xml @@ -0,0 +1,10 @@ + + + + Contract template multi-company + + + ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] + + + diff --git a/ext/3rd-party-addons/contract/security/ir.model.access.csv b/ext/3rd-party-addons/contract/security/ir.model.access.csv index 937da35f..549a2d7a 100644 --- a/ext/3rd-party-addons/contract/security/ir.model.access.csv +++ b/ext/3rd-party-addons/contract/security/ir.model.access.csv @@ -1,7 +1,7 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "account_analytic_contract_manager","Recurring manager","model_account_analytic_contract","account.group_account_manager",1,1,1,1 -"account_analytic_contract_user","Recurring user","model_account_analytic_contract","account.group_account_user",1,0,0,0 +"account_analytic_contract_user","Recurring user","model_account_analytic_contract","account.group_account_invoice",1,0,0,0 "account_analytic_invoice_line_manager","Recurring manager","model_account_analytic_invoice_line","account.group_account_manager",1,1,1,1 -"account_analytic_invoice_line_user","Recurring user","model_account_analytic_invoice_line","account.group_account_user",1,0,0,0 +"account_analytic_invoice_line_user","Recurring user","model_account_analytic_invoice_line","account.group_account_invoice",1,0,0,0 "account_analytic_contract_line_manager","Recurring manager","model_account_analytic_contract_line","account.group_account_manager",1,1,1,1 -"account_analytic_contract_line_user","Recurring user","model_account_analytic_contract_line","account.group_account_user",1,0,0,0 +"account_analytic_contract_line_user","Recurring user","model_account_analytic_contract_line","account.group_account_invoice",1,0,0,0 diff --git a/ext/3rd-party-addons/contract/tests/test_contract.py b/ext/3rd-party-addons/contract/tests/test_contract.py index 0746c0e9..eaef5f5f 100644 --- a/ext/3rd-party-addons/contract/tests/test_contract.py +++ b/ext/3rd-party-addons/contract/tests/test_contract.py @@ -59,23 +59,33 @@ class TestContract(TestContractBase): with self.assertRaises(ValidationError): self.acct_line.write({'discount': 120}) + def test_automatic_price(self): + self.acct_line.automatic_price = True + self.product.list_price = 1100 + self.assertEqual(self.acct_line.price_unit, 1100) + # Try to write other price + self.acct_line.price_unit = 10 + self.acct_line.refresh() + self.assertEqual(self.acct_line.price_unit, 1100) + # Now disable automatic price + self.acct_line.automatic_price = False + self.acct_line.price_unit = 10 + self.acct_line.refresh() + self.assertEqual(self.acct_line.price_unit, 10) + def test_contract(self): self.assertAlmostEqual(self.acct_line.price_subtotal, 50.0) res = self.acct_line._onchange_product_id() self.assertIn('uom_id', res['domain']) self.acct_line.price_unit = 100.0 - - self.contract.partner_id = False with self.assertRaises(ValidationError): - self.contract.recurring_create_invoice() + self.contract.partner_id = False self.contract.partner_id = self.partner.id - self.contract.recurring_create_invoice() self.invoice_monthly = self.env['account.invoice'].search( [('contract_id', '=', self.contract.id)]) self.assertTrue(self.invoice_monthly) self.assertEqual(self.contract.recurring_next_date, '2016-03-29') - self.inv_line = self.invoice_monthly.invoice_line_ids[0] self.assertTrue(self.inv_line.invoice_line_tax_ids) self.assertAlmostEqual(self.inv_line.price_subtotal, 50.0) @@ -128,11 +138,11 @@ class TestContract(TestContractBase): self.assertEqual(self.contract.pricelist_id, self.contract.partner_id.property_product_pricelist) - def test_onchange_recurring_invoices(self): - self.contract.recurring_next_date = False - self.contract._onchange_recurring_invoices() - self.assertEqual(self.contract.recurring_next_date, - self.contract.date_start) + def test_onchange_date_start(self): + date = '2016-01-01' + self.contract.date_start = date + self.contract._onchange_date_start() + self.assertEqual(self.contract.recurring_next_date, date) def test_uom(self): uom_litre = self.env.ref('product.product_uom_litre') @@ -159,6 +169,31 @@ class TestContract(TestContractBase): with self.assertRaises(ValidationError): contract_no_journal.recurring_create_invoice() + def test_check_date_end(self): + with self.assertRaises(ValidationError): + self.contract.date_end = '2015-12-31' + + def test_check_recurring_next_date_start_date(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'date_start': '2017-01-01', + 'recurring_next_date': '2016-01-01', + }) + + def test_check_recurring_next_date_recurring_invoices(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'recurring_invoices': True, + 'recurring_next_date': False, + }) + + def test_check_date_start_recurring_invoices(self): + with self.assertRaises(ValidationError): + self.contract.write({ + 'recurring_invoices': True, + 'date_start': False, + }) + def test_onchange_contract_template_id(self): """It should change the contract values to match the template.""" self.contract.contract_template_id = self.template @@ -240,24 +275,14 @@ class TestContract(TestContractBase): self.contract.copy() self.assertEqual(self.partner.contract_count, count) - def test_date_end(self): - """It should don't create invoices from finished contract.""" - AccountInvoice = self.env['account.invoice'] - self.contract.date_end = '2015-12-31' - with self.assertRaises(ValidationError): - self.contract.recurring_create_invoice() - init_count = AccountInvoice.search_count( - [('contract_id', '=', self.contract.id)]) - self.contract.cron_recurring_create_invoice() - last_count = AccountInvoice.search_count( - [('contract_id', '=', self.contract.id)]) - self.assertEqual(last_count, init_count) - def test_same_date_start_and_date_end(self): """It should create one invoice with same start and end date.""" AccountInvoice = self.env['account.invoice'] - self.contract.date_start = self.contract.date_end = fields.Date.today() - self.contract.recurring_next_date = self.contract.date_start + self.contract.write({ + 'date_start': fields.Date.today(), + 'date_end': fields.Date.today(), + 'recurring_next_date': fields.Date.today(), + }) init_count = AccountInvoice.search_count( [('contract_id', '=', self.contract.id)]) self.contract.cron_recurring_create_invoice() @@ -266,3 +291,28 @@ class TestContract(TestContractBase): self.assertEqual(last_count, init_count + 1) with self.assertRaises(ValidationError): self.contract.recurring_create_invoice() + + def test_compute_create_invoice_visibility(self): + self.contract.write({ + 'recurring_next_date': '2017-01-01', + 'date_start': '2016-01-01', + 'date_end': False, + }) + self.assertTrue(self.contract.create_invoice_visibility) + self.contract.date_end = '2017-01-01' + self.assertTrue(self.contract.create_invoice_visibility) + self.contract.date_end = '2016-01-01' + self.assertFalse(self.contract.create_invoice_visibility) + + def test_extend_invoice(self): + AccountInvoice = self.env['account.invoice'] + self.contract.recurring_create_invoice() + invoice = AccountInvoice.search( + [('contract_id', '=', self.contract.id)]) + invoice.origin = 'Orig Invoice' + self.contract._create_invoice(invoice) + self.assertEqual(invoice.origin, 'Orig Invoice Test Contract') + invoice_count = AccountInvoice.search_count( + [('contract_id', '=', self.contract.id)]) + self.assertEqual(invoice_count, 1) + self.assertEqual(len(invoice.invoice_line_ids), 2) diff --git a/ext/3rd-party-addons/contract/views/account_analytic_account_view.xml b/ext/3rd-party-addons/contract/views/account_analytic_account_view.xml index 3058a09e..c85a7d5c 100644 --- a/ext/3rd-party-addons/contract/views/account_analytic_account_view.xml +++ b/ext/3rd-party-addons/contract/views/account_analytic_account_view.xml @@ -8,6 +8,9 @@ primary + + {'required': [('recurring_invoices', '=', True)]} +