Merge PR #411 into 12.0

Signed-off-by sbejaoui
OCA · Nov 4, 2019 · ec7c054 · ec7c054
2 parents 41d787d + 3606d69
commit ec7c054
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/contract_variable_quantity/__manifest__.py b/contract_variable_quantity/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright 2016-2018 Tecnativa - Pedro M. Baeza
+# Copyright 2016-2019 Tecnativa - Pedro M. Baeza
 # Copyright 2018 Tecnativa - Carlos Dauden
 # Copyright 2019 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@@ -16,6 +16,7 @@
         'security/ir.model.access.csv',
         'views/abstract_contract_line.xml',
         'views/contract_line_formula.xml',
+        'views/contract_line_views.xml',
         'views/contract_template.xml',
         'views/contract.xml',
     ],

diff --git a/contract_variable_quantity/views/contract_line_views.xml b/contract_variable_quantity/views/contract_line_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Tecnativa - Pedro M. Baeza
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="contract_line_tree_view" model="ir.ui.view">
+        <field name="name">contract.line tree view (in contract) - Add variable qty fields</field>
+        <field name="model">contract.line</field>
+        <field name="inherit_id" ref="contract.contract_line_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="quantity" position="before">
+                <field name="qty_type"/>
+                <field
+                    name="qty_formula_id"
+                    attrs="{'invisible': [('qty_type', '!=', 'variable')]}"
+                />
+            </field>
+            <field name="quantity" position="attributes">
+                <attribute name="attrs">{'invisible': [('qty_type', '!=', 'fixed')]}</attribute>
+            </field>
+        </field>
+    </record>
+
+</odoo>