From 5f92d68c5da18fd7a341f3b7aab3c4e873b713a3 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Fri, 24 Feb 2012 14:54:50 +0530
Subject: [PATCH] [IMP]
 crm,crm_caldav,import_base,import_google,import_crm:-reorganised the
 menus(i.e.Meetings,Import) and created 'Import & Synchronize' menu

bzr revid: mtr@tinyerp.com-20120224092450-ew4oai64n9ziqt3z
---
 addons/crm/crm_meeting_menu.xml                        |  7 +++++--
 addons/crm_caldav/crm_caldav_view.xml                  | 10 +++++-----
 addons/import_base/import_base_view.xml                |  2 +-
 .../import_google/wizard/import_google_data_view.xml   |  4 ++--
 addons/import_sugarcrm/import_sugarcrm_view.xml        |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index af50149f693..6f29970b492 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -90,9 +90,12 @@
     <menuitem name="Meetings" id="menu_meeting_sale"
         parent="base.menu_base_partner" sequence="3"/>
 
+    <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
+        parent="base.menu_base_partner"/>
+
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-        action="crm_case_categ_meet" parent="menu_meeting_sale"
-        sequence="1" />
+        action="crm_case_categ_meet" parent="base.menu_sales"
+        sequence="20" />
 
     <record id="action_view_attendee_form" model="ir.actions.act_window">
          <field name="name">Meeting Invitations</field>
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index a610095d6a6..ad0d8cde2ad 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -11,14 +11,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-    
+
         <menuitem
             name="Synchronize This Calendar"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"
-            parent="crm.menu_meeting_sale" sequence="1"/>
-            
-        
+            parent="base.menu_import_crm" sequence="1"/>
+
+
     </data>
-</openerp> 
+</openerp>
diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml
index 1368b50b6e4..3f10a462507 100644
--- a/addons/import_base/import_base_view.xml
+++ b/addons/import_base/import_base_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-		<menuitem name="Import" id="menu_import_crm" parent="base.menu_base_partner"/>
+		<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner"/>
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index fe099a3cb71..510160c6247 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -78,12 +78,12 @@
         </record>
 
         <menuitem id="menu_sync_contact"
-                  parent="import_base.menu_import_crm"
+                  parent="base.menu_import_crm"
                   action="act_google_login_contact_form"
                   sequence="40" />
 
         <menuitem id="menu_sync_calendar"
-                  parent="import_base.menu_import_crm"
+                  parent="base.menu_import_crm"
                   action="act_google_login_form"
                   sequence="20" />
 
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 3c1f9df60fb..4b0b9d295e9 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -98,7 +98,7 @@
     </record>
 
 
-    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
+    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
 
   </data>
 </openerp>