[MERGE] forward port branch saas-12.4 up to cda4f3c308c

5 files changed, 45 insertions, 4 deletions

diff --git a/doc/cla/individual/ddufresne.md b/doc/cla/individual/ddufresne.md
new file mode 100644
index 00000000000..ca210353726
--- /dev/null
+++ b/doc/cla/individual/ddufresne.md
@@ -0,0 +1,11 @@
+Canada, 2019-07-22
+
+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,
+
+David Dufresne 27902736+ddufresne@users.noreply.github.com https://github.com/ddufresne
diff --git a/doc/cla/individual/lutrome.md b/doc/cla/individual/lutrome.md
new file mode 100644
index 00000000000..6f012f2e96e
--- /dev/null
+++ b/doc/cla/individual/lutrome.md
@@ -0,0 +1,11 @@
+United States of America, 07/16/2019
+
+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,
+
+Nathaniel Olson 921778+Lutrome@users.noreply.github.com https://github.com/lutrome
diff --git a/doc/howtos/profilecode.rst b/doc/howtos/profilecode.rst
index 1251c052ff7..26bd5c967df 100644
--- a/doc/howtos/profilecode.rst
+++ b/doc/howtos/profilecode.rst
@@ -17,7 +17,7 @@ its sub-called methods.
 
 .. code:: python
 
-    from odoo.tools.profiler import profile
+    from odoo.tools.misc import profile
     [...]
     @profile('/temp/prof.profile')
     def mymethod(...)
@@ -36,10 +36,15 @@ A tool called *xdot* will display the resulting graph:
     
     xdot /temp/prof.xdot
     
-The profiler can be also used without saving data in a file:
+Log a method
+============
+
+Another profiler can be used to log statistics on a method:
 
 .. code:: python
 
+    from odoo.tools.profiler import profile
+    [...]
     @profile
     @api.model
     def mymethod(...):
diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index a4a5b3769a4..8e984f68a73 100644
--- a/doc/reference/qweb.rst
+++ b/doc/reference/qweb.rst
@@ -491,6 +491,11 @@ on the extended template to select *context nodes* to which the specified
     the node's body replaces the context node's children
 ``replace``
     the node's body is used to replace the context node itself
+``attributes``
+    the nodes's body should be any number of ``attribute`` elements,
+    each with a ``name`` attribute and some textual content, the named
+    attribute of the context node will be set to the specified value
+    (either replaced if it already existed or added if not)
 No operation
     if no ``t-operation`` is specified, the template body is interpreted as
     javascript code and executed with the context node as ``this``
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 8b632bba228..09c6ed55c5e 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -332,12 +332,21 @@ Possible children elements of the list view are:
     ``width_factor`` (for ``editable``)
         the column relative width (as the layout is fixed)
     ``width`` (for ``editable``)
-        the column width (as the layout is fixed)
+        the column width (as the layout is fixed). It is a string describing the
+        width css property, such as '100px'.
 
     .. note:: if the list view is ``editable``, any field attribute from the
               :ref:`form view <reference/views/form>` is also valid and will
               be used when setting up the inline form view
 
+    .. note:: When a list view is grouped, numeric fields are aggregated and
+              displayed for each group.  Also, if there are too many records in
+              a group, a pager will appear on the right of the group row. For
+              this reason, it is not a good practice to have a numeric field in
+              the last column, when the list view is in a situation where it can
+              be grouped (it is however fine for x2manys field in a form view:
+              they cannot be grouped).
+
 ``groupby``
   defines custom headers (with buttons) for the current view when grouping
   records on many2one fields. It is also possible to add `field`, inside the
@@ -346,7 +355,7 @@ Possible children elements of the list view are:
 
   ``name``
       the name of a many2one field (on the current model). Custom header will be
-      displayed when grouping the view on this field name (only for first level).
+      displayed when grouping the view on this field name.
 
   .. code-block:: xml