tryton-sao 7.2.19 → 7.2.20

package/CHANGELOG

@@ -1,4 +1,9 @@
 
+Version 7.2.20 - 2025-05-02
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.19 - 2025-04-26
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.19',
+    __version__: '7.2.20',
 };
 /* eslint-enable no-redeclare */
 
@@ -5304,6 +5304,15 @@ var Sao = {
             if (!context) {
                 context = {};
             }
+            function atof(string) {
+                if (!string) {
+                    throw("empty string");
+                }
+                let { format } = new Intl.NumberFormat(
+                    Sao.i18n.BC47(Sao.i18n.getlang()));
+                let [, decimalSign] = /^0(.)1$/.exec(format(0.1));
+                return Number(string.replace(decimalSign, '.'));
+            }
             var convert_selection = function() {
                 if (typeof value == 'string') {
                     for (var i = 0; i < field.selection.length; i++) {
@@ -5335,8 +5344,12 @@ var Sao = {
                 },
                 'float': function() {
                     var factor = Number(field.factor || 1);
-                    var result = Number(value);
-                    if (isNaN(result) || value === '' || value === null) {
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
+                    if (isNaN(result)) {
                         return null;
                     } else {
                         return result / factor;
@@ -5344,18 +5357,25 @@ var Sao = {
                 },
                 'integer': function() {
                     var factor = Number(field.factor || 1, 10);
-                    var result = parseInt(value, 10);
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
                     if (isNaN(result)) {
                         return null;
                     } else {
-                        return result / factor;
+                        return parseInt(result / factor, 10);
                     }
                 },
                 'numeric': function() {
                     var factor = Number(field.factor || 1);
-                    var result = Number(value);
-                    if (isNaN(result.valueOf()) ||
-                            value === '' || value === null) {
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
+                    if (isNaN(result)) {
                         return null;
                     } else {
                         return new Sao.Decimal(result / factor);
@@ -5410,8 +5430,7 @@ var Sao = {
                     return '';
                 }
                 var digit = 0;
-                var factor = Number(field.factor || 1);
-                var string = String(value * factor);
+                var string = String(value);
                 if (string.contains('e')) {
                     var exp = string.split('e')[1];
                     string = string.split('e')[0];
@@ -5420,7 +5439,14 @@ var Sao = {
                 if (string.contains('.')) {
                     digit += string.replace(/0+$/, '').split('.')[1].length;
                 }
-                return (value * factor).toFixed(digit);
+                var factor = Number(field.factor || 1);
+                digit -= Math.round(Math.log10(factor));
+                return (value * factor).toLocaleString(
+                    Sao.i18n.BC47(Sao.i18n.getlang()), {
+                        useGrouping: true,
+                        minimumFractionDigits: digit,
+                        maximumFractionDigits: digit,
+                    });
             };
             var format_selection = function() {
                 if (field.selection instanceof Array) {
@@ -10176,6 +10202,7 @@ var Sao = {
             }
 
             if (value && (value.add || value.update)) {
+                let vals_to_set = {};
                 // First set already added fields to prevent triggering a
                 // second on_change call
                 if (value.update) {
@@ -10185,9 +10212,9 @@ var Sao = {
                         }
                         const record2 = group.get(vals.id);
                         if (record2) {
-                            var vals_to_set = {};
                             for (var key in vals) {
-                                if (!(key in new_field_names)) {
+                                if (!Object.prototype.hasOwnProperty.call(
+                                    new_field_names, key)) {
                                     vals_to_set[key] = vals[key];
                                 }
                             }
@@ -10221,7 +10248,14 @@ var Sao = {
                         }
                         const record2 = group.get(vals.id);
                         if (record2) {
-                            record2.set_on_change(vals);
+                            let to_update = Object.fromEntries(
+                                Object.entries(vals).filter(
+                                    ([k, v]) => {
+                                        !Object.prototype.hasOwnProperty.call(
+                                            vals_to_set, k)
+                                    }
+                                ));
+                            record2.set_on_change(to_update);
                         }
                     }
                 }
@@ -13007,7 +13041,7 @@ var Sao = {
             Sao.ScreenContainer.BetweenDates._super.init.call(this, id);
             this.from.change(this._from_changed.bind(this));
         },
-        _get_value: function(entry, value) {
+        _get_value: function(entry) {
             return entry.find('input[type=text]').val();
         },
         _set_value: function(entry, value) {
@@ -13120,11 +13154,17 @@ var Sao = {
                 'class': 'form-control input-sm',
                 'type': 'number',
                 'step': 'any',
+                'lang': Sao.i18n.getlang(),
             }).appendTo(el);
             return entry;
         },
-        _get_value: function(entry, value) {
-            return entry.val();
+        _get_value: function(entry) {
+            let value = entry.val();
+            if (value) {
+                value = Number(value).toLocaleString(
+                    Sao.i18n.BC47(Sao.i18n.getlang()))
+            }
+            return value;
         },
         _set_value: function(entry, value) {
             return entry.val(value);
@@ -13678,9 +13718,6 @@ var Sao = {
             return this.__current_record;
         },
         set current_record(record) {
-            if ((this.__current_record === record) && record) {
-                return;
-            }
             this.__current_record = record;
             var pos = null;
             var record_id = null;
@@ -25083,9 +25120,10 @@ function eval_pyson(value){
             });
         },
         clear: function() {
-            var kinds = this.el.children().each(
-                (i, el) => jQuery(el).data('kind'));
-            new Set(kinds).forEach(kind => {
+            let kinds = new Set();
+            this.el.children().each(
+                (i, el) => kinds.add(jQuery(el).data('kind')));
+            kinds.forEach(kind => {
                 this.refresh(kind);
             });
             this.__messages.clear();

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.2.19",
+  "version": "7.2.20",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -2008,6 +2008,15 @@
             if (!context) {
                 context = {};
             }
+            function atof(string) {
+                if (!string) {
+                    throw("empty string");
+                }
+                let { format } = new Intl.NumberFormat(
+                    Sao.i18n.BC47(Sao.i18n.getlang()));
+                let [, decimalSign] = /^0(.)1$/.exec(format(0.1));
+                return Number(string.replace(decimalSign, '.'));
+            }
             var convert_selection = function() {
                 if (typeof value == 'string') {
                     for (var i = 0; i < field.selection.length; i++) {
@@ -2039,8 +2048,12 @@
                 },
                 'float': function() {
                     var factor = Number(field.factor || 1);
-                    var result = Number(value);
-                    if (isNaN(result) || value === '' || value === null) {
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
+                    if (isNaN(result)) {
                         return null;
                     } else {
                         return result / factor;
@@ -2048,18 +2061,25 @@
                 },
                 'integer': function() {
                     var factor = Number(field.factor || 1, 10);
-                    var result = parseInt(value, 10);
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
                     if (isNaN(result)) {
                         return null;
                     } else {
-                        return result / factor;
+                        return parseInt(result / factor, 10);
                     }
                 },
                 'numeric': function() {
                     var factor = Number(field.factor || 1);
-                    var result = Number(value);
-                    if (isNaN(result.valueOf()) ||
-                            value === '' || value === null) {
+                    try {
+                        var result = atof(value);
+                    } catch (e) {
+                        return null;
+                    }
+                    if (isNaN(result)) {
                         return null;
                     } else {
                         return new Sao.Decimal(result / factor);
@@ -2114,8 +2134,7 @@
                     return '';
                 }
                 var digit = 0;
-                var factor = Number(field.factor || 1);
-                var string = String(value * factor);
+                var string = String(value);
                 if (string.contains('e')) {
                     var exp = string.split('e')[1];
                     string = string.split('e')[0];
@@ -2124,7 +2143,14 @@
                 if (string.contains('.')) {
                     digit += string.replace(/0+$/, '').split('.')[1].length;
                 }
-                return (value * factor).toFixed(digit);
+                var factor = Number(field.factor || 1);
+                digit -= Math.round(Math.log10(factor));
+                return (value * factor).toLocaleString(
+                    Sao.i18n.BC47(Sao.i18n.getlang()), {
+                        useGrouping: true,
+                        minimumFractionDigits: digit,
+                        maximumFractionDigits: digit,
+                    });
             };
             var format_selection = function() {
                 if (field.selection instanceof Array) {

package/src/model.js

@@ -2521,6 +2521,7 @@
             }
 
             if (value && (value.add || value.update)) {
+                let vals_to_set = {};
                 // First set already added fields to prevent triggering a
                 // second on_change call
                 if (value.update) {
@@ -2530,9 +2531,9 @@
                         }
                         const record2 = group.get(vals.id);
                         if (record2) {
-                            var vals_to_set = {};
                             for (var key in vals) {
-                                if (!(key in new_field_names)) {
+                                if (!Object.prototype.hasOwnProperty.call(
+                                    new_field_names, key)) {
                                     vals_to_set[key] = vals[key];
                                 }
                             }
@@ -2566,7 +2567,14 @@
                         }
                         const record2 = group.get(vals.id);
                         if (record2) {
-                            record2.set_on_change(vals);
+                            let to_update = Object.fromEntries(
+                                Object.entries(vals).filter(
+                                    ([k, v]) => {
+                                        !Object.prototype.hasOwnProperty.call(
+                                            vals_to_set, k)
+                                    }
+                                ));
+                            record2.set_on_change(to_update);
                         }
                     }
                 }

package/src/sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.19',
+    __version__: '7.2.20',
 };
 /* eslint-enable no-redeclare */
 

package/src/screen.js

@@ -625,7 +625,7 @@
             Sao.ScreenContainer.BetweenDates._super.init.call(this, id);
             this.from.change(this._from_changed.bind(this));
         },
-        _get_value: function(entry, value) {
+        _get_value: function(entry) {
             return entry.find('input[type=text]').val();
         },
         _set_value: function(entry, value) {
@@ -738,11 +738,17 @@
                 'class': 'form-control input-sm',
                 'type': 'number',
                 'step': 'any',
+                'lang': Sao.i18n.getlang(),
             }).appendTo(el);
             return entry;
         },
-        _get_value: function(entry, value) {
-            return entry.val();
+        _get_value: function(entry) {
+            let value = entry.val();
+            if (value) {
+                value = Number(value).toLocaleString(
+                    Sao.i18n.BC47(Sao.i18n.getlang()))
+            }
+            return value;
         },
         _set_value: function(entry, value) {
             return entry.val(value);
@@ -1296,9 +1302,6 @@
             return this.__current_record;
         },
         set current_record(record) {
-            if ((this.__current_record === record) && record) {
-                return;
-            }
             this.__current_record = record;
             var pos = null;
             var record_id = null;

package/src/window.js

@@ -101,9 +101,10 @@
             });
         },
         clear: function() {
-            var kinds = this.el.children().each(
-                (i, el) => jQuery(el).data('kind'));
-            new Set(kinds).forEach(kind => {
+            let kinds = new Set();
+            this.el.children().each(
+                (i, el) => kinds.add(jQuery(el).data('kind')));
+            kinds.forEach(kind => {
                 this.refresh(kind);
             });
             this.__messages.clear();