From 47d44355dfc8753385f14be7a808c3cf793b70a6 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Fri, 23 Nov 2018 12:29:22 +0100
Subject: [PATCH] [IMP] - Adapt contract sale to contract new views

---
 contract_sale/__manifest__.py                 |  5 ++--
 .../views/abstract_contract_line.xml          | 18 ++++++++++++
 .../views/account_analytic_account_view.xml   | 28 -------------------
 contract_sale/views/contract.xml              | 12 ++++++++
 contract_sale/views/contract_line.xml         | 18 ++++++++++++
 ...ontract_view.xml => contract_template.xml} |  0
 6 files changed, 51 insertions(+), 30 deletions(-)
 create mode 100644 contract_sale/views/abstract_contract_line.xml
 delete mode 100644 contract_sale/views/account_analytic_account_view.xml
 create mode 100644 contract_sale/views/contract.xml
 create mode 100644 contract_sale/views/contract_line.xml
 rename contract_sale/views/{account_analytic_contract_view.xml => contract_template.xml} (100%)

diff --git a/contract_sale/__manifest__.py b/contract_sale/__manifest__.py
index 230d83d99..acade46fc 100644
--- a/contract_sale/__manifest__.py
+++ b/contract_sale/__manifest__.py
@@ -15,8 +15,9 @@
     'data': [
         'security/ir.model.access.csv',
         'security/account_analytic_account_security.xml',
-        'views/account_analytic_account_view.xml',
-        'views/account_analytic_contract_view.xml',
+        'views/contract.xml',
+        'views/contract_line.xml',
+        'views/contract_template.xml',
     ],
     'license': 'AGPL-3',
     'installable': True,
diff --git a/contract_sale/views/abstract_contract_line.xml b/contract_sale/views/abstract_contract_line.xml
new file mode 100644
index 000000000..4ebb43bcc
--- /dev/null
+++ b/contract_sale/views/abstract_contract_line.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_abstract_analytic_contract_line_view_form"
+            model="ir.ui.view">
+        <field name="name">account.abstract.analytic.contract.line.form (in contract_sale)</field>
+        <field name="model">account.abstract.analytic.contract.line</field>
+        <field name="inherit_id"
+               ref="contract.account_abstract_analytic_contract_line_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='discount']" position="attributes">
+                <attribute name="groups">sale.group_discount_per_so_line
+                </attribute>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/contract_sale/views/account_analytic_account_view.xml b/contract_sale/views/account_analytic_account_view.xml
deleted file mode 100644
index 5b08a3adc..000000000
--- a/contract_sale/views/account_analytic_account_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="account_analytic_account_recurring_form_form"
-            model="ir.ui.view">
-        <field name="name">Contract form (in contract_sale)</field>
-        <field name="model">account.analytic.account</field>
-        <field name="inherit_id"
-               ref="contract.account_analytic_account_recurring_form_form"/>
-        <field name="arch" type="xml">
-
-            <xpath expr="//field[@name='discount']" position="attributes">
-                <attribute name="groups">sale.group_discount_per_so_line
-                </attribute>
-            </xpath>
-
-        </field>
-    </record>
-
-    <menuitem
-        id="menu_contract_sale" name="Contracts"
-        parent="sale.sale_order_menu"
-        action="contract.action_account_analytic_sale_overdue_all"
-        sequence="2"
-        groups="sales_team.group_sale_salesman"
-    />
-
-</odoo>
diff --git a/contract_sale/views/contract.xml b/contract_sale/views/contract.xml
new file mode 100644
index 000000000..04c2d13cf
--- /dev/null
+++ b/contract_sale/views/contract.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <menuitem
+        id="menu_contract_sale" name="Contracts"
+        parent="sale.sale_order_menu"
+        action="contract.action_account_analytic_sale_overdue_all"
+        sequence="2"
+        groups="sales_team.group_sale_salesman"
+    />
+
+</odoo>
diff --git a/contract_sale/views/contract_line.xml b/contract_sale/views/contract_line.xml
new file mode 100644
index 000000000..05f8581df
--- /dev/null
+++ b/contract_sale/views/contract_line.xml
@@ -0,0 +1,18 @@
+<?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_sale)</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='discount']" position="attributes">
+                <attribute name="groups">sale.group_discount_per_so_line
+                </attribute>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/contract_sale/views/account_analytic_contract_view.xml b/contract_sale/views/contract_template.xml
similarity index 100%
rename from contract_sale/views/account_analytic_contract_view.xml
rename to contract_sale/views/contract_template.xml