From 46b4558275aabfb2be9d9efc87a9f85a1e0a1c9c Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 17 Apr 2012 14:10:51 +0200
Subject: [PATCH] [IMP] change position of custommer portal and correct the
 menuitems

bzr revid: mva@openerp.com-20120417121051-52cv5aacxz86md7f
---
 addons/portal/portal_view.xml                 |  3 ---
 .../portal_customer/portal_customer_menu.xml  | 24 +++++++------------
 .../portal_customer_claim_view.xml            |  6 +----
 .../portal_customer_event_view.xml            |  4 ++--
 .../portal_customer_issue_view.xml            |  4 ++--
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index c116c398497..a6a780fdf16 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -69,8 +69,5 @@ the portal's users.
                 </page>
             </field>
         </record>
-        
-        <menuitem name="Customer Portal" id="customer_portal"/>
-        
     </data>
 </openerp>
diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml
index 9a8486cd7a1..75e606ed3f9 100644
--- a/addons/portal_customer/portal_customer_menu.xml
+++ b/addons/portal_customer/portal_customer_menu.xml
@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem name="Address Book" id="customer_portal_address_book_main" parent="portal.customer_portal" groups="group_sales_portal"/>
+    <!-- warning some menu is visible with another module with an auto_install -->
+      <menuitem name="Customer Portal" id="customer_portal"/>      
+        <menuitem name="Address Book" id="customer_portal_address_book_main" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Contacts" id="customer_portal_address_book" parent="customer_portal_address_book_main" action="base.action_partner_form"/>
 
-        <menuitem name="Track Orders" id="customer_portal_track_orders" parent="portal.customer_portal" groups="group_sales_portal"/>
+        <menuitem name="Track Orders" id="customer_portal_track_orders" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders" action="sale.action_order_tree5"/>
             <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders" action="sale.action_order_form"/>
             <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders" action="action_picking_tree"/>
-            <!--<menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>-->
     
-        <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="portal.customer_portal" groups="group_sales_portal"/>
+        <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements" action="account.action_invoice_tree1"/>
             <menuitem name="Payments" id="customer_portal_payments" parent="customer_portal_invoice_payements" action="account_voucher.action_vendor_receipt"/>
         
-        <menuitem name="Services" id="customer_portal_services" parent="portal.customer_portal" groups="group_sales_portal"/>
-      <!--      <menuitem name="Events" id="customer_portal_events" parent="customer_portal_services"/>-->
+        <menuitem name="Services" id="customer_portal_services" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services" action="product_normal_action"/>
-      <!--      <menuitem name="Tasks" id="customer_portal_tasks" parent="customer_portal_services"/>-->
   
-        <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="portal.customer_portal" groups="group_sales_portal"/>
- <!--   
-            <menuitem name="Issues" id="customer_portal_issues" parent="customer_portal_after_sales"/>
-            <menuitem name="Claims" id="customer_portal_claims" parent="customer_portal_after_sales"/>
-            <menuitem name="Feedback" id="customer_portal_feedback" parent="customer_portal_after_sales"/>
--->
-        <menuitem name="Contact Us" id="customer_portal_contact" parent="portal.customer_portal" groups="group_sales_portal"/>
+        <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="customer_portal" groups="group_sales_portal"/>
+        
+        <menuitem name="Contact Us" id="customer_portal_contact" parent="customer_portal" groups="group_sales_portal"/>
         
         <!-- Hiding Menus which are not required for Customer Portal user -->
                  
diff --git a/addons/portal_customer_claim/portal_customer_claim_view.xml b/addons/portal_customer_claim/portal_customer_claim_view.xml
index c282beacaa2..3cf7e6c7be8 100644
--- a/addons/portal_customer_claim/portal_customer_claim_view.xml
+++ b/addons/portal_customer_claim/portal_customer_claim_view.xml
@@ -1,9 +1,5 @@
 <openerp>
     <data>
-        <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="portal.customer_portal" groups="group_sales_portal"/>
-        <menuitem name="Issues" id="customer_portal_issues" parent="customer_portal_after_sales"/>
-        <menuitem name="Claims" id="customer_portal_claims" parent="customer_portal_after_sales" action="crm_claim_categ_action"/>
-        <menuitem name="Feedback" id="customer_portal_feedback" parent="customer_portal_after_sales"/>
-
+        <menuitem name="Claims" id="customer_portal_claims" parent="portal_customer.customer_portal_after_sales" action="crm_claim.crm_claim_categ_action"/>
     </data>
 </openerp>
diff --git a/addons/portal_customer_event/portal_customer_event_view.xml b/addons/portal_customer_event/portal_customer_event_view.xml
index 61da8d058ba..28eb448822b 100644
--- a/addons/portal_customer_event/portal_customer_event_view.xml
+++ b/addons/portal_customer_event/portal_customer_event_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>
-        <menuitem name="Events" id="customer_portal_events" parent="customer_portal_services"/>
+        <menuitem name="Registration" id="customer_portal_registration" parent="portal_customer.customer_portal_track_orders"/>
+        <menuitem name="Events" id="customer_portal_events" parent="portal_customer.customer_portal_services"/>
     </data>
 </openerp>
diff --git a/addons/portal_customer_issue/portal_customer_issue_view.xml b/addons/portal_customer_issue/portal_customer_issue_view.xml
index bc4a63aa51f..b826439339f 100644
--- a/addons/portal_customer_issue/portal_customer_issue_view.xml
+++ b/addons/portal_customer_issue/portal_customer_issue_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem name="Tasks" id="customer_portal_tasks" parent="customer_portal_services"/>
-        <menuitem name="Issues" id="customer_portal_issues" parent="customer_portal_after_sales"/>
+        <menuitem name="Tasks" id="customer_portal_tasks" parent="portal_customer.customer_portal_services"/>
+        <menuitem name="Issues" id="customer_portal_issues" parent="portal_customer.customer_portal_after_sales"/>
     </data>
 </openerp>