From 079d6297defcd7ee7c8dd2d4423c9dfae5f6762b Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 8 Jan 2020 17:18:28 +0100 Subject: [PATCH] [IMP] contract: remove redundant method I have detected a method that was created as redundant and with the same technique used when preparing the line values, so better to have everything together in the same method instead of having it spread. --- contract_variable_quantity/__manifest__.py | 2 +- contract_variable_quantity/i18n/pt.po | 48 ++++++------------- contract_variable_quantity/i18n/pt_BR.po | 10 ++-- contract_variable_quantity/i18n/pt_PT.po | 16 +++++-- .../models/contract_line.py | 4 +- 5 files changed, 34 insertions(+), 46 deletions(-) diff --git a/contract_variable_quantity/__manifest__.py b/contract_variable_quantity/__manifest__.py index 885b4a77d..999749a4f 100644 --- a/contract_variable_quantity/__manifest__.py +++ b/contract_variable_quantity/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Variable quantity in contract recurrent invoicing', - 'version': '12.0.2.1.1', + 'version': '12.0.2.1.2', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "Tecnativa," diff --git a/contract_variable_quantity/i18n/pt.po b/contract_variable_quantity/i18n/pt.po index c424323b6..d4b128b2a 100644 --- a/contract_variable_quantity/i18n/pt.po +++ b/contract_variable_quantity/i18n/pt.po @@ -10,23 +10,18 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-27 01:12+0000\n" -"PO-Revision-Date: 2018-04-27 01:12+0000\n" -"Last-Translator: Pedro Castro Silva , 2018\n" +"PO-Revision-Date: 2020-02-18 19:13+0000\n" +"Last-Translator: alvarorib \n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "Language: pt\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.10\n" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "" -#| "\n" -#| " result = env['product.product']." -#| "search_count([('sale_ok', '=', True)])\n" -#| " " msgid "" "\n" " result =\n" @@ -36,8 +31,10 @@ msgid "" " " msgstr "" "\n" -" result = env['product.product']." -"search_count([('sale_ok', '=', True)])\n" +" result =\n" +" " +"env['product.product'].search_count([('sale_ok',\n" +" '=', True)])\n" " " #. module: contract_variable_quantity @@ -47,8 +44,6 @@ msgstr "context: Dicionário de contexto corrente." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "contract: Contract whose line belongs to." msgid "" "contract: Contract whose line\n" " belongs to." @@ -56,17 +51,13 @@ msgstr "contract: Contrato a cuja linha pertence." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "env: Environment variable for getting other models." msgid "" "env: Environment variable for\n" " getting other models." -msgstr "env: Variável de Environment para obtenção de outros modelos." +msgstr "env: Variável de ambiente para obtenção de outros modelos." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "invoice: Invoice (header) being created." msgid "" "invoice: Invoice (header) being\n" " created." @@ -74,9 +65,6 @@ msgstr "invoice: Fatura (cabeçalho) a ser criada." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "" -#| "line: Contract recurring invoice line that triggers this formula." msgid "" "line: Contract recurring invoice\n" " line that triggers this formula." @@ -90,12 +78,12 @@ msgstr "user: Utilizador corrente." #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_abstract_contract_line msgid "Abstract Recurring Contract Line" -msgstr "" +msgstr "Linha de Contrato Recorrente Abstrato" #. module: contract_variable_quantity #: model_terms:ir.actions.act_window,help:contract_variable_quantity.action_contract_quantity_formula msgid "Click to create a new formula for variable quantities." -msgstr "Clique para criar uma nova fórmula para quantidades variáveis" +msgstr "Clique para criar uma nova fórmula para quantidades variáveis." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__code @@ -106,19 +94,17 @@ msgstr "Código" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_contract msgid "Contract" -msgstr "" +msgstr "Contrato" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Linha de Contrato" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_line_qty_formula -#, fuzzy -#| msgid "contract.line.qty.formula" msgid "Contract Line Formula" -msgstr "contract.line.qty.formula" +msgstr "Fórmula de Linha de Contrato" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__create_uid @@ -166,7 +152,7 @@ msgstr "Fórmulas (quantidade)" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form msgid "Help with Python expressions." -msgstr "Ajuda de expressões Python" +msgstr "Ajuda de expressões Python." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__id @@ -235,8 +221,6 @@ msgstr "Quantidade variável" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "You can use these variables to compute your formula:" msgid "" "You can use these variables to compute your\n" " formula:" @@ -244,10 +228,6 @@ msgstr "Pode usar estas variáveis na computação da sua fórmula:" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form -#, fuzzy -#| msgid "" -#| "You have to insert valid Python code block that stores at some moment a " -#| "float/integer value of the quantity to invoice in the variable 'result'." msgid "" "You have to insert valid Python code block that\n" " stores at some moment a float/integer value " diff --git a/contract_variable_quantity/i18n/pt_BR.po b/contract_variable_quantity/i18n/pt_BR.po index 988ba8cef..be3f7c5ae 100644 --- a/contract_variable_quantity/i18n/pt_BR.po +++ b/contract_variable_quantity/i18n/pt_BR.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-30 01:41+0000\n" -"PO-Revision-Date: 2019-12-16 15:05+0000\n" -"Last-Translator: Augusto D. Lisbôa \n" +"PO-Revision-Date: 2020-02-12 05:03+0000\n" +"Last-Translator: Marcel Savegnago \n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" "23907/pt_BR/)\n" "Language: pt_BR\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.9.1\n" +"X-Generator: Weblate 3.10\n" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -86,7 +86,7 @@ msgstr "user: Usuário atual." #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_abstract_contract_line msgid "Abstract Recurring Contract Line" -msgstr "Linha do Contrato Recorrente Abstrato" +msgstr "Linha de Contrato Recorrente Abstrato" #. module: contract_variable_quantity #: model_terms:ir.actions.act_window,help:contract_variable_quantity.action_contract_quantity_formula @@ -165,7 +165,7 @@ msgstr "Ajuda com Expressões Python." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__id msgid "ID" -msgstr "Identificação" +msgstr "ID" #. module: contract_variable_quantity #: model:ir.model.fields,help:contract_variable_quantity.field_contract_contract__skip_zero_qty diff --git a/contract_variable_quantity/i18n/pt_PT.po b/contract_variable_quantity/i18n/pt_PT.po index 213fe1a14..882822f6b 100644 --- a/contract_variable_quantity/i18n/pt_PT.po +++ b/contract_variable_quantity/i18n/pt_PT.po @@ -11,18 +11,20 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0c\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-11 02:47+0000\n" -"PO-Revision-Date: 2016-09-11 02:47+0000\n" -"Last-Translator: Pedro Castro Silva , 2016\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" -"teams/23907/pt_PT/)\n" +"PO-Revision-Date: 2020-02-14 21:13+0000\n" +"Last-Translator: alvarorib \n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/" +"23907/pt_PT/)\n" "Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 3.10\n" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form +#, fuzzy msgid "" "\n" " result =\n" @@ -31,6 +33,12 @@ msgid "" " '=', True)])\n" " " msgstr "" +"\n" +" result =\n" +" " +"env['product.product'].search_count([('sale_ok',\n" +" '=', True)])\n" +" " #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form diff --git a/contract_variable_quantity/models/contract_line.py b/contract_variable_quantity/models/contract_line.py index 9494e7b48..714e8eb51 100644 --- a/contract_variable_quantity/models/contract_line.py +++ b/contract_variable_quantity/models/contract_line.py @@ -44,9 +44,9 @@ class AccountAnalyticInvoiceLine(models.Model): return quantity @api.multi - def _prepare_invoice_line(self, invoice_id=False): + def _prepare_invoice_line(self, invoice_id=False, invoice_values=False): vals = super(AccountAnalyticInvoiceLine, self)._prepare_invoice_line( - invoice_id=invoice_id + invoice_id=invoice_id, invoice_values=invoice_values, ) if ( 'quantity' in vals