summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/components/datepicker.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/components/datepicker.js b/addons/web/static/src/js/components/datepicker.js
index a11d51b5021..94ce7ece4fe 100644
--- a/addons/web/static/src/js/components/datepicker.js
+++ b/addons/web/static/src/js/components/datepicker.js
@@ -178,7 +178,7 @@ odoo.define('web.DatePickerOwl', function (require) {
today: 'fa fa-calendar-check-o',
up: 'fa fa-chevron-up',
},
- locale: moment.locale(),
+ get locale() {return moment.locale();},
maxDate: moment({ y: 9999, M: 11, d: 31 }),
minDate: moment({ y: 1000 }),
useCurrent: false,
@@ -248,7 +248,7 @@ odoo.define('web.DatePickerOwl', function (require) {
}
}
- DateTimePicker.defaultProps = Object.assign({}, DatePicker.defaultProps, {
+ DateTimePicker.defaultProps = Object.assign(Object.create(DatePicker.defaultProps), {
buttons: {
showClear: false,
showClose: true,