diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-09-02 11:22:11 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-11-05 15:27:59 +0100 |
| commit | ef886aed2f4c7d9b78123d1cd980a899bf6b20ea (patch) | |
| tree | 0a51dc66a9ac12d898116721cc990882eb4588b0 /addons/web/static/src/js/view_form.js | |
| parent | 893d7fa8643192aec817478effa44c55d3c1ebc4 (diff) | |
[FIX] web: remove datejs and replace by momentjs
Diffstat (limited to 'addons/web/static/src/js/view_form.js')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7156fdaba5d..c483e58d998 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2640,13 +2640,13 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ down: 'fa fa-chevron-down' }, language : moment.locale(), - format : instance.web.convert_to_moment_format(l10n.date_format +' '+ l10n.time_format), + format : instance.web.normalize_format(l10n.date_format +' '+ l10n.time_format), }; this.$input = this.$el.find('input.oe_datepicker_master'); if (this.type_of_date === 'date') { options['pickTime'] = false; options['useSeconds'] = false; - options['format'] = instance.web.convert_to_moment_format(l10n.date_format); + options['format'] = instance.web.normalize_format(l10n.date_format); } this.picker = this.$('.oe_datepicker_main').datetimepicker(options); this.set_readonly(false); |