[IMP] break depedencies between portal_customer and sale. refactor the portal menu following the pad's specifications.

bzr revid: abo@openerp.com-20120509101417-lacqi8xs9e1p7bco

9 files changed, 37 insertions, 31 deletions

diff --git a/addons/portal_customer/__openerp__.py b/addons/portal_customer/__openerp__.py
index 23d86d29a56..6b08e2e6021 100644
--- a/addons/portal_customer/__openerp__.py
+++ b/addons/portal_customer/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name' : "Customer Portal",
     'version' : "1.0",
-    'depends' : ["sale","portal"],
+    'depends' : ["portal"],
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """
diff --git a/addons/portal_customer/board_portal_customer_view.xml b/addons/portal_customer/board_portal_customer_view.xml
index b93736c7fb7..26e199900b6 100644
--- a/addons/portal_customer/board_portal_customer_view.xml
+++ b/addons/portal_customer/board_portal_customer_view.xml
@@ -24,7 +24,7 @@
                 </form>
             </field>
         </record>
-         
+        
         <record id="open_customer_portal" model="ir.actions.act_window">
             <field name="name">Customer Portal Dashboard</field>
             <field name="res_model">board.board</field>
@@ -34,9 +34,5 @@
             <field name="view_id" ref="board_customer_portal_form"/>
         </record>
         
-        <menuitem
-            id="portal_customer.customer_portal" action="open_customer_portal"
-            name="Customer Portal" groups="portal_customer.group_sales_portal"/>
-        
     </data>
 </openerp>
diff --git a/addons/portal_customer/portal_customer_demo.xml b/addons/portal_customer/portal_customer_demo.xml
index 2c20149c4ca..91de021a72f 100644
--- a/addons/portal_customer/portal_customer_demo.xml
+++ b/addons/portal_customer/portal_customer_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <record id="Customer_demo" model="res.users">
-            <field name="name">demo_customer_portal</field>
+            <field name="name">Demo Portal User</field>
             <field name="login">test</field>
             <field name="password">test</field>
             <field name="groups_id" eval="[(6,0,[ref('group_sales_portal')])]"/>
diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml
index 9484c4bcc17..b65e280cb7b 100644
--- a/addons/portal_customer/portal_customer_menu.xml
+++ b/addons/portal_customer/portal_customer_menu.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- 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="Contact Us" id="customer_portal_contact" parent="customer_portal" groups="group_sales_portal"/>
-          <menuitem name="Contact Us" id="customer_portal_contact1" parent="customer_portal_contact" groups="group_sales_portal" action="action_contact_us"/>
+        <menuitem id="portal" action="open_customer_portal" name="Customer Portal" groups="portal_customer.group_sales_portal"/>
+        
+          <menuitem name="Track Orders" id="portal_track_orders" parent="portal" groups="portal_customer.group_sales_portal"/>
+          <menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="portal" groups="portal_customer.group_sales_portal"/>
+          <menuitem name="Services" id="portal_services" parent="portal" groups="portal_customer.group_sales_portal"/>
+          <menuitem name="After Sale Services" id="portal_after_sales" parent="portal" groups="portal_customer.group_sales_portal"/>
+          <menuitem name="Our company" id="portal_company" parent="portal"/>
+              <menuitem name="News" id="portal_company_news" parent="portal_company"/>
+              <menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
+              <menuitem name="Address Book" id="portal_company_address_book" parent="portal_company" action="base.action_partner_form"/>
+              <menuitem name="Contact Us" id="portal_company_contact" parent="portal_company" groups="group_sales_portal" action="action_contact_us"/>
+
     </data>
 </openerp>
diff --git a/addons/portal_customer_claim/portal_customer_claim_view.xml b/addons/portal_customer_claim/portal_customer_claim_view.xml
index c6697a5df24..83a400794b4 100644
--- a/addons/portal_customer_claim/portal_customer_claim_view.xml
+++ b/addons/portal_customer_claim/portal_customer_claim_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Claims" id="customer_portal_claims1" parent="portal_customer.customer_portal_after_sales" action="crm_claim.crm_case_categ_claim0"/>
+    
+        <menuitem name="Claims" id="portal_after_sales_claims" parent="portal_customer.portal_after_sales" action="crm_claim.crm_case_categ_claim0"/>
+    
     </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 9ffcb95d9b2..dd6378412c5 100644
--- a/addons/portal_customer_event/portal_customer_event_view.xml
+++ b/addons/portal_customer_event/portal_customer_event_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem name="Registration" id="customer_portal_registration" parent="portal_customer.customer_portal_track_orders" action="event.action_registration"/>
-        <menuitem name="Events" id="customer_portal_events" parent="portal_customer.customer_portal_services" action="event.action_event_view"  />
-        <menuitem name="Events" id="event.menu_event_event" action="event.action_event_view" parent="base.menu_event_main" groups="base.group_user"/>
+    
+        <menuitem name="Registration" id="portal_track_orders_registration" parent="portal_customer.portal_track_orders" action="event.action_registration"/>
+        <menuitem name="Events" id="portal_company_events" parent="portal_customer.portal_company" action="event.action_event_view"  />
+    
     </data>
 </openerp>
diff --git a/addons/portal_customer_feedback/portal_customer_feedback_view.xml b/addons/portal_customer_feedback/portal_customer_feedback_view.xml
index 3ae9a96ad57..33943885d5d 100644
--- a/addons/portal_customer_feedback/portal_customer_feedback_view.xml
+++ b/addons/portal_customer_feedback/portal_customer_feedback_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Feedback" id="customer_portal_feedback" parent="portal_customer.customer_portal_after_sales" action="survey.action_survey_form1"/>
+        <menuitem name="Feedback" id="portal_after_sales_feedback" parent="portal_customer.portal_after_sales" action="survey.action_survey_form1"/>
     </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 f9cce90c0d3..490068bf561 100644
--- a/addons/portal_customer_issue/portal_customer_issue_view.xml
+++ b/addons/portal_customer_issue/portal_customer_issue_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem name="Tasks" id="customer_portal_tasks" parent="portal_customer.customer_portal_services" action="project.action_view_task"/>
-        <menuitem name="Issues" id="customer_portal_issues" parent="portal_customer.customer_portal_after_sales" action="project_issue.project_issue_categ_act0"/>
+    
+        <menuitem name="Tasks" id="portal_services_tasks" parent="portal_customer.portal_services" action="project.action_view_task"/>
+        <menuitem name="Issues" id="portal_after_sales_issues" parent="portal_customer.portal_after_sales" action="project_issue.project_issue_categ_act0"/>
+    
     </data>
 </openerp>
diff --git a/addons/portal_customer_sale/portal_customer_sale_view.xml b/addons/portal_customer_sale/portal_customer_sale_view.xml
index 9e73f759f55..b128a03e91d 100644
--- a/addons/portal_customer_sale/portal_customer_sale_view.xml
+++ b/addons/portal_customer_sale/portal_customer_sale_view.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem name="Track Orders" id="customer_portal_track_orders" parent="portal_customer.customer_portal" groups="portal_customer.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="Invoice and Payments" id="customer_portal_invoice_payements" parent="portal_customer.customer_portal" groups="portal_customer.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.customer_portal" groups="portal_customer.group_sales_portal"/>
-            <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services" action="product_normal_action"/>
-        <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="portal_customer.customer_portal" groups="portal_customer.group_sales_portal"/>
-
         <record id="action_picking_tree" model="ir.actions.act_window">
             <field name="name">Delivery Orders</field>
             <field name="res_model">stock.picking</field>
@@ -36,5 +25,14 @@
             <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_customer.portal_track_orders" action="sale.action_order_tree5"/>
+        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal_customer.portal_track_orders" action="sale.action_order_form"/>
+        <menuitem name="Delivery Orders" id="portal_delivery" parent="portal_customer.portal_track_orders" action="action_picking_tree"/>
+
+        <menuitem name="Invoice" id="portal_invoice" parent="portal_customer.portal_invoice_payements" action="account.action_invoice_tree1"/>
+        <menuitem name="Payments" id="portal_payments" parent="portal_customer.portal_invoice_payements" action="account_voucher.action_vendor_receipt"/>
+
+        <menuitem name="Products" id="portal_products" parent="portal_customer.portal_services" action="product_normal_action"/>
+
     </data>
 </openerp>