From c7f4b5ead1edbd30cd0c43fc3fec8c45327e452a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:34:29 +0200
Subject: [PATCH] [IMP] format all the top menu items' XML the same way,
 prefixed by the comment '<- Top menu item -->', making them easier to spot
 also fix some identation

bzr revid: abo@openerp.com-20120718103429-98gl4oe0hkmmf35k
---
 addons/account/account_menuitem.xml | 11 ++++--
 addons/base_tools/tools_view.xml    | 11 +++---
 addons/event/event_view.xml         |  5 ++-
 addons/hr/hr_view.xml               |  8 +++--
 addons/knowledge/knowledge_view.xml | 24 ++++++++-----
 addons/mail/mail_thread_view.xml    | 13 ++++---
 addons/marketing/marketing_view.xml |  9 ++---
 addons/mrp/mrp_view.xml             | 15 +++++---
 addons/project/project_view.xml     | 54 +++++++++++++++--------------
 addons/purchase/stock_view.xml      |  8 ++---
 addons/sale/sale_view.xml           |  1 +
 addons/stock/stock_view.xml         | 13 ++++---
 12 files changed, 106 insertions(+), 66 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 401f77c9f94..69c4f3a7307 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
-            groups="group_account_user,group_account_manager,group_account_invoice"
+        <!-- Top menu item -->
+        <menuitem name="Invoicing"
+            id="menu_finance"
+            icon="terp-account"
             web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"/>
+            web_icon_hover="images/accounting-hover.png"
+            groups="group_account_user,group_account_manager,group_account_invoice"
+            sequence="100"/>
+
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 0541e452620..3002931cf17 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -2,10 +2,13 @@
 <openerp>
     <data>
 
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="160"
-                    web_icon="images/tools.png"
-                    web_icon_hover="images/tools-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Tools"
+            id="base.menu_tools"
+            icon="STOCK_PREFERENCES"
+            web_icon="images/tools.png"
+            web_icon_hover="images/tools-hover.png"
+            sequence="160"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 11e2322a0d8..890cb1be9e6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -10,7 +10,10 @@
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
 
-        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <!-- Top menu item -->
+        <menuitem name="Events"
+            id="event_main_menu"
+            sequence="80"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
         <!-- EVENTS  -->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6e798449fba..521ebafdd97 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,10 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
+        <!-- Top menu item -->
+        <menuitem name="Human Resources"
+            id="menu_hr_root"
+            icon="terp-hr"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
-            groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user"
+            sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index b2eefd90cce..5f36ad110c6 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,13 +1,19 @@
 <openerp>
-<data>
-    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="130" groups="base.group_system,base.group_document_user"
-              web_icon="images/knowledge.png"
-              web_icon_hover="images/knowledge-hover.png"/>
-    <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+    <data>
 
-    <menuitem id="knowledge.menu_document2" name="Collaborative Content"
-       parent="knowledge.menu_document" />
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            icon="terp-stock"
+            web_icon="images/knowledge.png"
+            web_icon_hover="images/knowledge-hover.png"
+            groups="base.group_system,base.group_document_user"
+            sequence="130"/>
 
-</data>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+           parent="knowledge.menu_document"/>
+
+    </data>
 </openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f15141d3711..06cb8189915 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -2,11 +2,13 @@
 <openerp>
     <data>
 
-        <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
-            web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png"
-            groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Feeds"
+          id="mail_feeds_main"
+          web_icon="static/src/img/feeds.png"
+          web_icon_hover="static/src/img/feeds-hover.png"
+          groups="base.group_user"
+          sequence="10"/>
 
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
@@ -22,5 +24,6 @@
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index e9ee0a11e97..d478b9f6479 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,13 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Marketing"
-            icon="terp-crm"
             id="base.marketing_menu"
-            sequence="120"
-            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            icon="terp-crm"
             web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"/>
+            web_icon_hover="images/marketing-hover.png"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            sequence="120"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ac6c82f6642..72cd8b5c1ff 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,12 +2,19 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="60"
+        <!-- Top menu item -->
+        <menuitem name="Manufacturing"
+            id="base.menu_mrp_root"
+            icon="terp-mrp"
             web_icon="images/manufacturing.png"
-            web_icon_hover="images/manufacturing-hover.png"/>
+            web_icon_hover="images/manufacturing-hover.png"
+            groups="group_mrp_user,group_mrp_manager"
+            sequence="60"/>
 
-        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem name="Manufacturing"
+            id="menu_mrp_manufacturing"
+            parent="base.menu_mrp_root"
+            sequence="1"/>
 
         <menuitem name="Master Data"
             id="menu_mrp_bom"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 145af6f34ad..9edd731acf2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,12 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Project"
-            icon="terp-project" id="base.menu_main_pm"
-            sequence="90"
-            groups="group_project_manager,group_project_user"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            groups="group_project_manager,group_project_user"
+            sequence="90"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
@@ -156,31 +158,31 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group>
-                       <field name="complete_name" string="Project Name"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-mail-message-new"
+                    <group>
+                        <field name="complete_name" string="Project Name"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
                            name="needaction_pending"
                            domain="[('needaction_pending','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
-                       <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
-                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       <separator orientation="vertical"/>
-                       <field name="user_id" string="Project Manager"/>
-                       <field name="partner_id" string="Partner"/>
-                   </group>
-                   <newline />
-                   <group expand="0" string="Group By...">
-                       <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                   </group>
-               </search>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
+                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
+                        <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
+                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                        <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Project Manager"/>
+                        <field name="partner_id" string="Partner"/>
+                    </group>
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f9d6239e0a5..d96d9124e0b 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,7 +11,7 @@
                     <field name="purchase_line_id" colspan="2" />
                 </xpath>
             </field>
-        </record>      
+        </record>
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
@@ -35,7 +35,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <!-- Picking to Invoice -->
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
@@ -86,7 +86,7 @@
             <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
         </record>
-        
+
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
@@ -102,7 +102,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 37b68a47ef7..62145ad064b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -8,6 +8,7 @@
             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"/>
 
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 38b5d677c6b..b8cda122e6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="50"
-                  web_icon="images/warehouse.png"
-                  web_icon_hover="images/warehouse-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Warehouse"
+            id="menu_stock_root"
+            icon="terp-stock"
+            web_icon="images/warehouse.png"
+            web_icon_hover="images/warehouse-hover.png"
+            groups="group_stock_manager,group_stock_user"
+            sequence="50"/>
+
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>