From 504c544d1cb137ceb4815e396ee7e357316935b9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 2 Jul 2012 18:39:39 +0200
Subject: [PATCH] [IMP] restore the menu just like before

bzr revid: abo@openerp.com-20120702163939-up7j97bnw0n16wn5
---
 addons/portal/portal_view.xml                     | 7 +++++--
 addons/portal_crm/wizard/contact_view.xml         | 4 ++--
 addons/portal_event/portal_event_view.xml         | 2 +-
 addons/portal_hr_recruitment/portal_jobs_view.xml | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 4d67df8e81f..e56dfda67f2 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -87,10 +87,13 @@ 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"
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 8eee222a12c..08b62d06a98 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -22,7 +22,7 @@
                                 <div class="oe_portal_crm_contact_form">
                                     <h1>Get in touch</h1>
                                     <field name="contact_name" placeholder="Name"/>
-                                    <field name="name" placeholder="Company"/>
+                                    <field name="partner_name" placeholder="Company"/>
                                     <field name="email_from" placeholder="Email"/>
                                     <field name="phone" placeholder="Phone"/>
                                     <field name="description" placeholder="Your question"/>
@@ -135,7 +135,7 @@
 
         <!-- attach it to the portal menu -->
         <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_members_root_menu" action="action_wizard_contact_us" sequence="30"/>
+            parent="portal.portal_company" 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 6161056444e..8b1f21bbef0 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_members_root_menu"
+        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
             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 57aefa624fd..e3e9cffb063 100644
--- a/addons/portal_hr_recruitment/portal_jobs_view.xml
+++ b/addons/portal_hr_recruitment/portal_jobs_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem name="Jobs" id="portal_company_jobs"
-            parent="portal.portal_members_root_menu" action="hr.action_hr_job"
+            parent="portal.portal_company" action="hr.action_hr_job"
             sequence="20"/>
 
     </data>