diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-23 12:11:32 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-23 12:11:32 +0100 |
| commit | 7a0243ec15d916102ec4502db01ae5e70d6912cd (patch) | |
| tree | 29c940dcab4e9f7c834b8a5e899e394d8f821794 /addons/web/static/src/js/fields/basic_fields.js | |
| parent | 75477052a03530df791348cdcf819f5bedd46284 (diff) | |
| parent | b3052b690fad15feb3211525666d4962bc1a24ac (diff) | |
[MERGE] forward port branch 12.0 up to b3052b690fa
Diffstat (limited to 'addons/web/static/src/js/fields/basic_fields.js')
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index b324d6f2efa..53fbf99a8cd 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -501,6 +501,7 @@ var FieldDate = InputField.extend({ // use the session timezone when formatting dates this.formatOptions.timezone = true; this.datepickerOptions = _.defaults( + {}, this.nodeOptions.datepicker || {}, {defaultDate: this.value} ); |