[MERGE] forward port branch saas-11.4 up to 6c103589c15

5 files changed, 36 insertions, 0 deletions

diff --git a/doc/cla/corporate/camptocamp.md b/doc/cla/corporate/camptocamp.md
index 777bb974dc5..206fad26646 100644
--- a/doc/cla/corporate/camptocamp.md
+++ b/doc/cla/corporate/camptocamp.md
@@ -33,3 +33,4 @@ Akim Juillerat akim.juillerat@camptocamp.com https://github.com/grindtildeath
 Damien Crier damien.crier@camptocamp.com https://github.com/damdam-s
 Simone Orsi simahawk@gmail.com https://github.com/simahawk
 Patrick Tombez patrick.tombez@camptocamp.com https://github.com/p-tombez
+Julien Coux julien.coux@camptocamp.com https://github.com/jcoux
diff --git a/doc/cla/corporate/initos.md b/doc/cla/corporate/initos.md
index 3c95fe2d07f..dd7fb8ea0e5 100644
--- a/doc/cla/corporate/initos.md
+++ b/doc/cla/corporate/initos.md
@@ -21,3 +21,4 @@ Peter Hahn peter.hahn@initos.com https://github.com/codingforfun
 Claudia Haida claudia.haida@initos.com
 Andreas Zöllner andreas.zoellner@initos.com https://github.com/azoellner
 Rami Alwafaie rami.alwafaie@initos.com https://github.com/rami-wafaie
+Florian Kantelberg florian.kantelberg@initos.com https://github.com/fkantelberg
diff --git a/doc/cla/individual/ivantodorovich.md b/doc/cla/individual/ivantodorovich.md
new file mode 100644
index 00000000000..d3352e4a1f7
--- /dev/null
+++ b/doc/cla/individual/ivantodorovich.md
@@ -0,0 +1,11 @@
+Argentina, 2018-09-04
+
+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,
+
+Ivan Todorovich <ivan.todorovich@gmail.com> https://github.com/ivantodorovich
diff --git a/doc/cla/individual/rocketgithub.md b/doc/cla/individual/rocketgithub.md
new file mode 100644
index 00000000000..9b30fbb4d5c
--- /dev/null
+++ b/doc/cla/individual/rocketgithub.md
@@ -0,0 +1,11 @@
+Guatemala, 2018-09-04
+
+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,
+
+Rodrigo Fernandez rodrigo@solucionesprisma.com https://github.com/rocketgithub
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 5dcac794ec2..052c63a97f5 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -957,6 +957,18 @@ sorted on the string of the field.
     which means that non-stored function fields can not be used in pivot views
 
 
+In Pivot view a ``field`` can have a ``widget`` attribute to dictate its format.
+The widget should be a field formatter, of which the most interesting are
+``date``, ``datetime``, ``float_time``, and ``monetary``.
+
+For instance a timesheet pivot view could be defined as::
+
+    <pivot string="Timesheet">
+        <field name="employee_id" type="row"/>
+        <field name="date" interval="month" type="col"/>
+        <field name="unit_amount" type="measure" widget="float_time"/>
+    </pivot>
+
 .. _reference/views/kanban:
 
 Kanban