From 22ded8f0b6ad1afbb32572bc89fa58e2745bd141 Mon Sep 17 00:00:00 2001
From: "RavishchanraMurari (Open ERP)" <rmu@tinyerp.com>
Date: Wed, 9 Nov 2011 12:20:29 +0530
Subject: [PATCH] association_module

bzr revid: rmu@tinyerp.com-20111109065029-lmmh731tyscuqdvx
---
 addons/event/board_association_view.xml             | 3 +--
 addons/event/event_view.xml                         | 4 ++--
 addons/membership/membership_view.xml               | 2 +-
 addons/membership/report/report_membership_view.xml | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 8b6a4dcd0d4..78fc8395341 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -69,9 +69,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem id="board_associations" name="Dashboard" parent="base.menu_report_association" sequence="0"/>
         <menuitem
-            name="Events" parent="board_associations"
+            name="Event Dashboard" parent="base.menu_report_association"
             action="open_board_associations_manager"
             sequence="1"
             id="menu_board_associations_manager"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index da5fa1ea6e2..6a057fe204d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -6,7 +6,7 @@
         <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 Organisation" id="base.menu_event_association" parent="base.menu_association" />
+        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
 
     <!-- EVENTS  -->
 
@@ -42,7 +42,7 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
+        <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 74d1baa128f..ac530792049 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -128,7 +128,7 @@
         <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="Membership Products"
-                  parent="menu_membership"
+                  parent="base.menu_marketing_config_association"
                   id="menu_membership_products"
                   action="action_membership_products"
                   sequence="1"
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 61a0a1d52ce..27ccfae0e12 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -96,7 +96,7 @@
             <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_report_membership_search"/>
-            <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1, }</field>
+            <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">