From 02cc08586b06131340b4ab9a0294bce86fedf06c Mon Sep 17 00:00:00 2001
From: Pankaj Joshi <pji@openerp.com>
Date: Mon, 22 Dec 2014 18:44:01 +0530
Subject: [PATCH] [ADD] fa-icon for website applications dropdown menu

---
 addons/account/account_menuitem.xml                   |  1 +
 addons/account/account_view.xml                       |  2 +-
 addons/account_accountant/account_accountant_data.xml |  1 +
 addons/association/profile_association.xml            |  1 +
 addons/fleet/fleet_view.xml                           |  2 +-
 addons/hr/hr_view.xml                                 |  1 +
 addons/knowledge/knowledge_view.xml                   |  1 +
 addons/lunch/lunch_view.xml                           |  2 +-
 addons/mail/mail_thread_view.xml                      |  1 +
 addons/marketing/marketing_view.xml                   |  2 +-
 addons/mrp/mrp_view.xml                               |  1 +
 addons/point_of_sale/point_of_sale_view.xml           |  1 +
 addons/portal/portal_view.xml                         |  1 +
 addons/project/project_view.xml                       |  1 +
 addons/purchase/purchase_view.xml                     |  1 +
 addons/sales_team/sales_team.xml                      |  1 +
 addons/stock/stock_view.xml                           |  1 +
 addons/web/views/webclient_templates.xml              |  1 +
 addons/website/data/data.xml                          |  1 +
 openerp/addons/base/base_menu.xml                     |  2 ++
 openerp/addons/base/ir/ir_ui_menu.py                  |  5 ++---
 openerp/tools/convert.py                              | 10 ++++++++++
 22 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index d1d57db17e8..754dfc3b37c 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -6,6 +6,7 @@
         <menuitem name="Invoicing"
             id="menu_finance"
             groups="group_account_user,group_account_manager,group_account_invoice"
+            icon="fa-usd"
             sequence="50"/>
 
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7bbb850a9da..8e00d4209fd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -258,7 +258,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2" icon="fa-book"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" sequence="1"/>
 
         <act_window
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index e99da0f8a3c..6343559db22 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -4,6 +4,7 @@
         <!-- Rename root menu "Accounting" -->
         <!-- Top menu item -->
         <menuitem name="Accounting"
+            icon="fa-book"
             id="account.menu_finance"/>
         <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config" sequence="3"/>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index eda0f98fdf3..592a18c32f3 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -6,6 +6,7 @@
         <menuitem name="Association"
             id="base.menu_association"
             groups="base.group_user"
+            icon="fa-group"
             sequence="45"/>
         <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/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index e1d66457e88..ea7964443dc 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -175,7 +175,7 @@
             </field>
         </record>
 
-        <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
+        <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user" icon="fa-car"/>
         <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
         <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
         <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c2e7515fc91..7c941f0699a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Human Resources"
             id="menu_hr_root"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"
+            icon="fa-user"
             sequence="90"/>
         <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="60" />
         <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 40b32861e49..8b06b71cb4b 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
             groups="base.group_system,base.group_document_user"
+            icon="fa-magic"
             sequence="116"/>
 
         <menuitem name="Configuration" id="knowledge.menu_document_configuration"
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 0071092e9cd..818ac216be7 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- Top menu item -->
-        <menuitem id='menu_lunch' name='Lunch' sequence="100" groups="group_lunch_user"/>
+        <menuitem id='menu_lunch' name='Lunch' sequence="100" groups="group_lunch_user" icon="fa-cutlery"/>
         <menuitem name="Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" />
         <menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
         <menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index d0c258a580e..4c4547964d1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -132,6 +132,7 @@
         <menuitem name="Messaging"
           id="mail.mail_feeds_main"
           groups="base.group_user"
+          icon="fa-envelope"
           sequence="10"/>
 
         <!-- Left-side menu: Feeds -->
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a5fe0af0cc9..1ab170f29d8 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -4,7 +4,7 @@
 
         <!-- Top menu item -->
         <menuitem name="Marketing" id="base.marketing_menu" sequence="85"
-            groups="base.group_user"/>
+            groups="base.group_user" icon="fa-check-square-o"/>
 
         <!-- Reporting for Marketing -->
         <menuitem name="Marketing" id="base.marketing_reporting_menu" sequence="49"
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d613b104b37..0cd2025490b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Manufacturing"
             id="base.menu_mrp_root"
             groups="group_mrp_user,group_mrp_manager"
+            icon="fa-wrench"
             sequence="80"/>
 
         <menuitem name="Manufacturing"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 3bf95d8c785..a0a01507f30 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Point of Sale"
             id="menu_point_root"
             groups="group_pos_manager,group_pos_user"
+            icon="fa-suitcase"
             sequence="30"/>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index a14a51fb02e..4e0f0df1344 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Portal"
             id="portal_menu"
             groups="base.group_portal"
