diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
| commit | e9ae419fca0a9ebd0071c280bd98fc84f268bb74 (patch) | |
| tree | 8f33c2a81a60133b04df10d7e81afbc9d54c20a6 /doc | |
| parent | 156d099e328304d0f19146f4714d13b7b572358a (diff) | |
| parent | 0de06a41326662d4505401764035bf9ddf31fc8b (diff) | |
[MERGE] forward port branch saas-11.3 up to 0de06a41326
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/cybrosys.md | 16 | ||||
| -rw-r--r-- | doc/cla/individual/linekio.md | 11 | ||||
| -rw-r--r-- | doc/cla/individual/stijnh92.md | 11 | ||||
| -rw-r--r-- | doc/reference/javascript_reference.rst | 2 |
4 files changed, 39 insertions, 1 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/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/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst index 26ed37bd8ee..716bd6b56a1 100644 --- a/doc/reference/javascript_reference.rst +++ b/doc/reference/javascript_reference.rst @@ -1454,7 +1454,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 |