From 4c2daa9eaaef2e88ab4234365212f0d2a85f0806 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 17:32:35 +0200
Subject: [PATCH] [IMP] attach the 'Our company' menu items to the portal's
 root menu

bzr revid: abo@openerp.com-20120702153235-b5qd9ei9os51i8q8
---
 addons/portal/portal_view.xml                 | 24 +++++++++----------
 addons/portal_crm/wizard/contact_view.xml     |  2 +-
 addons/portal_event/portal_event_view.xml     |  2 +-
 .../portal_jobs_view.xml                      |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 21641f45bc7..4d67df8e81f 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -87,20 +87,18 @@ the portal's users.
 
             <!-- root menu for portal members (chrooted in this menu) -->
             <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
+                <menuitem name="News" id="portal_company_news"
+                    parent="portal_members_root_menu" sequence="10" action="action_news"/>
+
                 <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                <menuitem name="Our company" id="portal_company" 
-                    parent="menu_portal" sequence="10"/>
-                    <menuitem name="News" id="portal_company_news" 
-                        parent="portal_company" sequence="10" action="action_news"/>
-                
-                <menuitem name="Orders" id="portal_orders" 
-                    parent="menu_portal" sequence="20"/>
-                <menuitem name="Invoices and Payments" id="portal_invoices_payements" 
-                    parent="menu_portal" sequence="30"/>
-                <menuitem name="Projects" id="portal_projects"
-                    parent="menu_portal" sequence="40"/>
-                <menuitem name="After Sale Services" id="portal_after_sales" 
-                    parent="menu_portal" sequence="50"/>
+                    <menuitem name="Orders" id="portal_orders"
+                        parent="menu_portal" sequence="20"/>
+                    <menuitem name="Invoices and Payments" id="portal_invoices_payements"
+                        parent="menu_portal" sequence="30"/>
+                    <menuitem name="Projects" id="portal_projects"
+                        parent="menu_portal" sequence="40"/>
+                    <menuitem name="After Sale Services" id="portal_after_sales"
+                        parent="menu_portal" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 8f44519d7ed..8eee222a12c 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -135,7 +135,7 @@
 
         <!-- attach it to the portal menu -->
         <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
+            parent="portal.portal_members_root_menu" action="action_wizard_contact_us" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 70bb408b32d..6161056444e 100644
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company" 
+        <menuitem name="Events" id="portal_company_events" parent="portal.portal_members_root_menu"
             action="event.action_event_view" sequence="40"/>
 
     </data>
diff --git a/addons/portal_hr_recruitment/portal_jobs_view.xml b/addons/portal_hr_recruitment/portal_jobs_view.xml
index 30976fc1954..57aefa624fd 100644
--- a/addons/portal_hr_recruitment/portal_jobs_view.xml
+++ b/addons/portal_hr_recruitment/portal_jobs_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Jobs" id="portal_company_jobs" 
-            parent="portal.portal_company" action="hr.action_hr_job" 
+        <menuitem name="Jobs" id="portal_company_jobs"
+            parent="portal.portal_members_root_menu" action="hr.action_hr_job"
             sequence="20"/>
 
     </data>