diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 13:27:17 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 13:27:27 +0200 |
| commit | 73652a0b196b51ec1f9a27880d0b398fb79bfca3 (patch) | |
| tree | 04e741fefdbb859dffa66a4037da7777ea980476 /addons/web/static/src/js/fields/basic_fields.js | |
| parent | 8a03563269c3dc55c9c7157494af51e2485f1a14 (diff) | |
| parent | 50860317ccd2c1b44f873598858a3cff87fa7ea6 (diff) | |
[MERGE] forward port branch saas-11.3 up to 50860317ccd
Note: 1aacc962620982528a3dfc90d2c1dd0027359375 has been ignored and will
be forward-ported later
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} + ) + ); }, /** |