diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 10:15:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 10:15:27 +0200 |
| commit | b170a753e18c96f59e8c99a4e1750a4b85628338 (patch) | |
| tree | 13c365d5e3db51e3b94def4e88968170743ce7ae /addons/web/static/src/js/fields | |
| parent | a3c9c286cc46e03040e954f7872ade3555d98ad9 (diff) | |
| parent | b05e4d5f958892a9ff644b28a4ee165aeb2ea247 (diff) | |
[MERGE] forward port branch 11.0 up to b05e4d5f958
Diffstat (limited to 'addons/web/static/src/js/fields')
| -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 a62043b28c8..fed57c8b178 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -482,7 +482,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} + ) + ); }, /** |