From 8189ff4ddbff3e2d5f5f76e9bab07984a65af350 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 1 Mar 2012 10:50:27 +0530
Subject: [PATCH 1/4] [IMP] association: remove first level menu Membership and
 Events

bzr revid: jap@tinyerp.com-20120301052027-8om1es1m509mt0xb
---
 addons/event/event_view.xml           | 4 ++--
 addons/membership/membership_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 31fb353c113..a948d831238 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -294,7 +294,7 @@
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
-       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
+       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_association" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -491,7 +491,7 @@
 
         <menuitem
             name="Registrations"
-            id="menu_action_registration_association" parent="base.menu_event_association"
+            id="menu_action_registration_association" parent="base.menu_association"
             action="action_registration"/>
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a1c39165c82..0b999476ba6 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -206,7 +206,7 @@
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
-        <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
+        <menuitem name="Members" parent="base.menu_association" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
 

From 017eac1e460f29e88a5d631f40071c6265ce7165 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 1 Mar 2012 10:54:46 +0530
Subject: [PATCH 2/4] [IMP] event: remove default filter on list view

bzr revid: jap@tinyerp.com-20120301052446-fz17h38eq1zuuj28
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a948d831238..2366b82497b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -270,7 +270,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form,calendar,graph</field>
-           <field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
+           <field name="context">{"search_default_section_id": section_id}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
@@ -480,7 +480,7 @@
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form,calendar,graph</field>
-          <field name="context">{"search_default_draft": "1"}</field>
+          <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
 

From 9c6ad44d46d97d484818e661804e85e63dd3a7df Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 2 Mar 2012 15:53:56 +0530
Subject: [PATCH 3/4] [IMP] association: add the first level menu Members,
 Events and Registrations

bzr revid: jap@tinyerp.com-20120302102356-y22kr07odb92z7ne
---
 addons/event/event_view.xml           | 5 +++--
 addons/membership/membership_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2366b82497b..f9a7f6616fd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -7,6 +7,7 @@
 
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
         <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
+        <menuitem name="Registrations" id="base.menu_registrations_association" parent="base.menu_association" />
 
     <!-- EVENTS  -->
 
@@ -294,7 +295,7 @@
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
-       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_association" />
+       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -491,7 +492,7 @@
 
         <menuitem
             name="Registrations"
-            id="menu_action_registration_association" parent="base.menu_association"
+            id="menu_action_registration_association" parent="base.menu_registrations_association"
             action="action_registration"/>
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 0b999476ba6..921afcd1b54 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -126,7 +126,7 @@
         </record>
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 
@@ -206,7 +206,7 @@
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
-        <menuitem name="Members" parent="base.menu_association" id="menu_members" sequence="2" action="action_membership_members"/>
+        <menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
 

From 211341b41a6338940c777191fb97eca234b81f08 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Fri, 2 Mar 2012 17:59:20 +0530
Subject: [PATCH 4/4] [IMP] association: remove first level menu Events and
 Registrations

bzr revid: jap@tinyerp.com-20120302122920-16jnktgrt0u1gdmd
---
 addons/event/event_view.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f9a7f6616fd..6b7331a10e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -6,8 +6,6 @@
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
-        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
-        <menuitem name="Registrations" id="base.menu_registrations_association" parent="base.menu_association" />
 
     <!-- EVENTS  -->
 
@@ -295,7 +293,6 @@
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
-       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -490,10 +487,6 @@
             id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration"/>
 
-        <menuitem
-            name="Registrations"
-            id="menu_action_registration_association" parent="base.menu_registrations_association"
-            action="action_registration"/>
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
     </data>