diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 16:03:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 16:03:31 +0200 |
| commit | 9f847076530cf83d7198c16a341b4f5d29392ceb (patch) | |
| tree | bee04e24b69d6933913ca32c0414aac394feaf97 /addons/web/static/src/js/fields/basic_fields.js | |
| parent | ca0a382f4fe3299e7e7a424099e4c3947bb23c32 (diff) | |
| parent | a935d5bc832ea3c06feb2a5a652562c1a497846e (diff) | |
[MERGE] forward port branch saas-11.4 up to a935d5bc832
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 01b4cb4371d..43b4e349a66 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -498,7 +498,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} + ) + ); }, /** |