pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 11.0 up to 1b272a2050

Browse Source
This commit is contained in:
Christophe Simonis
2018-06-05 16:27:49 +02:00
parent fc5e61b63d 1b272a2050
commit aba8c2b8fb
35 changed files with 302 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/controllers/main.py
+2 -1
View File
@@ -18,8 +18,9 @@ from odoo import http, models, fields, _
from odoo.http import request
from odoo.tools import pycompat, OrderedSet
from odoo.addons.http_routing.models.ir_http import slug, _guess_mimetype
from odoo.addons.web.controllers.main import WebClient, Binary, Home
from odoo.addons.web.controllers.main import WebClient, Binary
from odoo.addons.portal.controllers.portal import pager as portal_pager
from odoo.addons.portal.controllers.web import Home
logger = logging.getLogger(__name__)