[MERGE] forward port branch 11.0 up to a69f117bbf

2018-10-10 14:40:01 +02:00
parent 61df7749cc a69f117bbf
commit 7415f40fbd
9 changed files with 185 additions and 38 deletions
@@ -1348,7 +1348,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