From 2a343e5835b5417c3eb1806ebdd32125f587bffc Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 25 Oct 2019 16:15:50 +0200 Subject: [PATCH] [FIX] - redundant fields in contract line form view --- contract_variable_quantity/__manifest__.py | 3 +- contract_variable_quantity/i18n/de.po | 65 +++++++++++----- contract_variable_quantity/i18n/es.po | 75 ++++++++----------- .../views/contract_line.xml | 25 ------- 4 files changed, 79 insertions(+), 89 deletions(-) delete mode 100644 contract_variable_quantity/views/contract_line.xml diff --git a/contract_variable_quantity/__manifest__.py b/contract_variable_quantity/__manifest__.py index fcc96103d..5da66f310 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.0.0', + 'version': '12.0.2.1.0', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "Tecnativa," @@ -16,7 +16,6 @@ 'security/ir.model.access.csv', 'views/abstract_contract_line.xml', 'views/contract_line_formula.xml', - 'views/contract_line.xml', 'views/contract_template.xml', 'views/contract.xml', ], diff --git a/contract_variable_quantity/i18n/de.po b/contract_variable_quantity/i18n/de.po index fd673430f..8556e0f45 100644 --- a/contract_variable_quantity/i18n/de.po +++ b/contract_variable_quantity/i18n/de.po @@ -9,17 +9,19 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-29 03:46+0000\n" -"PO-Revision-Date: 2017-12-29 03:46+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2019-10-29 21:33+0000\n" +"Last-Translator: Rudolf Schnapka \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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.8\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" @@ -28,11 +30,17 @@ 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 msgid "context: Current context dictionary." -msgstr "" +msgstr "context: Aktuelles context dictionary." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -40,6 +48,8 @@ msgid "" "contract: Contract whose line\n" " belongs to." msgstr "" +"contract: Vertrag dessen\n" +" Position angehört." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -47,6 +57,8 @@ msgid "" "env: Environment variable for\n" " getting other models." msgstr "" +"env: Umgebungs-Variable, um\n" +" andere Modelle zu erhalten." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -54,6 +66,8 @@ msgid "" "invoice: Invoice (header) being\n" " created." msgstr "" +"invoice: Rechnung (-skopf) der\n" +" erstellt wird." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -61,21 +75,23 @@ msgid "" "line: Contract recurring invoice\n" " line that triggers this formula." msgstr "" +"line: Wiederkehrende Vertragsrechnungs-\n" +" position die diese Formel auslöst." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form msgid "user: Current user." -msgstr "" +msgstr "user: Aktueller Anwender." #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_abstract_contract_line msgid "Abstract Recurring Contract Line" -msgstr "" +msgstr "Abstrakte Wiederkehrende Vertragsposition" #. 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 "" +msgstr "Klicken Sie, um eine neue Formel für variable Mengen einzugeben." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__code @@ -86,17 +102,17 @@ msgstr "Schlüssel" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_contract msgid "Contract" -msgstr "" +msgstr "Vertrag" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Vertragsposition" #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_line_qty_formula msgid "Contract Line Formula" -msgstr "" +msgstr "Vertragspositionsformel" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__create_uid @@ -120,29 +136,31 @@ msgid "" "Error evaluating code.\n" "Details: %s" msgstr "" +"Fehler bei Codeprüfung.\n" +"Details: %s" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form msgid "Example of Python code" -msgstr "" +msgstr "Beispiel von Python-Code" #. module: contract_variable_quantity #: selection:contract.abstract.contract.line,qty_type:0 #: selection:contract.line,qty_type:0 #: selection:contract.template.line,qty_type:0 msgid "Fixed quantity" -msgstr "" +msgstr "Fixe Menge" #. module: contract_variable_quantity #: model:ir.actions.act_window,name:contract_variable_quantity.action_contract_quantity_formula #: model:ir.ui.menu,name:contract_variable_quantity.menu_contract_quantity_formula msgid "Formulas (quantity)" -msgstr "" +msgstr "Formeln (Menge)" #. 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 "" +msgstr "Hilfe zu Python-Ausdrücken." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__id @@ -153,6 +171,7 @@ msgstr "ID" #: model:ir.model.fields,help:contract_variable_quantity.field_contract_contract__skip_zero_qty msgid "If checked, contract lines with 0 qty don't create invoice line" msgstr "" +"Wenn angehakt, werden bei Null-Mengen keine Rechnungspositionen erstellt" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula____last_update @@ -173,39 +192,39 @@ msgstr "Zuletzt aktualisiert am" #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__name #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form msgid "Name" -msgstr "Name" +msgstr "Bezeichnung" #. module: contract_variable_quantity #: code:addons/contract_variable_quantity/models/contract_line_formula.py:40 #, python-format msgid "No valid result returned." -msgstr "" +msgstr "Kein gültiges Ergebnis geliefert." #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_abstract_contract_line__qty_formula_id #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line__qty_formula_id #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_template_line__qty_formula_id msgid "Qty. formula" -msgstr "" +msgstr "Mengenfomel" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_abstract_contract_line__qty_type #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line__qty_type #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_template_line__qty_type msgid "Qty. type" -msgstr "" +msgstr "Mengenart" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_contract__skip_zero_qty msgid "Skip Zero Qty Lines" -msgstr "" +msgstr "Überspringe Nullmengenpositionen" #. module: contract_variable_quantity #: selection:contract.abstract.contract.line,qty_type:0 #: selection:contract.line,qty_type:0 #: selection:contract.template.line,qty_type:0 msgid "Variable quantity" -msgstr "" +msgstr "Variable Menge" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -213,6 +232,8 @@ msgid "" "You can use these variables to compute your\n" " formula:" msgstr "" +"Sie können diese Variablen in Ihrer\n" +" Formel nutzen:" #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -223,6 +244,10 @@ msgid "" " the quantity to invoice in the variable\n" " 'result'." msgstr "" +"Sie müssen einen Python Codeblock einsetzen, der\n" +" irgendwo einen float/integer -Wert der\n" +" abzurechnenden Menge in der Variablen\n" +" 'result' speichert." #~ msgid "Analytic Account" #~ msgstr "Kostenstelle" diff --git a/contract_variable_quantity/i18n/es.po b/contract_variable_quantity/i18n/es.po index b93dc254d..9b9096982 100644 --- a/contract_variable_quantity/i18n/es.po +++ b/contract_variable_quantity/i18n/es.po @@ -9,23 +9,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: OCA Transbot , 2018\n" +"PO-Revision-Date: 2019-10-30 01:33+0000\n" +"Last-Translator: Josep M \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.8\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" @@ -35,8 +30,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 @@ -46,42 +43,39 @@ msgstr "context: Diccionario de contexto actual." #. 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." -msgstr "contract: Contrato al que pertenece esta línea." +msgstr "" +"contract: Contrato cuya línea\n" +" pertenece a." #. 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: Variable de entorno para obtener otros modelos." +msgstr "" +"env: Variable de entorno para\n" +" conseguir otros 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." -msgstr "invoice: Factura (cabecera) siendo creada." +msgstr "" +"invoice: Factura (cabecera) está siendo\n" +" creada." #. 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." msgstr "" -"line: Línea del contrato de facturación recurrente que lanza esta " -"fórmula." +"line: Línea de factura recurrente del contrato\n" +" que activa esta fórmula." #. module: contract_variable_quantity #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form @@ -91,7 +85,7 @@ msgstr "user: Usuario actual." #. module: contract_variable_quantity #: model:ir.model,name:contract_variable_quantity.model_contract_abstract_contract_line msgid "Abstract Recurring Contract Line" -msgstr "" +msgstr "Extracto de la línea de contrato recurrente" #. module: contract_variable_quantity #: model_terms:ir.actions.act_window,help:contract_variable_quantity.action_contract_quantity_formula @@ -107,19 +101,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 "Línea 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 la línea de contrato" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line_qty_formula__create_uid @@ -213,14 +205,14 @@ msgstr "No se devuelve un valor válido." #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line__qty_formula_id #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_template_line__qty_formula_id msgid "Qty. formula" -msgstr "Formula ctdad." +msgstr "Fórmula cantidad" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_abstract_contract_line__qty_type #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_line__qty_type #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_template_line__qty_type msgid "Qty. type" -msgstr "Tipo ctdad." +msgstr "Tipo cantidad" #. module: contract_variable_quantity #: model:ir.model.fields,field_description:contract_variable_quantity.field_contract_contract__skip_zero_qty @@ -236,19 +228,15 @@ msgstr "Cantidad variable" #. 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:" -msgstr "Puede usar estas variables para calcular su fórmula:" +msgstr "" +"Puede usar estas variables para calcular su\n" +" 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 " @@ -256,8 +244,11 @@ msgid "" " the quantity to invoice in the variable\n" " 'result'." msgstr "" -"Debe insertar un bloque de código Python que almacene en algún momento un " -"valor entero o decimal de la cantidad a facturar en la variable 'result'." +"Debe insertar un bloque de código Python válido que\n" +" almacena en algún momento un valor flotante /" +" entero de\n" +" la cantidad a facturar en la variable\n" +" 'result'." #~ msgid "Analytic Account" #~ msgstr "Cuenta analítica" diff --git a/contract_variable_quantity/views/contract_line.xml b/contract_variable_quantity/views/contract_line.xml deleted file mode 100644 index c5ec91e71..000000000 --- a/contract_variable_quantity/views/contract_line.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - contract.line.tree (in contract_variable_quantity) - contract.line - - - - - - - - - - {'required': [('qty_type', '=', 'fixed')], 'invisible': [('qty_type', '!=', 'fixed')]} - - - - - -