summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-20 14:20:03 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-20 14:20:03 +0200
commite37ba6183269b0d075833efbb9bf26e99404247e (patch)
tree75ad2f306f0dd0d6660c7c1e8cbbe257b093f937 /doc/reference
parenteea15ac92e1a987fe0136055ce1619761e6c1423 (diff)
parentb87a93a091010905ae9bee1628fcfadb8d59d358 (diff)
[MERGE] forward port of branch saas-6 up to b87a93a
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/orm.rst2
-rw-r--r--doc/reference/views.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index 8b7b9c1a4ad..cf8718c6f1c 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -641,7 +641,7 @@ Model Reference
.. automethod:: read
.. automethod:: read_group
- .. rubric:: Research
+ .. rubric:: Searching
.. automethod:: search
.. automethod:: search_count
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 3c8eaa02126..fd674beaa8f 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -815,7 +815,7 @@ attributes:
``default_group_by``
whether the kanban view should be grouped if no grouping is specified via
- the action or the current research. Should be the name of the field to group
+ the action or the current search. Should be the name of the field to group
by when no grouping is otherwise specified
``default_order``
cards sorting order used if the user has not already sorted the records (via