From 391a35389c42b81a5306f8954cace8a235a763bd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:14:03 +0200
Subject: [PATCH] [IMP] remove deprecated attributes 'icon', 'web_icon' and
 'web_icon_hover' from top menu items

bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
---
 addons/account/account_menuitem.xml         |  3 ---
 addons/association/profile_association.xml  |  3 ---
 addons/base_tools/tools_view.xml            |  3 ---
 addons/crm_claim/crm_claim_menu.xml         |  3 ---
 addons/crm_helpdesk/crm_helpdesk_menu.xml   |  3 ---
 addons/hr/hr_view.xml                       |  3 ---
 addons/knowledge/knowledge_view.xml         |  3 ---
 addons/mail/mail_thread_view.xml            |  2 --
 addons/marketing/marketing_view.xml         |  3 ---
 addons/mrp/mrp_view.xml                     |  3 ---
 addons/point_of_sale/point_of_sale_view.xml | 10 ++--------
 addons/project/project_view.xml             |  3 ---
 addons/purchase/purchase_view.xml           |  3 ---
 addons/sale/sale_view.xml                   |  1 -
 addons/stock/stock_view.xml                 |  3 ---
 addons/wiki/wiki_view.xml                   |  1 -
 16 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 69c4f3a7307..9ac6f98661c 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Invoicing"
             id="menu_finance"
-            icon="terp-account"
-            web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"
             groups="group_account_user,group_account_manager,group_account_invoice"
             sequence="100"/>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 3936824972b..099a6f1ac97 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Association"
             id="base.menu_association"
-            icon="terp-calendar"
-            web_icon="images/association.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"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 3002931cf17..fbe0e16e31a 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -5,9 +5,6 @@
         <!-- 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>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bba8e6556ee..46f8760387a 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="base.group_sale_salesman"
             sequence="90"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 9557d5e1d45..393428e091e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 521ebafdd97..0706da45c86 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -5,9 +5,6 @@
         <!-- 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"
             sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 5ed5256b0e6..9acba0f4b43 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -5,9 +5,6 @@
         <!-- 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"/>
 
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 06cb8189915..f07e1e467ee 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -5,8 +5,6 @@
         <!-- 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"/>
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index d478b9f6479..b4c8a295241 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Marketing"
             id="base.marketing_menu"
-            icon="terp-crm"
-            web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             sequence="120"/>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 72cd8b5c1ff..943fb0556ec 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,9 +5,6 @@
         <!-- 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"
             groups="group_mrp_user,group_mrp_manager"
             sequence="60"/>
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 27fc6bb8637..6b1b9132344 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="PoS Backend"
             id="menu_point_root"
-            icon="terp-partner"
-            web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"
             groups="group_pos_manager"
             sequence="140"/>
 
@@ -760,14 +757,11 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
+            <field name="groups_id" eval="[(6, 0, [ref('point_of_sale.group_pos_manager'), ref('point_of_sale.group_pos_user')])]"/>
+            <field name="sequence">150</field>
         </record>
 
-        <!-- use menuitem to add web_icon and web_icon_hover above -->
-        <menuitem id="menu_point_root_touchscreen"
-            web_icon="images/pos.png" web_icon_hover="images/pos-hover.png" groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"/>
-
         <record model="ir.ui.view" id="view_pos_config_form">
             <field name="name">pos.config.form.view</field>
             <field name="model">pos.config</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9edd731acf2..94836221265 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="group_project_manager,group_project_user"
             sequence="90"/>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 45728729719..ebc7df729b5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,9 +5,6 @@
         <!-- 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"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 62145ad064b..0d000f8ec30 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -5,7 +5,6 @@
         <!-- 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"/>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 77f4bc33147..b2d45196703 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -5,9 +5,6 @@
         <!-- 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"/>
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1041644f3b8..c88255a073a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -5,7 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
-            icon="terp-stock"
             sequence="130"/>
 
         <menuitem name="Configuration"