From 896c9746a7f76e74657a10092b9c117562f8eb97 Mon Sep 17 00:00:00 2001 From: Thomas Binsfeld Date: Wed, 29 May 2019 15:33:45 +0200 Subject: [PATCH] [REF] Contract Sale Invoicing: split from analytic account [REF] Contract Sale Invoicing: update translations [IMP] - Assert that the predecessor is available for new link at uncancel [RMV] - remove usless changes [RMV] - Remove usless field recurring_invoices after the total isolation between contract model and account analytic one. recurring_invoices which was used to mark analytic account as contract became usless [IMP] - P3 syntax [IMP] - use @openupgrade.migrate() and openupgrade.logged_query [IMP] - drop transient table in migration script --- contract_sale_invoicing/i18n/ca.po | 15 ++++++----- .../i18n/contract_sale_invoicing.pot | 8 +++--- contract_sale_invoicing/i18n/de.po | 27 +++++++++---------- contract_sale_invoicing/i18n/el_GR.po | 15 ++++++----- contract_sale_invoicing/i18n/es.po | 15 ++++++----- contract_sale_invoicing/i18n/es_MX.po | 15 ++++++----- contract_sale_invoicing/i18n/fi.po | 15 ++++++----- contract_sale_invoicing/i18n/fr.po | 15 ++++++----- contract_sale_invoicing/i18n/gl.po | 15 ++++++----- contract_sale_invoicing/i18n/hi_IN.po | 15 ++++++----- contract_sale_invoicing/i18n/hr.po | 15 ++++++----- contract_sale_invoicing/i18n/hr_HR.po | 15 ++++++----- contract_sale_invoicing/i18n/hu.po | 15 ++++++----- contract_sale_invoicing/i18n/it.po | 26 +++++++++--------- contract_sale_invoicing/i18n/nl.po | 15 ++++++----- contract_sale_invoicing/i18n/pt.po | 16 +++++------ contract_sale_invoicing/i18n/pt_BR.po | 17 +++++++----- contract_sale_invoicing/i18n/pt_PT.po | 15 ++++++----- contract_sale_invoicing/i18n/ro.po | 15 ++++++----- contract_sale_invoicing/i18n/sk_SK.po | 15 ++++++----- contract_sale_invoicing/i18n/sl.po | 15 ++++++----- contract_sale_invoicing/i18n/tr.po | 15 ++++++----- contract_sale_invoicing/i18n/tr_TR.po | 15 ++++++----- contract_sale_invoicing/i18n/zh.po | 15 ++++++----- contract_sale_invoicing/i18n/zh_CN.po | 15 ++++++----- contract_sale_invoicing/models/contract.py | 15 +++++------ .../tests/test_contract_sale_invoicing.py | 4 ++- .../views/contract_view.xml | 16 +++++------ 28 files changed, 246 insertions(+), 183 deletions(-) diff --git a/contract_sale_invoicing/i18n/ca.po b/contract_sale_invoicing/i18n/ca.po index bf6b105d6..dededa2ca 100644 --- a/contract_sale_invoicing/i18n/ca.po +++ b/contract_sale_invoicing/i18n/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Compte analític" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analític" diff --git a/contract_sale_invoicing/i18n/contract_sale_invoicing.pot b/contract_sale_invoicing/i18n/contract_sale_invoicing.pot index c1be6111f..d79693b0c 100644 --- a/contract_sale_invoicing/i18n/contract_sale_invoicing.pot +++ b/contract_sale_invoicing/i18n/contract_sale_invoicing.pot @@ -14,17 +14,17 @@ msgstr "" "Plural-Forms: \n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "If checked include sales with same analytic account to invoice in contract invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" diff --git a/contract_sale_invoicing/i18n/de.po b/contract_sale_invoicing/i18n/de.po index 13b2f59c0..9e9026300 100644 --- a/contract_sale_invoicing/i18n/de.po +++ b/contract_sale_invoicing/i18n/de.po @@ -8,33 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" -"PO-Revision-Date: 2019-06-28 13:42+0000\n" -"Last-Translator: Maria Sparenberg \n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" +"PO-Revision-Date: 2018-04-17 02:41+0000\n" +"Last-Translator: OCA Transbot , 2018\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.6.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Kostenstelle" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" -"Wenn der Haken gesetzt ist, dann werden alle noch abzurechnenden " -"Verkaufsaufträge mit derselben Kostenstelle bei der Rechnungserstellung für " -"den Vertrag einbezogen." #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" -msgstr "Ausstehende Verkaufsaufträge abrechnen" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenstelle" diff --git a/contract_sale_invoicing/i18n/el_GR.po b/contract_sale_invoicing/i18n/el_GR.po index 3a987be82..4b842c33f 100644 --- a/contract_sale_invoicing/i18n/el_GR.po +++ b/contract_sale_invoicing/i18n/el_GR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Αναλυτικός Λογαριασμός" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Αναλυτικός Λογαριασμός" diff --git a/contract_sale_invoicing/i18n/es.po b/contract_sale_invoicing/i18n/es.po index ca60162c4..a6a663aab 100644 --- a/contract_sale_invoicing/i18n/es.po +++ b/contract_sale_invoicing/i18n/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-06 17:36+0200\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-06 17:38+0200\n" "Last-Translator: Carlos Dauden \n" "Language-Team: \n" @@ -18,12 +18,12 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cuenta analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." @@ -32,6 +32,9 @@ msgstr "" "cuenta analítica en la creación de la factura del contrato" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "Facturar pedidos pendientes" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/contract_sale_invoicing/i18n/es_MX.po b/contract_sale_invoicing/i18n/es_MX.po index a9e3d7a14..fe47ba3a2 100644 --- a/contract_sale_invoicing/i18n/es_MX.po +++ b/contract_sale_invoicing/i18n/es_MX.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cuenta analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/contract_sale_invoicing/i18n/fi.po b/contract_sale_invoicing/i18n/fi.po index 7f4698db4..948d7b76c 100644 --- a/contract_sale_invoicing/i18n/fi.po +++ b/contract_sale_invoicing/i18n/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analyyttinen tili" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analyyttinen tili" diff --git a/contract_sale_invoicing/i18n/fr.po b/contract_sale_invoicing/i18n/fr.po index 07004e153..63e3f9ac7 100644 --- a/contract_sale_invoicing/i18n/fr.po +++ b/contract_sale_invoicing/i18n/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-05 02:28+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-05-05 02:28+0000\n" "Last-Translator: Quentin THEURET , 2018\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" @@ -20,12 +20,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Compte analytique" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." @@ -34,6 +34,9 @@ msgstr "" "de la création de facture du contrat." #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "Commandes avec une facture en attente" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analytique" diff --git a/contract_sale_invoicing/i18n/gl.po b/contract_sale_invoicing/i18n/gl.po index e73dcb74d..960cdd809 100644 --- a/contract_sale_invoicing/i18n/gl.po +++ b/contract_sale_invoicing/i18n/gl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta analítica" diff --git a/contract_sale_invoicing/i18n/hi_IN.po b/contract_sale_invoicing/i18n/hi_IN.po index a7c04c9c3..4844e7bf1 100644 --- a/contract_sale_invoicing/i18n/hi_IN.po +++ b/contract_sale_invoicing/i18n/hi_IN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "विश्लेषणात्मक खाता" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "विश्लेषणात्मक खाता" diff --git a/contract_sale_invoicing/i18n/hr.po b/contract_sale_invoicing/i18n/hr.po index 6d2312a89..2ef3a0b06 100644 --- a/contract_sale_invoicing/i18n/hr.po +++ b/contract_sale_invoicing/i18n/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" @@ -20,18 +20,21 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitički konto" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitički konto" diff --git a/contract_sale_invoicing/i18n/hr_HR.po b/contract_sale_invoicing/i18n/hr_HR.po index fc6d32acd..5379fee0e 100644 --- a/contract_sale_invoicing/i18n/hr_HR.po +++ b/contract_sale_invoicing/i18n/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" @@ -21,18 +21,21 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Konto analitike" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Konto analitike" diff --git a/contract_sale_invoicing/i18n/hu.po b/contract_sale_invoicing/i18n/hu.po index 8c385ce28..0f58b38c0 100644 --- a/contract_sale_invoicing/i18n/hu.po +++ b/contract_sale_invoicing/i18n/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitikus gyűjtőkód könyvelés" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitikus gyűjtőkód könyvelés" diff --git a/contract_sale_invoicing/i18n/it.po b/contract_sale_invoicing/i18n/it.po index 5594490b7..dd7d3c804 100644 --- a/contract_sale_invoicing/i18n/it.po +++ b/contract_sale_invoicing/i18n/it.po @@ -8,32 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" -"PO-Revision-Date: 2019-06-26 15:42+0000\n" -"Last-Translator: Sergio Zanchetta \n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" +"PO-Revision-Date: 2018-04-17 02:41+0000\n" +"Last-Translator: OCA Transbot , 2018\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.6.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conto analitico" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" -"Se selezionato, in fase di creazione del contratto aggiunge alla fattura le " -"vendite con lo stesso conto analitico." #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" -msgstr "Ordini di vendita in sospeso della fattura" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conto Analitico" diff --git a/contract_sale_invoicing/i18n/nl.po b/contract_sale_invoicing/i18n/nl.po index f15145d22..8cdda751d 100644 --- a/contract_sale_invoicing/i18n/nl.po +++ b/contract_sale_invoicing/i18n/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Kostenplaats" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenplaats" diff --git a/contract_sale_invoicing/i18n/pt.po b/contract_sale_invoicing/i18n/pt.po index e5fe4fd2d..3dc9760fd 100644 --- a/contract_sale_invoicing/i18n/pt.po +++ b/contract_sale_invoicing/i18n/pt.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" -"PO-Revision-Date: 2019-08-14 13:44+0000\n" -"Last-Translator: Pedro Castro Silva \n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" +"PO-Revision-Date: 2018-04-17 02:41+0000\n" +"Last-Translator: OCA Transbot , 2018\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -20,12 +20,12 @@ msgstr "" "X-Generator: Weblate 3.7.1\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." @@ -34,6 +34,6 @@ msgstr "" "faturas do contrato." #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "Faturar Encomendas de Venda Pendentes" diff --git a/contract_sale_invoicing/i18n/pt_BR.po b/contract_sale_invoicing/i18n/pt_BR.po index 579de691e..9301fac4d 100644 --- a/contract_sale_invoicing/i18n/pt_BR.po +++ b/contract_sale_invoicing/i18n/pt_BR.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-17 02:41+0000\n" -"PO-Revision-Date: 2019-09-03 03:23+0000\n" -"Last-Translator: Rodrigo Macedo \n" +"PO-Revision-Date: 2019-10-10 20:36+0000\n" +"Last-Translator: Eder Brito \n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" "23907/pt_BR/)\n" "Language: pt_BR\n" @@ -21,12 +21,12 @@ msgstr "" "X-Generator: Weblate 3.8\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "Contrato" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." @@ -35,6 +35,9 @@ msgstr "" "criação da fatura do contrato." #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "Ordens de venda pendentes da fatura" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/contract_sale_invoicing/i18n/pt_PT.po b/contract_sale_invoicing/i18n/pt_PT.po index 5121f7f2b..fc2f12850 100644 --- a/contract_sale_invoicing/i18n/pt_PT.po +++ b/contract_sale_invoicing/i18n/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/contract_sale_invoicing/i18n/ro.po b/contract_sale_invoicing/i18n/ro.po index 5b4748326..810d737ce 100644 --- a/contract_sale_invoicing/i18n/ro.po +++ b/contract_sale_invoicing/i18n/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" @@ -20,18 +20,21 @@ msgstr "" "2:1));\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cont analitic" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cont analitic" diff --git a/contract_sale_invoicing/i18n/sk_SK.po b/contract_sale_invoicing/i18n/sk_SK.po index f47a072a9..38a1ea004 100644 --- a/contract_sale_invoicing/i18n/sk_SK.po +++ b/contract_sale_invoicing/i18n/sk_SK.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analytický účet" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analytický účet" diff --git a/contract_sale_invoicing/i18n/sl.po b/contract_sale_invoicing/i18n/sl.po index b9684e577..24ab0ab3f 100644 --- a/contract_sale_invoicing/i18n/sl.po +++ b/contract_sale_invoicing/i18n/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" @@ -20,18 +20,21 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitični konto" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitični konto" diff --git a/contract_sale_invoicing/i18n/tr.po b/contract_sale_invoicing/i18n/tr.po index d6cd144d0..74284c5c7 100644 --- a/contract_sale_invoicing/i18n/tr.po +++ b/contract_sale_invoicing/i18n/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitik Hesap" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitik Hesap" diff --git a/contract_sale_invoicing/i18n/tr_TR.po b/contract_sale_invoicing/i18n/tr_TR.po index 4467a5d1a..6c46bebf6 100644 --- a/contract_sale_invoicing/i18n/tr_TR.po +++ b/contract_sale_invoicing/i18n/tr_TR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 02:41+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-17 02:41+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" @@ -20,18 +20,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitik Hesap" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitik Hesap" diff --git a/contract_sale_invoicing/i18n/zh.po b/contract_sale_invoicing/i18n/zh.po index 3e456ec41..c4ac6e4da 100644 --- a/contract_sale_invoicing/i18n/zh.po +++ b/contract_sale_invoicing/i18n/zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-27 01:12+0000\n" +"POT-Creation-Date: 2019-05-29 14:59+0000\n" "PO-Revision-Date: 2018-04-27 01:12+0000\n" "Last-Translator: DIT INTL , 2018\n" "Language-Team: Chinese (https://www.transifex.com/oca/teams/23907/zh/)\n" @@ -19,18 +19,21 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "分析会计" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "如果选中，则在销售发票中包含分析帐户。" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "发票挂起的销售订单" + +#~ msgid "Analytic Account" +#~ msgstr "分析会计" diff --git a/contract_sale_invoicing/i18n/zh_CN.po b/contract_sale_invoicing/i18n/zh_CN.po index d4f73fa4f..19cb53851 100644 --- a/contract_sale_invoicing/i18n/zh_CN.po +++ b/contract_sale_invoicing/i18n/zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-17 02:41+0000\n" -"PO-Revision-Date: 2019-09-05 19:23+0000\n" +"PO-Revision-Date: 2019-09-17 18:24+0000\n" "Last-Translator: 黎伟杰 <674416404@qq.com>\n" "Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" "zh_CN/)\n" @@ -21,18 +21,21 @@ msgstr "" "X-Generator: Weblate 3.8\n" #. module: contract_sale_invoicing -#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account -msgid "Analytic Account" -msgstr "分析账户" +#: model:ir.model,name:contract_sale_invoicing.model_contract_contract +msgid "Contract" +msgstr "合同" #. module: contract_sale_invoicing -#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "" "If checked include sales with same analytic account to invoice in contract " "invoice creation." msgstr "如果选中，则在合同发票创建中包含具有相同分析帐户的销售。" #. module: contract_sale_invoicing -#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales +#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales msgid "Invoice Pending Sales Orders" msgstr "待处理销售订单的发票" + +#~ msgid "Analytic Account" +#~ msgstr "分析账户" diff --git a/contract_sale_invoicing/models/contract.py b/contract_sale_invoicing/models/contract.py index 9ae245bb2..092c19118 100644 --- a/contract_sale_invoicing/models/contract.py +++ b/contract_sale_invoicing/models/contract.py @@ -4,8 +4,8 @@ from odoo import api, fields, models -class AccountAnalyticAccount(models.Model): - _inherit = 'account.analytic.account' +class ContractContract(models.Model): + _inherit = 'contract.contract' invoicing_sales = fields.Boolean( string='Invoice Pending Sales Orders', @@ -14,11 +14,12 @@ class AccountAnalyticAccount(models.Model): ) @api.multi - def _create_invoice(self, invoice=False): + def _recurring_create_invoice(self, date_ref=False): + invoices = super()._recurring_create_invoice(date_ref) if not self.invoicing_sales: - return super(AccountAnalyticAccount, self)._create_invoice() + return invoices sales = self.env['sale.order'].search([ - ('analytic_account_id', '=', self.id), + ('analytic_account_id', '=', self.analytic_account_id.id), ('partner_invoice_id', 'child_of', self.partner_id.commercial_partner_id.ids), ('invoice_status', '=', 'to invoice'), @@ -27,6 +28,4 @@ class AccountAnalyticAccount(models.Model): ]) if sales: invoice_ids = sales.action_invoice_create() - invoice = self.env['account.invoice'].browse(invoice_ids)[:1] - return super(AccountAnalyticAccount, self)._create_invoice( - invoice=invoice) + invoices |= self.env['account.invoice'].browse(invoice_ids)[:1] diff --git a/contract_sale_invoicing/tests/test_contract_sale_invoicing.py b/contract_sale_invoicing/tests/test_contract_sale_invoicing.py index e655849b8..9722add75 100644 --- a/contract_sale_invoicing/tests/test_contract_sale_invoicing.py +++ b/contract_sale_invoicing/tests/test_contract_sale_invoicing.py @@ -8,6 +8,8 @@ class TestContractSaleInvoicing(TestContractBase): @classmethod def setUpClass(cls): super(TestContractSaleInvoicing, cls).setUpClass() + cls.contract.analytic_account_id = \ + cls.env['account.analytic.account'].search([], limit=1) cls.product_so = cls.env.ref( 'product.product_product_1') cls.product_so.invoice_policy = 'order' @@ -21,7 +23,7 @@ class TestContractSaleInvoicing(TestContractBase): 'product_uom': cls.product_so.uom_id.id, 'price_unit': cls.product_so.list_price})], 'pricelist_id': cls.partner.property_product_pricelist.id, - 'analytic_account_id': cls.contract.id, + 'analytic_account_id': cls.contract.analytic_account_id.id, 'date_order': '2016-02-15', }) diff --git a/contract_sale_invoicing/views/contract_view.xml b/contract_sale_invoicing/views/contract_view.xml index b492211fe..46ec28c25 100644 --- a/contract_sale_invoicing/views/contract_view.xml +++ b/contract_sale_invoicing/views/contract_view.xml @@ -4,14 +4,14 @@ - - account.analytic.account - - - - + + contract.contract + + + + + - - +