diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-21 12:42:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-21 12:42:34 +0200 |
| commit | d73f0d8063aaa38aeb77b8a513df84123eaefd11 (patch) | |
| tree | 885b0ccbca6a74b15e3baf83adf3b0abcdb9f681 /doc | |
| parent | 10148c3c3ab0a2d7ad2924170a69526aacda7637 (diff) | |
| parent | 68f51630b923a9dbd0efdac28a2373e0742da005 (diff) | |
[MERGE] forward port of branch saas-9 up to 68f5163
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/Seekda.md | 17 | ||||
| -rw-r--r-- | doc/cla/individual/williamjmorenor.md | 9 | ||||
| -rw-r--r-- | doc/reference/orm.rst | 2 | ||||
| -rw-r--r-- | doc/reference/views.rst | 2 |
4 files changed, 28 insertions, 2 deletions
diff --git a/doc/cla/corporate/Seekda.md b/doc/cla/corporate/Seekda.md new file mode 100644 index 00000000000..0b5c0addde0 --- /dev/null +++ b/doc/cla/corporate/Seekda.md @@ -0,0 +1,17 @@ +Austria, 2016-06-16 + +Seekda GmbH agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Holger Lausen holger.lausen@seekda.com https://github.com/holgerlausen + +List of contributors: + +Holger Lausen holger.lausen@seekda.com https://github.com/holgerlausen +Florian Kisser florian.kisser@seekda.com https://github.com/floriankisser + diff --git a/doc/cla/individual/williamjmorenor.md b/doc/cla/individual/williamjmorenor.md new file mode 100644 index 00000000000..b09599fe626 --- /dev/null +++ b/doc/cla/individual/williamjmorenor.md @@ -0,0 +1,9 @@ +Nicaragua, Jun 16th, 2016 + +I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this declaration. + +Signed, + +William Moreno williamjmorenor@gmail.com https://github.com/williamjmorenor 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 6bed888f571..bc2a34e8be6 100644 --- a/doc/reference/views.rst +++ b/doc/reference/views.rst @@ -822,7 +822,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 |