From 46cbc4b22bb13d7579ff460f900e229239f2f624 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 28 Jul 2010 13:07:10 +0530
Subject: [PATCH] [MOD] event module should be in marketing application IF
 Association is not installed. if asociation is installed, event has to be in
 this application.

bzr revid: vir@tinyerp.com-20100728073710-xq8b0mgulndiva86
---
 addons/association/profile_association.xml       |  5 +++++
 addons/event/event_view.xml                      | 16 +++++++++-------
 .../report/report_event_registration_view.xml    |  2 +-
 addons/marketing/marketing_view.xml              |  2 +-
 .../marketing_campaign_view.xml                  |  4 ++--
 .../report/campaign_analysis_view.xml            |  4 ++--
 addons/membership/membership_view.xml            |  2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 4c02a24dac2..630b02790b8 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -62,5 +62,10 @@
       		</xpath>
       	</field>
 		</record>
+
+		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+		<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
+		<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
+		<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6681901e151..099457acfd6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Events Organisation" id="menu_event_main" parent="base.menu_association" />
+        <!--menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Events Organisation" id="menu_event_main" parent="base.menu_association" /-->
+        <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" />
 
     <!-- EVENTS  -->
 
@@ -33,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -276,7 +278,7 @@
             domain="[('partner_id', '=', active_id)]"
             view_type="form"/>
 
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
+       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
     <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -487,8 +489,8 @@
 
         <menuitem
             name="Registrations"
-            id="menu_action_registration" parent="menu_event_main"
+            id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration"/>
-        <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
+        <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
     </data>
 </openerp>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index ca9edee17a0..f6af4429ad5 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -124,7 +124,7 @@
        </record>
 
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" />
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
  
     <!-- end...  -->
     </data>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 1b144a14729..1735d6464fe 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
             groups="group_marketing_user"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index bedd8edefd2..cf50c4cd6ac 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <menuitem name="Configuration" id="menu_marketing_configuration" parent="marketing.marketing_menu" sequence="1"/>
+    <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
     <!--
     ======================
@@ -106,7 +106,7 @@
 
     </record>
 
-    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
+    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
 
     <!--
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index fb83e12a225..ec92ec83326 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -79,8 +79,8 @@
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-    <menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
-    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
+    <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu"/>
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_association" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 17d17367f87..1e5535802c2 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -80,7 +80,7 @@
         </record>
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Memberships" parent="menu_membership"
             id="menu_membership_products"
             action="action_membership_products" sequence="1"/>