From 552f5f8ef4b97bdd030f59f96763c821a36f5287 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 12:51:13 +0200
Subject: [PATCH 1/2] [FIX] add a missing dependence

bzr revid: abo@openerp.com-20120821105113-u7bty92d2lfea8q5
---
 addons/portal/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 84a3b562133..84091a54347 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -25,6 +25,7 @@
     'depends' : [
         'base',
         'share',
+        'auth_anonymous',
         'auth_signup',
     ],
     'author' : 'OpenERP SA',
@@ -45,8 +46,8 @@ very handy when used in combination with the module 'share'.
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
-        'portal_view.xml',
         'portal_data.xml',
+        'portal_view.xml',
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],

From c06c6930718807781bc45052d2bea6cd0765abbb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 13:01:35 +0200
Subject: [PATCH 2/2] [IMP] organization of views and data

bzr revid: abo@openerp.com-20120821110135-12mud78ddjwhmd8c
---
 addons/portal/portal_data.xml | 23 ++---------------------
 addons/portal/portal_view.xml | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 58f2fc3e9d4..ddfb4cc6729 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
@@ -10,7 +10,7 @@
 
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+            <field name="name">Company's news</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -32,24 +32,5 @@
             <field name="view_mode">form</field>
         </record>
 
-        <!-- Top menu item -->
-        <menuitem name="Portal"
-            id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
-            sequence="20"/>
-
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 831db25e26a..dd720d448ef 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,6 +2,25 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            sequence="20"/>
+
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>