diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 2e7d56eb546..16a6bd24edf 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -19,23 +19,22 @@ # ############################################################################## -from openerp import SUPERUSER_ID -from openerp.addons.web import http -from openerp.addons.web.http import request -from openerp.tools.translate import _ -from openerp.addons.website.controllers.main import Website as controllers -controllers = controllers() - import logging -_logger = logging.getLogger(__name__) - -from datetime import datetime, timedelta import time +from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta -from openerp import tools + import werkzeug.urls + +from openerp import SUPERUSER_ID +from openerp import http +from openerp import tools +from openerp.http import request +from openerp.tools.translate import _ from openerp.addons.website.models.website import slug +_logger = logging.getLogger(__name__) + try: import GeoIP except ImportError: diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py index 9204a8b9655..fef661e5c40 100644 --- a/addons/website_sale_delivery/controllers/main.py +++ b/addons/website_sale_delivery/controllers/main.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- import openerp -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http from openerp import SUPERUSER_ID +from openerp.http import request +import openerp.addons.website_sale.controllers.main class website_sale(openerp.addons.website_sale.controllers.main.website_sale):