diff --git a/addons/account/static/description/icon.png b/addons/account/static/description/icon.png index afad1331e2e..cbcd465e407 100644 Binary files a/addons/account/static/description/icon.png and b/addons/account/static/description/icon.png differ diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml index b8d055271d1..e47367a6cb1 100644 --- a/addons/account/views/account_menuitem.xml +++ b/addons/account/views/account_menuitem.xml @@ -7,6 +7,7 @@ id="menu_finance" groups="group_account_user,group_account_manager,group_account_invoice" icon="fa-usd" + web_icon="account,static/description/icon.png" sequence="40"/> diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index f5f81f3679c..b810bdd067c 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -5,6 +5,7 @@ diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml index 8b495e05afc..812314118ac 100644 --- a/addons/calendar/calendar_view.xml +++ b/addons/calendar/calendar_view.xml @@ -333,7 +333,7 @@ - + diff --git a/addons/calendar/static/description/icon.png b/addons/calendar/static/description/icon.png index f612cd9ea4b..88c9d6622b3 100644 Binary files a/addons/calendar/static/description/icon.png and b/addons/calendar/static/description/icon.png differ diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index dbffca73859..71de931b20d 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -10,6 +10,7 @@ - + diff --git a/addons/event/static/description/icon.png b/addons/event/static/description/icon.png index b6db3267f3f..7a9b6a2c166 100644 Binary files a/addons/event/static/description/icon.png and b/addons/event/static/description/icon.png differ diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 433c9dafc45..6515880c676 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -175,7 +175,7 @@ - + diff --git a/addons/fleet/static/description/icon.png b/addons/fleet/static/description/icon.png index 5b41e43c5bd..ae020185dfb 100644 Binary files a/addons/fleet/static/description/icon.png and b/addons/fleet/static/description/icon.png differ diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index c3d33d0e6c7..582d23ec6da 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -7,6 +7,7 @@ id="menu_hr_root" groups="base.group_hr_manager,base.group_hr_user,base.group_user" icon="fa-user" + web_icon="hr,static/description/icon.png" sequence="75"/> diff --git a/addons/hr/static/description/icon.png b/addons/hr/static/description/icon.png index 742f3e53e67..59289fc0a51 100644 Binary files a/addons/hr/static/description/icon.png and b/addons/hr/static/description/icon.png differ diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 82bf78f02d5..e25885e81df 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -120,10 +120,10 @@ - + - + diff --git a/addons/hr_attendance/static/description/icon.png b/addons/hr_attendance/static/description/icon.png new file mode 100644 index 00000000000..2d09c06ead9 Binary files /dev/null and b/addons/hr_attendance/static/description/icon.png differ diff --git a/addons/hr_equipment/static/description/icon.png b/addons/hr_equipment/static/description/icon.png index 53055cf085c..c539c0b853d 100644 Binary files a/addons/hr_equipment/static/description/icon.png and b/addons/hr_equipment/static/description/icon.png differ diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml index 5f2863f35b9..eecb9a6e3ad 100644 --- a/addons/hr_equipment/views/hr_equipment_views.xml +++ b/addons/hr_equipment/views/hr_equipment_views.xml @@ -521,6 +521,7 @@ {'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id} - + - + - + diff --git a/addons/hr_holidays/static/description/icon.png b/addons/hr_holidays/static/description/icon.png index 1d02a2f830b..b8140860417 100644 Binary files a/addons/hr_holidays/static/description/icon.png and b/addons/hr_holidays/static/description/icon.png differ diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 0874c6e61b1..cc5e8726494 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -3,7 +3,7 @@ - + diff --git a/addons/hr_payroll/static/description/icon.png b/addons/hr_payroll/static/description/icon.png index c2851619d7c..993eded0afa 100644 Binary files a/addons/hr_payroll/static/description/icon.png and b/addons/hr_payroll/static/description/icon.png differ diff --git a/addons/hr_recruitment/static/description/icon.png b/addons/hr_recruitment/static/description/icon.png index abbc2aef090..c4a1c232e23 100644 Binary files a/addons/hr_recruitment/static/description/icon.png and b/addons/hr_recruitment/static/description/icon.png differ diff --git a/addons/im_livechat/static/description/icon.png b/addons/im_livechat/static/description/icon.png index 07d2503ce4e..f342b21c93d 100644 Binary files a/addons/im_livechat/static/description/icon.png and b/addons/im_livechat/static/description/icon.png differ diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml index 34d5bb66696..60cd799b15c 100644 --- a/addons/im_livechat/views/im_livechat_channel_views.xml +++ b/addons/im_livechat/views/im_livechat_channel_views.xml @@ -182,6 +182,7 @@ diff --git a/addons/lunch/static/description/icon.png b/addons/lunch/static/description/icon.png index 0dda33edd50..eebfdd782db 100644 Binary files a/addons/lunch/static/description/icon.png and b/addons/lunch/static/description/icon.png differ diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index 313c3078597..f92e9f42eae 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -1,7 +1,7 @@ - + diff --git a/addons/mail/static/description/icon.png b/addons/mail/static/description/icon.png index 53ccc469127..bb61ffda34e 100644 Binary files a/addons/mail/static/description/icon.png and b/addons/mail/static/description/icon.png differ diff --git a/addons/mail/static/description/icon2.png b/addons/mail/static/description/icon2.png new file mode 100644 index 00000000000..ff221b25c14 Binary files /dev/null and b/addons/mail/static/description/icon2.png differ diff --git a/addons/mail/views/contact_views.xml b/addons/mail/views/contact_views.xml index 17f866d054f..06f9ad6fc82 100644 --- a/addons/mail/views/contact_views.xml +++ b/addons/mail/views/contact_views.xml @@ -44,6 +44,7 @@ id="menu_contacts" sequence="4" action="action_contacts" + web_icon="mail,static/description/icon2.png" groups="base.group_user,base.group_partner_manager"/> diff --git a/addons/mail/views/mail_thread_views.xml b/addons/mail/views/mail_thread_views.xml index d9425d40b5a..7e9c8f7b1af 100644 --- a/addons/mail/views/mail_thread_views.xml +++ b/addons/mail/views/mail_thread_views.xml @@ -2,8 +2,13 @@ - + Inbox diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 3499657d148..ab946cb95d8 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -4,6 +4,7 @@ diff --git a/addons/marketing/static/description/icon.png b/addons/marketing/static/description/icon.png new file mode 100644 index 00000000000..6871be5df6e Binary files /dev/null and b/addons/marketing/static/description/icon.png differ diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index de7359c8740..619caf0b613 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -189,7 +189,7 @@ - + diff --git a/addons/marketing_campaign/static/description/icon.png b/addons/marketing_campaign/static/description/icon.png new file mode 100644 index 00000000000..0d09330b569 Binary files /dev/null and b/addons/marketing_campaign/static/description/icon.png differ diff --git a/addons/mass_mailing/static/description/icon.png b/addons/mass_mailing/static/description/icon.png index 6ef68f30952..184811f998d 100644 Binary files a/addons/mass_mailing/static/description/icon.png and b/addons/mass_mailing/static/description/icon.png differ diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 301fa4722bf..4d1e2a20cd6 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 00990346575..40a842d6d83 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -120,7 +120,7 @@ - + diff --git a/addons/membership/static/description/icon.png b/addons/membership/static/description/icon.png new file mode 100644 index 00000000000..7e341e8713e Binary files /dev/null and b/addons/membership/static/description/icon.png differ diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 1d46d16c72e..e4e08117007 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -7,6 +7,7 @@ id="base.menu_mrp_root" groups="group_mrp_user,group_mrp_manager" icon="fa-wrench" + web_icon="mrp,static/description/icon.png" sequence="35"/> diff --git a/addons/point_of_sale/static/description/icon.png b/addons/point_of_sale/static/description/icon.png index 9054576f2d5..dd45786db55 100644 Binary files a/addons/point_of_sale/static/description/icon.png and b/addons/point_of_sale/static/description/icon.png differ diff --git a/addons/project/static/description/icon.png b/addons/project/static/description/icon.png index 9a37528ca6e..0feb9408f3d 100644 Binary files a/addons/project/static/description/icon.png and b/addons/project/static/description/icon.png differ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index a39ae3e37d5..bf0b233f7d1 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -7,6 +7,7 @@ id="base.menu_purchase_root" groups="group_purchase_manager,group_purchase_user" icon="fa-shopping-cart" + web_icon="purchase,static/description/icon.png" sequence="25"/> diff --git a/addons/survey/static/description/icon.png b/addons/survey/static/description/icon.png index dece1016d57..ebcacedd73d 100644 Binary files a/addons/survey/static/description/icon.png and b/addons/survey/static/description/icon.png differ diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index fa84e4497b0..10dda4927a9 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -595,7 +595,7 @@ - + diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml index 5f3725e0936..0640e20e8f9 100644 --- a/addons/website/data/data.xml +++ b/addons/website/data/data.xml @@ -87,6 +87,7 @@ Website fa-home + website,static/description/icon.png diff --git a/addons/website/static/description/icon.png b/addons/website/static/description/icon.png index 2ff68dd1789..6f954445376 100644 Binary files a/addons/website/static/description/icon.png and b/addons/website/static/description/icon.png differ diff --git a/addons/website_version/static/description/icon.png b/addons/website_version/static/description/icon.png index b4e12d29a5b..a34f97bd676 100644 Binary files a/addons/website_version/static/description/icon.png and b/addons/website_version/static/description/icon.png differ diff --git a/addons/website_version/views/marketing_view.xml b/addons/website_version/views/marketing_view.xml index 2f21a31d38d..2fba8434b5c 100644 --- a/addons/website_version/views/marketing_view.xml +++ b/addons/website_version/views/marketing_view.xml @@ -223,7 +223,7 @@ tree,form - + diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index b0bcf71736d..e68c9126f1f 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -1,7 +1,7 @@ - + @@ -9,8 +9,9 @@ - + diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py index 6997a09f4ac..23db483fcca 100644 --- a/openerp/addons/base/ir/ir_ui_menu.py +++ b/openerp/addons/base/ir/ir_ui_menu.py @@ -344,7 +344,7 @@ class ir_ui_menu(osv.osv): :return: the menu root :rtype: dict('children': menu_nodes) """ - fields = ['name', 'sequence', 'parent_id', 'action'] + fields = ['name', 'sequence', 'parent_id', 'action', 'icon', 'web_icon_data'] 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 [] menu_root = { diff --git a/openerp/addons/base/ir/ir_ui_menu_view.xml b/openerp/addons/base/ir/ir_ui_menu_view.xml index a2724c9503c..31cd1734f0a 100644 --- a/openerp/addons/base/ir/ir_ui_menu_view.xml +++ b/openerp/addons/base/ir/ir_ui_menu_view.xml @@ -7,6 +7,7 @@
+ @@ -17,6 +18,7 @@ + diff --git a/openerp/addons/base/static/description/board.png b/openerp/addons/base/static/description/board.png new file mode 100644 index 00000000000..c33a94e33a6 Binary files /dev/null and b/openerp/addons/base/static/description/board.png differ diff --git a/openerp/addons/base/static/description/modules.png b/openerp/addons/base/static/description/modules.png new file mode 100644 index 00000000000..e2cfa68346d Binary files /dev/null and b/openerp/addons/base/static/description/modules.png differ diff --git a/openerp/addons/base/static/description/settings.png b/openerp/addons/base/static/description/settings.png new file mode 100644 index 00000000000..45aec955274 Binary files /dev/null and b/openerp/addons/base/static/description/settings.png differ diff --git a/openerp/addons/test_exceptions/static/description/icon.png b/openerp/addons/test_exceptions/static/description/icon.png new file mode 100644 index 00000000000..b0f5613028c Binary files /dev/null and b/openerp/addons/test_exceptions/static/description/icon.png differ diff --git a/openerp/addons/test_exceptions/view.xml b/openerp/addons/test_exceptions/view.xml index a71032ef01d..35ba1e6fc20 100644 --- a/openerp/addons/test_exceptions/view.xml +++ b/openerp/addons/test_exceptions/view.xml @@ -118,7 +118,7 @@ new - +