From 24378aad2276490da62eb9f9c314ab28f2879d1c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 26 Mar 2012 16:31:12 +0200 Subject: [PATCH] [fix] problem in dates, validate was returning false in read-only mode bzr revid: nicolas.vanhoren@openerp.com-20120326143112-slpwbl5r1sjebhhk --- addons/web/static/src/js/view_form.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e0fb503aeff..01d2cc13807 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1754,10 +1754,10 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({ this.$input.prop('readonly', this.readonly); this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly); }, - is_valid: function(required) { + is_valid: function() { var value = this.$input.val(); if (value === "") { - return !required; + return true; } else { try { this.parse_client(value); @@ -1822,7 +1822,10 @@ openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend( } }, validate: function() { - this.invalid = this.get("effective_readonly") || !this.datewidget.is_valid(this.required); + this.invalid = false; + if (!this.get("effective_readonly")) { + this.invalid = !this.datewidget.is_valid() || (this.required && !this.datewidget.get_value()); + } }, focus: function($element) { this._super($element || (this.datewidget && this.datewidget.$input));