Merge lp:~openerp-dev/openerp-web/6.1-opw-579322-cpa into lp:openerp-web/6.1

[Chirag Patel (OpenERP)]

Hello,

Demo:
1) Edit user preferences.
2) In language combo box select the empty line.
   > Field becomes red.
3) Return to English.

Observed: Field stay with "Red" color.
Expected: Field color should be "Alpine Blue".

Thanks.

[Jiten (OpenERP) (jiten-openerp)]

review: Approve

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2012-09-03 13:17:44 +0000
+++ addons/web/static/src/js/view_form.js	2012-09-18 13:19:23 +0000
@@ -1467,7 +1467,7 @@
         if (!this.disable_utility_classes) {
             this.$element.toggleClass('disabled', this.readonly);
             this.$element.toggleClass('required', this.required);
-            if (show_invalid) {
+            if (show_invalid || this.$element.hasClass('invalid')) {
                 this.$element.toggleClass('invalid', !this.is_valid());
             }
         }