From 087ee2f6818a601f10bef66bae080960085ff8d8 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Fri, 23 Nov 2018 12:44:33 +0100
Subject: [PATCH] [IMP] - Adapt contract_variable_quantity to contract new
 views

---
 contract_variable_quantity/__manifest__.py    |  1 +
 .../views/contract_line_view.xml              | 26 +++++++++++++++++++
 .../views/contract_view.xml                   | 13 +---------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 contract_variable_quantity/views/contract_line_view.xml

diff --git a/contract_variable_quantity/__manifest__.py b/contract_variable_quantity/__manifest__.py
index 40108bc5..feedab34 100644
--- a/contract_variable_quantity/__manifest__.py
+++ b/contract_variable_quantity/__manifest__.py
@@ -17,6 +17,7 @@
         'security/ir.model.access.csv',
         'views/abstract_contract_view.xml',
         'views/contract_line_formula.xml',
+        'views/contract_line_view.xml',
         'views/contract_template_view.xml',
         'views/contract_view.xml',
     ],
diff --git a/contract_variable_quantity/views/contract_line_view.xml b/contract_variable_quantity/views/contract_line_view.xml
new file mode 100644
index 00000000..0db97743
--- /dev/null
+++ b/contract_variable_quantity/views/contract_line_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_analytic_invoice_line_view_tree"
+            model="ir.ui.view">
+        <field name="name">account.analytic.invoice.line.tree (in contract_variable_quantity)</field>
+        <field name="model">account.analytic.invoice.line</field>
+        <field name="inherit_id"
+               ref="contract.account_analytic_invoice_line_view_tree"/>
+        <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>
+
+
diff --git a/contract_variable_quantity/views/contract_view.xml b/contract_variable_quantity/views/contract_view.xml
index fa777336..d555b531 100644
--- a/contract_variable_quantity/views/contract_view.xml
+++ b/contract_variable_quantity/views/contract_view.xml
@@ -5,19 +5,8 @@
         <field name="model">account.analytic.account</field>
         <field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/>
         <field name="arch" type="xml">
-            <field name="recurring_next_date" position="after">
+            <xpath expr="//field[@name='code']" position="after">
                 <field name="skip_zero_qty"/>
-            </field>
-            <xpath expr="//field[@name='recurring_invoice_line_ids']//field[@name='quantity']" position="before">
-                <field name="qty_type"/>
-            </xpath>
-            <xpath expr="//field[@name='recurring_invoice_line_ids']//field[@name='quantity']" position="after">
-                <field name="qty_formula_id"
-                       attrs="{'required': [('qty_type', '=', 'variable')], 'invisible': [('qty_type', '!=', 'variable')]}"
-                />
-            </xpath>
-            <xpath expr="//field[@name='recurring_invoice_line_ids']//field[@name='quantity']" position="attributes">
-                <attribute name="attrs">{'required': [('qty_type', '=', 'fixed')], 'invisible': [('qty_type', '!=', 'fixed')]}</attribute>
             </xpath>
         </field>
     </record>