From a679dcea4d4080bdfa5294c948561198a3944f80 Mon Sep 17 00:00:00 2001
From: michel <michel@yaltik.com>
Date: Mon, 20 Nov 2017 11:12:41 +0100
Subject: [PATCH] Menu

---
 coworking_coworker/__manifest__.py            |  1 +
 coworking_coworker/views/coworking_menu.xml   |  5 +++-
 .../views/coworking_menu_parent.xml           | 15 ++++++++++++
 coworking_relation/__manifest__.py            |  1 -
 coworking_relation/views/relation_menu.xml    |  3 +--
 coworking_relation/views/relation_views.xml   | 24 +++++++++++++++++++
 6 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 coworking_coworker/views/coworking_menu_parent.xml

diff --git a/coworking_coworker/__manifest__.py b/coworking_coworker/__manifest__.py
index 5050e10..81a76ce 100644
--- a/coworking_coworker/__manifest__.py
+++ b/coworking_coworker/__manifest__.py
@@ -26,6 +26,7 @@
     'application': False,
     'installable': True,
     'data': ['security/ir.model.access.csv',
+             'views/coworking_menu_parent.xml',
              'views/coworking_menu.xml',
              'views/coworker_views.xml'],
     'depends': ['coworking_base']
diff --git a/coworking_coworker/views/coworking_menu.xml b/coworking_coworker/views/coworking_menu.xml
index 6c752ca..fbc4a29 100644
--- a/coworking_coworker/views/coworking_menu.xml
+++ b/coworking_coworker/views/coworking_menu.xml
@@ -5,7 +5,10 @@
   <!-- Action to open Coworkers list -->
   <act_window id="coworker_action" name="Coworkers"
     res_model="coworking.coworker" view_mode="tree,form,kanban,calendar" />
+
   <!-- Menu item to open Coworkers list -->
-  <menuitem id="coworker_menu" name="Coworkers" action="coworker_action" />
+  <!-- <menuitem id="coworker_menu" name="Coworkers" action="coworker_action" /> -->
+  <!-- <menuitem id="coworking_parent_menu" name="Coworking" /> -->
+
 
 </odoo>
diff --git a/coworking_coworker/views/coworking_menu_parent.xml b/coworking_coworker/views/coworking_menu_parent.xml
new file mode 100644
index 0000000..4624b30
--- /dev/null
+++ b/coworking_coworker/views/coworking_menu_parent.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<odoo>
+<!-- Menu items -->
+<!-- Modify top menu item -->
+<menuitem id="coworker_menu" name="Coworking" />
+<!-- App menu items -->
+<menuitem id="menu_coworker"
+ name="Coworkers"
+ parent="coworking.coworker"
+ sequence="10"
+ action="coworker_action" />
+
+
+</odoo>
diff --git a/coworking_relation/__manifest__.py b/coworking_relation/__manifest__.py
index a181477..45dc04e 100644
--- a/coworking_relation/__manifest__.py
+++ b/coworking_relation/__manifest__.py
@@ -26,7 +26,6 @@
     'application': False,
     'installable': True,
     'data': ['security/ir.model.access.csv',
-             'views/relation_menu.xml',
              'views/relation_views.xml',
              'views/coworker_views.xml'],
     'depends': ['coworking_coworker']
diff --git a/coworking_relation/views/relation_menu.xml b/coworking_relation/views/relation_menu.xml
index a2ab1e1..5973274 100644
--- a/coworking_relation/views/relation_menu.xml
+++ b/coworking_relation/views/relation_menu.xml
@@ -6,6 +6,5 @@
   <act_window id="relation_action" name="Relation"
     res_model="coworking.relation" view_mode="tree" />
   <!-- Menu item to open Event list -->
-  <menuitem id="relation_menu" name="Relation" action="relation_action" />
-
+  
 </odoo>
diff --git a/coworking_relation/views/relation_views.xml b/coworking_relation/views/relation_views.xml
index fe62d3e..3e5ac1b 100644
--- a/coworking_relation/views/relation_views.xml
+++ b/coworking_relation/views/relation_views.xml
@@ -34,4 +34,28 @@
   </field>
 </record>
 
+
+<!-- Search -->
+<record id="view_search_relation" model="ir.ui.view">
+  <field name="name">relation Search</field>
+  <field name="model">coworking.relation</field>
+  <field name="arch" type="xml">
+    <search>
+      <field name="coworker1" />
+      <field name="coworker2" />
+      <field name="relation" />
+
+      <separator />
+
+      <filter name="group_relation" string="Group relation"
+        context="{'group_by': 'relation'}" />
+
+      <filter name="group_coworker1" string="Group coworker1"
+        context="{'group_by': 'coworker1'}" />
+
+    </search>
+  </field>
+</record>
+
+
 </odoo>