From 111e16801cc096536e910571cdb1a58c2c6dfdc4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 29 May 2012 12:01:12 +0200
Subject: [PATCH] [IMP] update the menu organization regarding the new specs

bzr revid: abo@openerp.com-20120529100112-pni427sm7a77azj2
---
 addons/portal/portal_view.xml                 | 22 +++++++++++++------
 addons/portal_claim/portal_claim_view.xml     |  3 ++-
 addons/portal_crm/wizard/contact_view.xml     |  4 ++--
 addons/portal_event/portal_event_view.xml     |  8 +++----
 .../portal_feedback/portal_feedback_view.xml  |  5 ++++-
 addons/portal_issue/portal_issue_view.xml     |  6 +++--
 addons/portal_sale/portal_sale_view.xml       | 13 +++++------
 7 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index d7326de9758..5d21de5d738 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -92,7 +92,8 @@ 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="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                <menuitem name="Our company" id="portal_company" parent="menu_portal"/>
+                <menuitem name="Our company" id="portal_company" 
+                    parent="menu_portal" sequence="10"/>
                     <!-- 
                     right now it's not possible to directly call a client action 
                     from a menuitem, so we can't use this shortcut element and 
@@ -102,13 +103,20 @@ the portal's users.
                         <field name="name">News</field>
                         <field name="action" ref="action_news"/>
                         <field name="parent_id" ref="portal_company"/>
+                        <field name="sequence">10</field>
                     </record>
-                    <menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
-                    <menuitem name="About" id="portal_company_about" parent="portal_company" action="action_about"/>
-                <menuitem name="Orders" id="portal_track_orders" parent="menu_portal"/>
-                <menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="menu_portal"/>
-                <menuitem name="Services" id="portal_services" parent="menu_portal"/>
-                <menuitem name="After Sale Services" id="portal_after_sales" parent="menu_portal"/>
+                    <menuitem name="Jobs" id="portal_company_jobs" 
+                        parent="portal_company" action="action_about" sequence="20"/>
+                    <menuitem name="About" id="portal_company_about" 
+                        parent="portal_company" action="action_about" 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_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml
index 62c09085846..ce1efc10f70 100644
--- a/addons/portal_claim/portal_claim_view.xml
+++ b/addons/portal_claim/portal_claim_view.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Claims" id="portal_after_sales_claims" parent="portal.portal_after_sales" action="crm_claim.crm_case_categ_claim0"/>
+        <menuitem name="Claims" id="portal_after_sales_claims" parent="portal.portal_after_sales" 
+            action="crm_claim.crm_case_categ_claim0" sequence="10"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index bea5764b5da..bb183d72d2c 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -50,8 +50,8 @@
         </record>
 
         <!-- attach it to the portal menu -->
-        <menuitem name="Contact Us" id="portal_company_contact" 
-            parent="portal.portal_company" action="action_wizard_contact_us"/>
+        <menuitem name="Contact Us" id="portal_company_contact"
+            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 39ad41856a7..70bb408b32d 100644
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-        <menuitem name="Registration" id="portal_track_orders_registration" parent="portal.portal_track_orders" action="event.action_registration"/>
-        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company" action="event.action_event_view"  />
-    
+
+        <menuitem name="Events" id="portal_company_events" parent="portal.portal_company" 
+            action="event.action_event_view" sequence="40"/>
+
     </data>
 </openerp>
diff --git a/addons/portal_feedback/portal_feedback_view.xml b/addons/portal_feedback/portal_feedback_view.xml
index a65f5f15138..d0ad8403b03 100644
--- a/addons/portal_feedback/portal_feedback_view.xml
+++ b/addons/portal_feedback/portal_feedback_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Feedback" id="portal_after_sales_feedback" parent="portal.portal_after_sales" action="survey.action_survey_form1"/>
+
+        <menuitem name="Feedback" id="portal_after_sales_feedback" 
+            parent="portal.portal_after_sales" action="survey.action_survey_form1" sequence="20"/>
+
     </data>
 </openerp>
diff --git a/addons/portal_issue/portal_issue_view.xml b/addons/portal_issue/portal_issue_view.xml
index 03b128913ff..dcc79ae78d9 100644
--- a/addons/portal_issue/portal_issue_view.xml
+++ b/addons/portal_issue/portal_issue_view.xml
@@ -2,8 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem name="Tasks" id="portal_services_tasks" parent="portal.portal_services" action="project.action_view_task"/>
-        <menuitem name="Issues" id="portal_after_sales_issues" parent="portal.portal_after_sales" action="project_issue.project_issue_categ_act0"/>
+        <menuitem name="Issues" id="portal_after_sales_issues" parent="portal.portal_projects"
+            action="project_issue.project_issue_categ_act0" sequence="10"/>
+        <menuitem name="Tasks" id="portal_services_tasks" parent="portal.portal_projects"
+            action="project.action_view_task" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index d4b50daf7b6..8a70bb1c7f3 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -25,14 +25,13 @@
             <field name="help">You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
-        <menuitem name="Quotation" id="portal_quotation" parent="portal.portal_track_orders" action="sale.action_order_tree5"/>
-        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_track_orders" action="sale.action_order_form"/>
-        <menuitem name="Delivery Orders" id="portal_delivery" parent="portal.portal_track_orders" action="action_picking_tree"/>
+        <menuitem name="Quotation" id="portal_quotation" parent="portal.portal_orders" action="sale.action_order_tree5"/>
+        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders" action="sale.action_order_form"/>
+        <menuitem name="Delivery Orders" id="portal_delivery" parent="portal.portal_orders" action="action_picking_tree"/>
+        <menuitem name="Products" id="portal_products" parent="portal.portal_orders" action="product_normal_action"/>
 
-        <menuitem name="Invoice" id="portal_invoice" parent="portal.portal_invoice_payements" action="account.action_invoice_tree1"/>
-        <menuitem name="Payments" id="portal_payments" parent="portal.portal_invoice_payements" action="account_voucher.action_vendor_receipt"/>
-
-        <menuitem name="Products" id="portal_products" parent="portal.portal_services" action="product_normal_action"/>
+        <menuitem name="Invoice" id="portal_invoices" parent="portal.portal_invoices_payements" action="account.action_invoice_tree1" sequence="10"/>
+        <menuitem name="Refund/Payments" id="portal_payments" parent="portal.portal_invoices_payements" action="account_voucher.action_vendor_receipt" sequence="20"/>
 
     </data>
 </openerp>