diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-24 13:17:53 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-24 13:17:53 +0200 |
| commit | 017ee5eab376b4f09beb62812c1cbc682009ed86 (patch) | |
| tree | 2af185b0604cd8ce9129c39137bbf39d21d7be89 /addons/project | |
| parent | 006c16198f7f68c9dc8b895defd013f33008840a (diff) | |
| parent | 877e7098719195ed2934fc9c3b5c3bd8ad8bab07 (diff) | |
[MERGE] forward port branch saas-17 up to 877e7098719
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/controllers/portal.py | 3 | ||||
| -rw-r--r-- | addons/project/models/project.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index 76079d9bdff..621113a385b 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -8,7 +8,6 @@ from odoo.http import request from odoo.addons.portal.controllers.portal import get_records_pager, CustomerPortal, pager as portal_pager from odoo.osv.expression import OR -from odoo.tools import pycompat class CustomerPortal(CustomerPortal): @@ -157,7 +156,7 @@ class CustomerPortal(CustomerPortal): 'searchbar_inputs': searchbar_inputs, 'search_in': search_in, 'sortby': sortby, - 'searchbar_filters': OrderedDict(sorted(pycompat.items(searchbar_filters))), + 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())), 'filterby': filterby, }) return request.render("project.portal_my_tasks", values) diff --git a/addons/project/models/project.py b/addons/project/models/project.py index b2b9fccab1c..756283820d9 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -583,7 +583,7 @@ class Task(models.Model): _check_rec(eview) - res['arch'] = etree.tostring(eview) + res['arch'] = etree.tostring(eview, encoding='unicode') # replace reference of 'Hours' to 'Day(s)' for f in res['fields']: |