From ce08869075c9ce597ad50b83f00f2c727c755ddd Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Mon, 23 Mar 2020 12:55:09 +0100
Subject: [PATCH 1/2] [12.0][IMP] - Add menu for contract tag

---
 contract/__manifest__.py             |  2 ++
 contract/data/ir_ui_menu.xml         | 10 +++++++
 contract/views/contract_tag.xml      | 45 ++++++++++++++++++++++++++++
 contract/views/contract_template.xml |  6 ----
 4 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 contract/data/ir_ui_menu.xml
 create mode 100644 contract/views/contract_tag.xml

diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index 234cbb719..d02ed8d80 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -30,9 +30,11 @@
         'data/contract_cron.xml',
         'data/contract_renew_cron.xml',
         'data/mail_template.xml',
+        'data/ir_ui_menu.xml',
         'wizards/contract_line_wizard.xml',
         'wizards/contract_manually_create_invoice.xml',
         'wizards/contract_contract_terminate.xml',
+        'views/contract_tag.xml',
         'views/abstract_contract_line.xml',
         'views/contract.xml',
         'views/contract_line.xml',
diff --git a/contract/data/ir_ui_menu.xml b/contract/data/ir_ui_menu.xml
new file mode 100644
index 000000000..2f8765704
--- /dev/null
+++ b/contract/data/ir_ui_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <menuitem id="menu_config_contract"
+              name="Contracts"
+              sequence="1"
+              parent="account.menu_finance_configuration"
+    />
+
+</odoo>
diff --git a/contract/views/contract_tag.xml b/contract/views/contract_tag.xml
new file mode 100644
index 000000000..f6bca2c39
--- /dev/null
+++ b/contract/views/contract_tag.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record model="ir.ui.view" id="contract_tag_form_view">
+        <field name="model">contract.tag</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <field name="name"/>
+                    <field name="company_id" options="{'no_create': True}"
+                           groups="base.group_multi_company"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="contract_tag_tree_view">
+        <field name="model">contract.tag</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="company_id" options="{'no_create': True}"
+                       groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="contract_tag_act_window">
+        <field name="name">Contract Tags</field>
+        <field name="res_model">contract.tag</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record model="ir.ui.menu" id="contract_tag_menu">
+        <field name="name">Contract Tag</field>
+        <field name="parent_id" ref="menu_config_contract"/>
+        <field name="action" ref="contract_tag_act_window"/>
+        <field name="sequence" eval="16"/>
+    </record>
+
+</odoo>
diff --git a/contract/views/contract_template.xml b/contract/views/contract_template.xml
index dad5db29a..99b22e5b0 100644
--- a/contract/views/contract_template.xml
+++ b/contract/views/contract_template.xml
@@ -100,12 +100,6 @@
         </field>
     </record>
 
-    <menuitem id="menu_config_contract"
-              name="Contracts"
-              sequence="1"
-              parent="account.menu_finance_configuration"
-              />
-
     <menuitem id="contract_template_menu"
               parent="menu_config_contract"
               action="contract_template_action"

From 4f4723b30c36ea16cc1534fa57d5d30b7772ab38 Mon Sep 17 00:00:00 2001
From: Bejaoui Souheil <souheil_bejaoui@hotmail.fr>
Date: Thu, 2 Apr 2020 17:14:04 +0200
Subject: [PATCH 2/2] [IMP] - Place id attribute before model

Co-Authored-By: Carlos Dauden <carlos.dauden@tecnativa.com>
---
 contract/views/contract_tag.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contract/views/contract_tag.xml b/contract/views/contract_tag.xml
index f6bca2c39..d57fa6585 100644
--- a/contract/views/contract_tag.xml
+++ b/contract/views/contract_tag.xml
@@ -4,7 +4,7 @@
 
 <odoo>
 
-    <record model="ir.ui.view" id="contract_tag_form_view">
+    <record id="contract_tag_form_view" model="ir.ui.view">
         <field name="model">contract.tag</field>
         <field name="arch" type="xml">
             <form>