diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 11:30:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 11:30:27 +0200 |
| commit | 50860317ccd2c1b44f873598858a3cff87fa7ea6 (patch) | |
| tree | 2b752e71a34a062112c2e28acf4a2993336ec3e6 /addons/web/static/src/js/fields/basic_fields.js | |
| parent | 42ba1298d8d908c6d34b64f25be4e5c71e7888a3 (diff) | |
| parent | b170a753e18c96f59e8c99a4e1750a4b85628338 (diff) | |
[MERGE] forward port branch saas-11.2 up to b170a753e18
Diffstat (limited to 'addons/web/static/src/js/fields/basic_fields.js')
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index b2b7f20f1df..974615f2b5c 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -491,7 +491,13 @@ var FieldDate = InputField.extend({ * @private */ _makeDatePicker: function () { - return new datepicker.DateWidget(this, {defaultDate: this.value}); + return new datepicker.DateWidget( + this, + _.defaults( + this.nodeOptions.datepicker || {}, + {defaultDate: this.value} + ) + ); }, /** |