summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-08-23 16:44:58 +0200
committerChristophe Simonis <chs@odoo.com>2017-08-23 16:44:58 +0200
commit30bd5ac0e904906d90f4767bbbf178bf940c0c66 (patch)
treeea271d0f46ed35c8af460aa71890c1dce474d2a4 /doc/reference
parent7f2bd086087f73878f62933ecd2e7c2bed32142e (diff)
parentaec6248bb379c1ece02f5d4f718566c770fc2c6f (diff)
[MERGE] forward port branch saas-16 up to aec6248bb37
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/cmdline.rst6
-rw-r--r--doc/reference/views.rst8
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index c8b1954f1a9..37b0e9db646 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -159,7 +159,11 @@ database
- ``%h`` is replaced by the whole hostname the request is made on.
- ``%d`` is replaced by the subdomain the request is made on, with the
exception of ``www`` (so domain ``odoo.com`` and ``www.odoo.com`` both
- match the database ``odoo``)
+ match the database ``odoo``).
+
+ These operations are case sensitive. Add option ``(?i)`` to match all
+ databases (so domain ``odoo.com`` using ``(?i)%d`` matches the database
+ ``Odoo``).
.. option:: --db-template <template>
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 2a9b5ece4bc..d5e5b10c58c 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -846,17 +846,13 @@ attributes:
Possible children of the view element are:
``field``
- declares fields to aggregate or to use in kanban *logic*. If the field is
- simply displayed in the kanban view, it does not need to be pre-declared.
+ declares fields to use in kanban *logic*. If the field is simply displayed in
+ the kanban view, it does not need to be pre-declared.
Possible attributes are:
``name`` (required)
the name of the field to fetch
- ``sum``, ``avg``, ``min``, ``max``, ``count``
- displays the corresponding aggregation at the top of a kanban column, the
- field's value is the label of the aggregation (a string). Only one
- aggregate operation per field is supported.
``templates``
defines a list of :ref:`reference/qweb` templates. Cards definition may be