+            icon="icon-circle-blank"
             sequence="15"/>
 
         <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10" groups="base.group_portal"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7ed6f0593c9..12a3f5cfb49 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Project"
             id="base.menu_main_pm"
             groups="group_project_manager,group_project_user"
+            icon="fa-calendar"
             sequence="40"/>
 
         <menuitem name="Project"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ff5ca396609..1a7cc71c366 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Purchases"
             id="base.menu_purchase_root"
             groups="group_purchase_manager,group_purchase_user"
+            icon="fa-shopping-cart"
             sequence="60"/>
 
         <menuitem id="menu_procurement_management" name="Purchase"
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 3ea69c61a2e..d1f4f3daf05 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -3,6 +3,7 @@
   <data>
         <menuitem name="Sales"
             id="base.menu_base_partner"
+            icon="fa-credit-card"
             groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <!-- Case Teams Salesteams kanban view -->
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 97a5ccf194d..2b2f9794d0c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -6,6 +6,7 @@
         <menuitem name="Warehouse"
             id="menu_stock_root"
             groups="group_stock_manager,group_stock_user"
+            icon="fa-archive"
             sequence="70"/>
 
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 0e4bd883aee..7b39f452d2a 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -190,6 +190,7 @@
                 t-att-data-menu="menu['id']"
                 t-att-data-action-model="menu['action'] and menu['action'].split(',')[0] or ''"
                 t-att-data-action-id="menu['action'] and menu['action'].split(',')[1] or ''">
+                <i t-if="menu.get('icon')" t-attf-class="fa #{menu.get('icon')} fa-lg fa-fw"/>
                 <span class="oe_menu_text">
                     <t t-esc="menu['name']"/>
                 </span>
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index 1c1567a310c..97342561caf 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -85,6 +85,7 @@
 
         <record id="menu_website" model="ir.ui.menu">
             <field name="name">Website</field>
+            <field name="icon">fa-home</field>
             <field name="sequence" eval="400"/>
             <field name="action" ref="action_website"/>
         </record>
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 41c438ff6b7..8686f57defe 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -4,6 +4,7 @@
       <menuitem name="Reporting"
           id="menu_reporting"
           groups="base.group_user"
+          icon="fa-signal"
           sequence="170"/>
           <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
           <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
@@ -11,6 +12,7 @@
       <!-- Top menu item -->
       <menuitem name="Settings"
           id="menu_administration"
+          icon="fa-gear"
           sequence="500"/>
           <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
           <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 002d827fa64..b9acb5961d9 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -358,7 +358,7 @@ class ir_ui_menu(osv.osv):
     @api.cr_uid_context
     @tools.ormcache_context(accepted_keys=('lang',))
     def load_menus_root(self, cr, uid, context=None):
-        fields = ['name', 'sequence', 'parent_id', 'action']
+        fields = ['name', 'sequence', 'parent_id', 'action', 'icon']
         menu_root_ids = self.get_user_roots(cr, uid, context=context)
         menu_roots = self.read(cr, uid, menu_root_ids, fields, context=context) if menu_root_ids else []
         return {
@@ -432,7 +432,7 @@ class ir_ui_menu(osv.osv):
                 "If this field is empty, Odoo will compute visibility based on the related object's read access."),
         'complete_name': fields.function(_get_full_name,
             string='Full Path', type='char', size=128),
-        'icon': fields.selection(tools.icons, 'Icon', size=64),
+        'icon': fields.char('Icon', size=64),
         'icon_pict': fields.function(_get_icon_pict, type='char', size=32),
         'web_icon': fields.char('Web Icon File'),
         'web_icon_hover': fields.char('Web Icon File (hover)'),
@@ -462,7 +462,6 @@ class ir_ui_menu(osv.osv):
         (osv.osv._check_recursion, _rec_message, ['parent_id'])
     ]
     _defaults = {
-        'icon': 'STOCK_OPEN',
         'icon_pict': ('stock', ('STOCK_OPEN', 'ICON_SIZE_MENU')),
         'sequence': 10,
     }
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 560ed3f656a..7d94815be1d 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -560,6 +560,16 @@ form: module.record_id""" % (xml_id,)
                     groups_value.append((4, group_id))
             values['groups_id'] = groups_value
 
+        if not values.get('parent_id'):
+            if rec.get('icon'):
+                values['icon'] = rec.get('icon')
+            else:
+                default_icon = 'fa-cube' # default icon if not specified any for top-level menu
+                try:
+                    values['icon'] = self.pool.get('ir.ui.menu').read(cr,self.uid,res,['icon'])[0].get('icon')
+                except:
+                    values['icon'] = default_icon
+
         pid = self.pool['ir.model.data']._update(cr, self.uid, 'ir.ui.menu', self.module, values, rec_id, noupdate=self.isnoupdate(data_node), mode=self.mode, res_id=res and res[0] or False)
 
         if rec_id and pid: