[FIX] - redundant fields in contract line form view

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',
     ],

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"
+"PO-Revision-Date: 2019-10-29 21:33+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\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 ""
 "<code>\n"
 "                                    result =\n"
@@ -28,11 +30,17 @@ msgid ""
 "                                    '=', True)])\n"
 "                                </code>"
 msgstr ""
+"<code>\n"
+"                                    result =\n"
+"                                    "
+"env['product.product'].search_count([('sale_ok',\n"
+"                                    '=', True)])\n"
+"                                </code>"
 
 #. module: contract_variable_quantity
 #: model_terms:ir.ui.view,arch_db:contract_variable_quantity.view_contract_line_qty_formula_form
 msgid "<i>context</i>: Current context dictionary."
-msgstr ""
+msgstr "<i>context</i>: 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 ""
 "<i>contract</i>: Contract whose line\n"
 "                                    belongs to."
 msgstr ""
+"<i>contract</i>: 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 ""
 "<i>env</i>: Environment variable for\n"
 "                                    getting other models."
 msgstr ""
+"<i>env</i>: 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 ""
 "<i>invoice</i>: Invoice (header) being\n"
 "                                    created."
 msgstr ""
+"<i>invoice</i>: 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 ""
 "<i>line</i>: Contract recurring invoice\n"
 "                                    line that triggers this formula."
 msgstr ""
+"<i>line</i>: 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 "<i>user</i>: Current user."
-msgstr ""
+msgstr "<i>user</i>: 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"

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"
+"PO-Revision-Date: 2019-10-30 01:33+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
+"Last-Translator: Josep M <jmyepes@mac.com>\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 ""
-#| "<code>\n"
-#| "                                    result = env['product.product']."
-#| "search_count([('sale_ok', '=', True)])\n"
-#| "                                </code>"
 msgid ""
 "<code>\n"
 "                                    result =\n"
@@ -35,8 +30,10 @@ msgid ""
 "                                </code>"
 msgstr ""
 "<code>\n"
-"                                    result = env['product.product']."
+"                                    result  =\n"
-"search_count([('sale_ok', '=', True)])\n"
+"                                    "
+"env['product.product'].search_count([('sale_ok',\n"
+"                                    '=', True)])\n"
 "                                </code>"
 
 #. module: contract_variable_quantity
@@ -46,42 +43,39 @@ msgstr "<i>context</i>: 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 "<i>contract</i>: Contract whose line belongs to."
 msgid ""
 "<i>contract</i>: Contract whose line\n"
 "                                    belongs to."
-msgstr "<i>contract</i>: Contrato al que pertenece esta línea."
+msgstr ""
+"<i>contract</i>: 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 "<i>env</i>: Environment variable for getting other models."
 msgid ""
 "<i>env</i>: Environment variable for\n"
 "                                    getting other models."
-msgstr "<i>env</i>: Variable de entorno para obtener otros modelos."
+msgstr ""
+"<i>env</i>: 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 "<i>invoice</i>: Invoice (header) being created."
 msgid ""
 "<i>invoice</i>: Invoice (header) being\n"
 "                                    created."
-msgstr "<i>invoice</i>: Factura (cabecera) siendo creada."
+msgstr ""
+"<i>invoice</i>: 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 ""
-#| "<i>line</i>: Contract recurring invoice line that triggers this formula."
 msgid ""
 "<i>line</i>: Contract recurring invoice\n"
 "                                    line that triggers this formula."
 msgstr ""
-"<i>line</i>: Línea del contrato de facturación recurrente que lanza esta "
+"<i>line</i>: Línea de factura recurrente del contrato\n"
-"fórmula."
+"                                    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 "<i>user</i>: 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 "
+"Debe insertar un bloque de código Python válido que\n"
-"valor entero o decimal de la cantidad a facturar en la variable 'result'."
+"                                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"

contract_variable_quantity/views/contract_line.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="contract_line_form_view" model="ir.ui.view">
-        <field name="name">contract.line.tree (in contract_variable_quantity)</field>
-        <field name="model">contract.line</field>
-        <field name="inherit_id"
-               ref="contract.contract_line_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='quantity']" position="before">
-                <field name="qty_type"/>
-            </xpath>
-            <xpath expr="//field[@name='quantity']" position="after">
-                <field name="qty_formula_id"
-                       attrs="{'required': [('qty_type', '=', 'variable')], 'invisible': [('qty_type', '!=', 'variable')]}"
-                />
-            </xpath>
-            <xpath expr="//field[@name='quantity']" position="attributes">
-                <attribute name="attrs">{'required': [('qty_type', '=', 'fixed')], 'invisible': [('qty_type', '!=', 'fixed')]}</attribute>
-            </xpath>
-        </field>
-    </record>
-</odoo>
-
-