diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 213b80c3a44..9480f29decd 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -3,7 +3,9 @@ + groups="group_account_user,group_account_manager,group_account_invoice" + web_icon="images/accounting.png" + web_icon_hover="images/accounting-hover.png"/> ). + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public Lice +along with this program. If not, see . diff --git a/addons/base_tools/__init__.py b/addons/base_tools/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py new file mode 100644 index 00000000000..4f9ec18eeb0 --- /dev/null +++ b/addons/base_tools/__openerp__.py @@ -0,0 +1,15 @@ +# -*- encoding: utf-8 -*- +{ + "name": "Common base for tools modules", + "author": "OpenERP SA", + "version": "1.0", + "depends": ["base"], + "category" : "Tools", + 'description': """ + """, + "init_xml": [], + "update_xml": [ + 'tools_view.xml' + ], + "installable": True, +} diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml new file mode 100644 index 00000000000..eb51e000c1b --- /dev/null +++ b/addons/base_tools/tools_view.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index d5f5e9776d3..b6264516f43 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -26,7 +26,7 @@ "author" : "Openlabs", "website" : "http://openerp.com", "category" : "Added functionality", - "depends" : ['marketing'], + "depends" : ['marketing', 'base_tools'], "description": """ Email Template is extraction of Power Email basically just to send the emails. """, diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index 97108cb9e33..7037223f518 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -107,10 +107,6 @@ - - - - diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 40bc6da9c2f..9783efa58b6 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -178,7 +178,7 @@ class hr_employee(osv.osv): return {'value': {'work_email' : work_email}} def _get_photo(self, cr, uid, context=None): - photo_path = addons.get_module_resource('hr','image','photo.png') + photo_path = addons.get_module_resource('hr','images','photo.png') return open(photo_path, 'rb').read().encode('base64') _defaults = { diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index ce0a7193683..bc01d38d1a4 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -3,7 +3,9 @@ + groups="base.group_hr_manager,base.group_hr_user" + web_icon="images/hr.png" + web_icon_hover="images/hr-hover.png"/> diff --git a/addons/hr/image/photo.png b/addons/hr/images/photo.png similarity index 100% rename from addons/hr/image/photo.png rename to addons/hr/images/photo.png diff --git a/addons/hr_evaluation/specifications/evaluation_plan.png b/addons/hr_evaluation/specifications/evaluation_plan.png index bd00ceca0e9..46661d68788 100644 Binary files a/addons/hr_evaluation/specifications/evaluation_plan.png and b/addons/hr_evaluation/specifications/evaluation_plan.png differ diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index e7621ff278d..7bb35a07fd4 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -33,7 +33,7 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""", 'author': 'OpenERP SA', 'website': 'http://openerp.com', - 'depends': ['base'], + 'depends': ['base_tools'], 'init_xml': [], 'update_xml': [ 'security/idea_security.xml', diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 779b07040b5..493fda2c01f 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -21,7 +21,6 @@ - idea.category.form idea.category diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml index cbd1e635322..cdc176b347f 100644 --- a/addons/knowledge/knowledge_view.xml +++ b/addons/knowledge/knowledge_view.xml @@ -1,6 +1,9 @@ - + - diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index adc517f1b7c..ab4614827db 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -3,7 +3,9 @@ + groups="group_mrp_user,group_mrp_manager" sequence="8" + web_icon="images/manufacturing.png" + web_icon_hover="images/manufacturing-hover.png"/> diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png index 1b7461953a1..85c15fe1e7c 100644 Binary files a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png and b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png differ diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 1cf7ab1de69..17ec8c9db0f 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -3,7 +3,9 @@ + groups="group_pos_manager,group_pos_user" + web_icon="images/pos.png" + web_icon_hover="images/pos-hover.png"/> pos.order diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d66a7529eee..15c90caa6f4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -5,7 +5,9 @@ + groups="group_project_manager,group_project_user" + web_icon="images/project.png" + web_icon_hover="images/project-hover.png"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index ce8923ed5cd..290ad0d4587 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -2,7 +2,9 @@ + groups="group_purchase_manager,group_purchase_user" + web_icon="images/purchases.png" + web_icon_hover="images/purchases-hover.png"/> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3d5a3f22665..900629570ad 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -2,7 +2,10 @@ - + diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py index cb5bdbc392b..88b567c2b5e 100644 --- a/addons/subscription/__openerp__.py +++ b/addons/subscription/__openerp__.py @@ -23,10 +23,10 @@ { 'name': 'Subscription and recurring operations', 'version': '1.0', - 'category': 'Generic Modules/Others', + 'category': 'Tools', 'description': """Module allows to create new documents and add subscription on that document.""", 'author': 'OpenERP SA', - 'depends': ['base'], + 'depends': ['base_tools'], 'init_xml': [], 'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'], 'demo_xml': ['subscription_demo.xml',], diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 37841919b1b..b3c39962190 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -1,7 +1,6 @@ -