Merge lp:~jfb-tempo-consulting/unifield-web/US-8372 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2020-12-22 09:41:29 +0000
+++ addons/openerp/static/javascript/form.js	2021-04-15 08:08:39 +0000
@@ -261,8 +261,10 @@
         if (!value) {
             jQuery(elem2).addClass('errorfield');
             result = false;
-        }
-        else
+        } else if (kind == 'float' && jQuery(elem).attr('en_thousand_sep') && value.indexOf(',') !== -1) {
+            jQuery(elem2).addClass('errorfield');
+            result = false;
+        } else
             if (jQuery(elem2).hasClass('errorfield')) {
                 jQuery(elem2).removeClass('errorfield');
             }
@@ -508,8 +510,12 @@
  */
 function getFormData(extended, include_readonly, parentNode) {
 
+    var from_evaldom_ctx = false;
     if (!parentNode) {
         var parentNode = openobject.dom.get('_terp_list') || document.forms['view_form'];
+        if (extended == 1) {
+            from_evaldom_ctx = true;
+        }
     }
 
     var frm = {};
@@ -614,6 +620,11 @@
                 attrs['required'] = 1;
             }
 
+            /* onchange: extended =1, save extended = 3 */
+            if ((extended == 3 || !from_evaldom_ctx) && kind == 'float' && $this.attr('en_thousand_sep')) {
+                attrs['en_thousand_sep'] = $this.attr('en_thousand_sep');
+            }
+
             switch (kind) {
                 case "picture":
                     name = this.id;

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2020-12-23 15:44:38 +0000
+++ addons/openerp/static/javascript/listgrid.js	2021-04-15 08:08:39 +0000
@@ -823,7 +823,7 @@
         var self = this;
         var req = openobject.http.postJSON('/openerp/listgrid/save', args);
 
-        var $current_record = jQuery('table[id="'+this.name+'_grid'+'"]').find('tr.grid-row[record="'+id+'"]');
+        var $current_record = jQuery('table[id="'+this.name+'_grid'+'"]').find('tr.grid-row[record="'+(id||-1)+'"]');
         req.addCallback(function(obj) {
             if (obj.error) {
                 error_display(obj.error);
@@ -848,6 +848,15 @@
                         $req_field.removeClass('errorfield');
                     }
                 }
+                if (obj.error_field) {
+                    var $field_error = $current_record.find('td [id="'+'_terp_listfields/'+obj.error_field+'"]');
+                    if ($field_error.length) {
+                        $field_error.addClass('errorfield');
+                        if (!$focus_field) {
+                            $focus_field = $field_error;
+                        }
+                    }
+                }
                 if($focus_field) {
                     $focus_field.focus();
                 }

=== modified file 'addons/openerp/utils/utils.py'
--- addons/openerp/utils/utils.py	2018-09-18 12:23:25 +0000
+++ addons/openerp/utils/utils.py	2021-04-15 08:08:39 +0000
@@ -378,7 +378,7 @@
                     if rounding_value in attrs.get('uom_rounding'):
                         rounding = int(abs(math.log10(attrs['uom_rounding'][rounding_value])))
 
-                v = validators.Float(digit=attrs.get("digit"), computation=attrs.get("computation"), rounding=rounding)
+                v = validators.Float(digit=attrs.get("digit"), computation=attrs.get("computation"), rounding=rounding, en_thousand_sep=attrs.get('en_thousand_sep', True))
 
             v.not_empty = (required or False) and True
 

=== modified file 'addons/openerp/validators.py'
--- addons/openerp/validators.py	2018-07-30 14:25:14 +0000
+++ addons/openerp/validators.py	2021-04-15 08:08:39 +0000
@@ -76,14 +76,22 @@
     digit = 2
     computation = False
     rounding = False
+    en_thousand_sep = True
 
     def _from_python(self, value, state):
         if self.rounding is not False:
-            return format.format_decimal(float(value) or 0.0, self.rounding)
-        return format.format_decimal(float(value) or 0.0, self.digit, computation=self.computation)
+            ret_value = format.format_decimal(float(value) or 0.0, self.rounding)
+        else:
+            ret_value = format.format_decimal(float(value) or 0.0, self.digit, computation=self.computation)
+
+        if ret_value and self.en_thousand_sep == 'False':
+            ret_value = ret_value.replace(',', '')
+        return ret_value
 
     def _to_python(self, value, state):
         try:
+            if self.en_thousand_sep=='False' and value and ',' in value:
+                raise ValueError
             value = format.parse_decimal(value)
         except ValueError:
             raise formencode.api.Invalid(_('Invalid literal for float'), value, state)

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2020-12-10 14:49:27 +0000
+++ addons/openerp/widgets/form/_form.py	2021-04-15 08:08:39 +0000
@@ -463,11 +463,14 @@
 
 class Float(TinyInputWidget):
     template = "/openerp/widgets/form/templates/float.mako"
-
+    params = ['en_thousand_sep']
+    en_thousand_sep = True
     def __init__(self, **attrs):
         super(Float, self).__init__(**attrs)
 
         self.with_null = attrs.get('with_null')
+        if not attrs.get('en_thousand_sep', True):
+            self.en_thousand_sep = False
         rounding = False
         if attrs.get('rounding_value') and attrs.get('uom_rounding'):
             if isinstance(attrs.get('rounding_value'), (list, tuple)):
@@ -487,7 +490,7 @@
         computation = attrs.get('computation', False)
         if isinstance(computation, basestring):
             computation = eval(computation)
-        self.validator = validators.Float(digit=digit, computation=computation, rounding=rounding)
+        self.validator = validators.Float(digit=digit, computation=computation, rounding=rounding, en_thousand_sep=self.en_thousand_sep)
 
 #        if not self.default:
 #            self.default = 0.0

=== modified file 'addons/openerp/widgets/form/templates/float.mako'
--- addons/openerp/widgets/form/templates/float.mako	2019-04-15 12:09:58 +0000
+++ addons/openerp/widgets/form/templates/float.mako	2021-04-15 08:08:39 +0000
@@ -4,7 +4,14 @@
         kind="${kind}" 
         name='${name}' 
         id ='${name}' 
-        value="${value}" 
+        % if not en_thousand_sep:
+            en_thousand_sep = 'False'
+        % endif
+        % if not en_thousand_sep and value:
+            value="${value.replace(',', '')}"
+        % else:
+            value="${value}"
+        % endif
         size="1"
         class="${css_class}" 
         ${py.attrs(attrs, fld_readonly=1 if readonly_before_state else 0)} />