[MERGE] forward port branch saas-15 up to 73e4dacf78

2017-11-15 15:50:36 +01:00
parent 6158c5ce04 73e4dacf78
commit 5877b7b38c
31 changed files with 368 additions and 643 deletions
@@ -594,7 +594,7 @@ API.

 Odoo Web eschews direct calls to :py:meth:`~odoo.models.Model.read_group`
 in favor of calling a method of :class:`~odoo.web.Query`, :py:meth:`much
-in the way it is one in SQLAlchemy <sqlalchemy.orm.query.Query.group_by>`
+in the way it is done in SQLAlchemy <sqlalchemy.orm.query.Query.group_by>`
 [#terminal]_::

    some_query.group_by(['field1', 'field2']).then(function (groups) {