[MERGE] Forward-port 9.0 up to 75e03c0f7692a112e1b0fa33267f4939363f3871

1 files changed, 7 insertions, 5 deletions

diff --git a/addons/website_form/static/src/js/website_form.js b/addons/website_form/static/src/js/website_form.js
index ad5dcaa5cb7..f3ccc9142d4 100644
--- a/addons/website_form/static/src/js/website_form.js
+++ b/addons/website_form/static/src/js/website_form.js
@@ -158,13 +158,15 @@ odoo.define('website_form.animation', function (require) {
 
                     // Special cases for dates and datetimes
                     } else if ($(input).hasClass('o_website_form_date')) {
-                        return !self.is_datetime_valid(input.value, 'date');
+                        if (!self.is_datetime_valid(input.value, 'date')) {
+                            return true;
+                        }
                     } else if ($(input).hasClass('o_website_form_datetime')) {
-                        return !self.is_datetime_valid(input.value, 'datetime');
-
-                    } else {
-                        return !input.checkValidity();
+                        if (!self.is_datetime_valid(input.value, 'datetime')) {
+                            return true;
+                        }
                     }
+                    return !input.checkValidity();
                 })
 
                 // Update field color if invalid or erroneous