From 6a2f418bfd3662fc405839ea73c718d3f3754d88 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:12 +0200
Subject: [PATCH] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
---
 addons/association/profile_association.xml  | 10 ++++++----
 addons/membership/membership_data.xml       |  8 ++++----
 addons/membership/membership_view.xml       |  2 +-
 addons/point_of_sale/point_of_sale_view.xml | 12 ++++++++----
 addons/purchase/purchase_view.xml           | 15 ++++++++++-----
 addons/sale/sale_view.xml                   |  9 ++++++++-
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index f131fe4f4a9..3936824972b 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            name="Association"
+
+        <!-- Top menu item -->
+        <menuitem name="Association"
             id="base.menu_association"
             icon="terp-calendar"
-            sequence="9"
             web_icon="images/association.png"
-            web_icon_hover="images/association-hover.png"/>
+            web_icon_hover="images/association-hover.png"
+            sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
+
     </data>
 </openerp>
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
index 60c21fc6cf6..14fbb00f9a2 100644
--- a/addons/membership/membership_data.xml
+++ b/addons/membership/membership_data.xml
@@ -5,10 +5,10 @@
     <!--
     Price type
     -->
-        <record model="product.price.type" id="product_price_type_memberprice" >
-            <field name="name">Member Price</field>
-            <field name="field">member_price</field>
-        </record>
+    <record model="product.price.type" id="product_price_type_memberprice" >
+        <field name="name">Member Price</field>
+        <field name="field">member_price</field>
+    </record>
 
     <!--
     Price list
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6a421130544..5eea7170367 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -131,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 7f99599a04b..27fc6bb8637 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -2,11 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
+        <!-- Top menu item -->
+        <menuitem name="PoS Backend"
+            id="menu_point_root"
             icon="terp-partner"
-            groups="group_pos_manager"
             web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"/>
+            web_icon_hover="images/pos-hover.png"
+            groups="group_pos_manager"
+            sequence="140"/>
 
         <record id="categ_others" model="pos.category">
             <field name="name">Others</field>
@@ -749,6 +752,7 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!-- Top menu item -->
         <!--
             right now it's not possible to directly call a client action
             from a menuitem, so we can't use this shortcut element and
@@ -756,7 +760,7 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">160</field>
+            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 144ee741cb5..45728729719 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
-           groups="group_purchase_manager,group_purchase_user"
-           web_icon="images/purchases.png"
-           web_icon_hover="images/purchases-hover.png"/>
-       <menuitem id="menu_procurement_management" name="Purchase"
+
+        <!-- Top menu item -->
+        <menuitem name="Purchases"
+            id="base.menu_purchase_root"
+            icon="terp-purchase"
+            web_icon="images/purchases.png"
+            web_icon_hover="images/purchases-hover.png"
+            groups="group_purchase_manager,group_purchase_user"
+            sequence="40"/>
+        <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
 
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c1a8ea22d8b..37b68a47ef7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
+
+        <!-- Top menu item -->
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            icon="terp-partner"
+            groups="base.group_sale_salesman,base.group_sale_manager"
+            sequence="30"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>