[MERGE] forward port branch saas-11.4 up to 3c108977c1e

7 files changed, 62 insertions, 2 deletions

diff --git a/doc/cla/corporate/cybrosys.md b/doc/cla/corporate/cybrosys.md
new file mode 100644
index 00000000000..0d413d31ba7
--- /dev/null
+++ b/doc/cla/corporate/cybrosys.md
@@ -0,0 +1,16 @@
+India 2018-08-27
+
+Cybrosys Techno SOlutions 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,
+
+Niyas Raphy niyas@cybrosys.com https://github.com/CybroOdoo
+
+List of contributors:
+
+Sainu Abideen sainu@cybrosys.com https://github.com/CybroOdoo
+Cybrosys odoo@cybrosys.com https://github.com/CybroOdoo
diff --git a/doc/cla/individual/linekio.md b/doc/cla/individual/linekio.md
new file mode 100644
index 00000000000..7c905b998ba
--- /dev/null
+++ b/doc/cla/individual/linekio.md
@@ -0,0 +1,11 @@
+France, 2018-10-12
+
+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,
+
+Benoît Fontaine <benoitfontaine.ba@gmail.com> https://github.com/Linekio
diff --git a/doc/cla/individual/rakete.md b/doc/cla/individual/rakete.md
new file mode 100644
index 00000000000..72fa2bcea7c
--- /dev/null
+++ b/doc/cla/individual/rakete.md
@@ -0,0 +1,11 @@
+Germany, 2017-11-24
+
+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,
+
+Andreas Raster lazor@affenbande.org https://github.com/rakete
diff --git a/doc/cla/individual/stijnh92.md b/doc/cla/individual/stijnh92.md
new file mode 100644
index 00000000000..b969df67c38
--- /dev/null
+++ b/doc/cla/individual/stijnh92.md
@@ -0,0 +1,11 @@
+Belgium, 2018-09-05
+
+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,
+
+Stijn Houben stijnhouben92@gmail.com https://github.com/stijnh92
diff --git a/doc/cla/individual/zoggy444.md b/doc/cla/individual/zoggy444.md
new file mode 100644
index 00000000000..46f8490f973
--- /dev/null
+++ b/doc/cla/individual/zoggy444.md
@@ -0,0 +1,11 @@
+FRANCE, 2018-09-26
+
+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,
+
+zoggy 43614933+zoggy444@users.noreply.github.com https://github.com/zoggy444
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index fe04dc06a6f..058c49340ed 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -1611,7 +1611,7 @@ order.
 
     .. code-block:: xml
 
-        <field name="datefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
+        <field name="datetimefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
 
 - monetary (FieldMonetary)
     This is the default field type for fields of type 'monetary'. It is used to
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index eb7cefab965..52af59ecad4 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -1011,7 +1011,7 @@ attributes:
 ``quick_create``
   whether it should be possible to create records without switching to the
   form view. By default, ``quick_create`` is enabled when the Kanban view is
-  grouped, and disabled when not.
+  grouped by many2one, selection, char or boolean fields, and disabled when not.
 
   Set to ``true`` to always enable it, and to ``false`` to always disable it.