From 3ddfc8a6ad87acb4fa314e43edb526d1467fc79e Mon Sep 17 00:00:00 2001
From: Ronald Portier <ronald@therp.nl>
Date: Wed, 5 Dec 2018 11:19:28 +0100
Subject: [PATCH] [IMP] partner_noncommercial. Fully use contacts menu.

---
 partner_noncommercial/readme/ROADMAP.rst    |  9 ---------
 partner_noncommercial/views/menu.xml        | 17 ++++-------------
 partner_noncommercial/views/res_partner.xml |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 partner_noncommercial/readme/ROADMAP.rst

diff --git a/partner_noncommercial/readme/ROADMAP.rst b/partner_noncommercial/readme/ROADMAP.rst
deleted file mode 100644
index ab755a463..000000000
--- a/partner_noncommercial/readme/ROADMAP.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-After installing this module a situation has been encountered where the new
-menu's were added to the database, but not shown in the UI. This was due to
-partner_left and partner_right not being filled. To solve this, use the
-generic solution when the menu-system has been messed up:
-
-#.  stop server
-#.  drop parent_left and parent_right columns from ir_ui_menu table
-#.  start server while updating base module
-
diff --git a/partner_noncommercial/views/menu.xml b/partner_noncommercial/views/menu.xml
index 35a6043b8..09cf96cce 100644
--- a/partner_noncommercial/views/menu.xml
+++ b/partner_noncommercial/views/menu.xml
@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-   <!-- Provide non-commercial partner menu -->
-    <menuitem
-        id="menu_partner_main"
-        name="Partners"
-        parent="contacts.menu_contacts"
-        groups="base.group_user"
-        sequence="4"
-        />
     <menuitem
         id="menu_partner"
         name="Partners"
-        parent="menu_partner_main"
-        groups="base.group_user"
-        sequence="4"
+        parent="contacts.menu_contacts"
+        sequence="11"
         />
 
-    <!-- Add menu item to show all relations -->
+    <!-- Add menu item to show all partners -->
     <record id="action_all_partner_form" model="ir.actions.act_window">
         <field name="name">All partners</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.partner</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form</field>
-        <field name="context">{"search_default_type_relation": 1}</field>
+        <field name="context">{"search_default_type_contact": 1}</field>
         <field name="search_view_id" ref="base.view_res_partner_filter"/>
     </record>
     <menuitem
diff --git a/partner_noncommercial/views/res_partner.xml b/partner_noncommercial/views/res_partner.xml
index 5741a1eff..467c9f312 100644
--- a/partner_noncommercial/views/res_partner.xml
+++ b/partner_noncommercial/views/res_partner.xml
@@ -8,7 +8,7 @@
             <filter name="type_person" position="before">
                 <filter
                     string="All partners"
-                    name="type_relation"
+                    name="type_contact"
                     domain="['|',('is_company','=',1),('type','=','contact')]"
                     />
             </filter>