tryton-sao 7.0.28 → 7.0.30

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.0.30 - 2025-05-15
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.0.29 - 2025-05-02
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.0.28 - 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.0.28',
+    __version__: '7.0.30',
 };
 /* eslint-enable no-redeclare */
 
@@ -5199,6 +5199,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++) {
@@ -5230,8 +5239,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;
@@ -5239,18 +5252,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);
@@ -5305,8 +5325,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];
@@ -5315,7 +5334,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) {
@@ -10035,6 +10061,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) {
@@ -10044,9 +10071,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];
                                 }
                             }
@@ -10080,7 +10107,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);
                         }
                     }
                 }
@@ -11317,15 +11351,20 @@ var Sao = {
                             case 'ok':
                                 return this.save();
                             case 'ko':
-                                var record_id = this.screen.current_record.id;
+                                var record_id = null;
+                                if (this.screen.current_record) {
+                                    record_id = this.screen.current_record.id;
+                                }
                                 return this.reload(false).then(() => {
-                                    if (record_id < 0) {
-                                        return jQuery.Deferred().reject(true);
-                                    }
-                                    else if (this.screen.current_record) {
-                                        if (record_id !=
-                                            this.screen.current_record.id) {
-                                            return jQuery.Deferred().reject();
+                                    if (record_id !== null) {
+                                        if (record_id < 0) {
+                                            return jQuery.Deferred().reject(true);
+                                        }
+                                        else if (this.screen.current_record) {
+                                            if (record_id !=
+                                                this.screen.current_record.id) {
+                                                return jQuery.Deferred().reject();
+                                            }
                                         }
                                     }
                                 });
@@ -12833,7 +12872,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) {
@@ -12946,11 +12985,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);
@@ -13502,9 +13547,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;
@@ -16042,7 +16084,8 @@ function eval_pyson(value){
         class_: 'form',
         init: function(languages, widget) {
             var dialog = new Sao.Dialog(
-                Sao.i18n.gettext('Translate'), this.class_, 'md');
+                Sao.i18n.gettext('Translate'), this.class_,
+                widget.expand? 'lg' : 'md');
             this.languages = languages;
             this.read(widget, dialog);
             jQuery('<button/>', {
@@ -16134,10 +16177,10 @@ function eval_pyson(value){
                 input.uniqueId();
                 row.append(jQuery('<label/>', {
                     'for': input.attr('id'),
-                    'class': 'col-sm-3 control-label',
+                    'class': 'col-sm-2 control-label',
                 }).append(' ' + lang.name));
                 row.append(jQuery('<div/>', {
-                    'class': 'col-sm-9 input-group',
+                    'class': 'col-sm-10 input-group',
                 }).append(input)
                     .append(jQuery('<span/>', {
                         'class': 'input-group-addon',
@@ -21168,7 +21211,8 @@ function eval_pyson(value){
                         'type': 'button',
                         'title': Sao.i18n.gettext("More"),
                     }).text(Sao.i18n.gettext('More')
-                    ).click(() => {
+                    ).one('click', () => {
+                        this.tbody.find('tr.more-row').remove();
                         var height = this.table.height();
                         this.display_size += Sao.config.display_size;
                         this.display();
@@ -24760,9 +24804,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();