diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py index 41c113bbbdd..8e861cacb12 100644 --- a/addons/web/controllers/pivot.py +++ b/addons/web/controllers/pivot.py @@ -1,5 +1,6 @@ from openerp import http import json +from openerp.tools import ustr from openerp.http import request, serialize_exception as _serialize_exception from openerp.tools.misc import xlwt from cStringIO import StringIO @@ -67,7 +68,7 @@ class TableExporter(http.Controller): # Step 3: writing data x = 0 for row in jdata['rows']: - worksheet.write(y, x, row['indent'] * ' ' + row['title'], header_plain) + worksheet.write(y, x, row['indent'] * ' ' + ustr(row['title']), header_plain) for cell in row['values']: x = x + 1 if cell.get('is_bold', False): diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 3e1d2d90f72..f852c871d29 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -132,7 +132,7 @@ class WebsiteBlog(http.Controller): blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context) pager = request.website.pager( - url=request.httprequest.path, + url=request.httprequest.path.partition('/page/')[0], total=len(blog_posts), page=page, step=self._blog_post_per_page, diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst index cf8718c6f1c..202b5ba53dd 100644 --- a/doc/reference/orm.rst +++ b/doc/reference/orm.rst @@ -91,6 +91,10 @@ preserve order. * ``record in set`` returns whether ``record`` (which must be a 1-element recordset) is present in ``set``. ``record not in set`` is the inverse operation +* ``set1 <= set2`` and ``set1 < set2`` return whether ``set1`` is a subset + of ``set2`` (resp. strict) +* ``set1 >= set2`` and ``set1 > set2`` return whether ``set1`` is a superset + of ``set2`` (resp. strict) * ``set1 | set2`` returns the union of the two recordsets, a new recordset containing all records present in either source * ``set1 & set2`` returns the intersection of two recordsets, a new recordset