diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py index 8d7e0fdef46..65b924183e1 100644 --- a/addons/portal/__init__.py +++ b/addons/portal/__init__.py @@ -22,7 +22,6 @@ import portal import wizard import res_user -import event # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index 58896c4bed9..6dd22a46ca2 100644 --- a/addons/portal/__openerp__.py +++ b/addons/portal/__openerp__.py @@ -39,7 +39,6 @@ very handy when used in combination with the module 'share'. """, 'website': 'http://www.openerp.com', 'data': [ - 'event_view.xml', 'security/portal_security.xml', 'security/ir.model.access.csv', 'portal_view.xml', diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py index 26c654db9dd..60fb460545a 100644 --- a/addons/portal_event/__init__.py +++ b/addons/portal_event/__init__.py @@ -19,3 +19,4 @@ # ############################################################################## +import event diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py index 865f18604d6..2f5220c9f36 100644 --- a/addons/portal_event/__openerp__.py +++ b/addons/portal_event/__openerp__.py @@ -26,12 +26,13 @@ 'category': 'Tools', 'complexity': "easy", 'description': """ -This module adds event menu and features to your portal if event and portal are +This module adds event menu and features to your portal if event and portal are installed. """, 'author': 'OpenERP SA', 'depends': ['event','portal'], 'data': [ + 'event_view.xml', 'security/portal_security.xml', 'portal_event_view.xml', 'security/ir.model.access.csv', diff --git a/addons/portal/event.py b/addons/portal_event/event.py similarity index 100% rename from addons/portal/event.py rename to addons/portal_event/event.py diff --git a/addons/portal/event_view.xml b/addons/portal_event/event_view.xml similarity index 100% rename from addons/portal/event_view.xml rename to addons/portal_event/event_view.xml