tryton-sao 7.2.18 → 7.2.20

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+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)
+
+
 Version 7.2.18 - 2025-04-02
 ---------------------------
 * 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.18',
+    __version__: '7.2.20',
 };
 /* eslint-enable no-redeclare */
 
@@ -4124,7 +4124,7 @@ var Sao = {
                 });
             }
         };
-        this._selection_prm.done(_update_selection);
+        this._selection_prm.always(_update_selection);
     };
     Sao.common.selection_mixin.filter_selection = function(
             domain, record, field) {
@@ -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) {
@@ -7659,7 +7685,7 @@ var Sao = {
     'use strict';
 
     function get_x2m_sub_fields(f_attrs, prefix) {
-        if (f_attrs.visible && f_attrs.views) {
+        if (f_attrs.visible && !jQuery.isEmptyObject(f_attrs.views)) {
             // There's only one key but we don't know its value
             const [[, view],] = Object.entries(f_attrs.views);
 
@@ -8238,6 +8264,7 @@ var Sao = {
             this.autocompletion = {};
             this.exception = false;
             this.destroyed = false;
+            this._save_prm = jQuery.when();
         },
         get modified() {
             if (!jQuery.isEmptyObject(this.modified_fields)) {
@@ -8251,33 +8278,28 @@ var Sao = {
         },
         save: function(force_reload=false) {
             var context = this.get_context();
+            if (this._save_prm.state() == 'pending') {
+                return this._save_prm.then(() => this.save(force_reload));
+            }
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                try {
-                    // synchronous call to avoid multiple creation or save
-                    if (this.id < 0) {
-                        this.id = this.model.execute(
-                            'create', [[values]], context,  false)[0];
-
-                    } else {
-                        if (!jQuery.isEmptyObject(values)) {
-                            context._timestamp = this.get_timestamp();
-                            this.model.execute(
-                                'write', [[this.id], values], context, false);
-                        }
-                    }
-                } catch (e) {
-                    if (e.promise) {
-                        return e.then(() => this.save(force_reload));
-                    } else {
-                        return jQuery.Deferred().reject();
+                if (this.id < 0) {
+                    prm = this.model.execute('create', [[values]], context)
+                        .then(ids => this.id = ids[0]);
+                } else {
+                    if (!jQuery.isEmptyObject(values)) {
+                        context._timestamp = this.get_timestamp();
+                        prm = this.model.execute(
+                            'write', [[this.id], values], context);
                     }
                 }
-                this.cancel();
-                if (force_reload) {
-                    return this.reload();
-                }
+                prm = prm.then(() => {
+                    this.cancel();
+                    if (force_reload) {
+                        return this.reload();
+                    }
+                });
                 if (this.group) {
                     prm = prm.then(() => this.group.written(this.id));
                 }
@@ -8286,6 +8308,7 @@ var Sao = {
                 delete this.group.parent.modified_fields[this.group.child_name];
                 prm = prm.then(() => this.group.parent.save(force_reload));
             }
+            this._save_prm = prm;
             return prm;
         },
         reload: function(fields, async=true) {
@@ -10179,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) {
@@ -10188,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];
                                 }
                             }
@@ -10224,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);
                         }
                     }
                 }
@@ -12161,6 +12192,7 @@ var Sao = {
                 }
             }
             const view_type = this.screen.current_view.view_type;
+            var next_view_type = this.screen.next_view_type;
             const has_views = this.screen.number_of_views > 1;
             var buttons = ['print', 'relate', 'email', 'attach'];
             for (const button_id of buttons) {
@@ -12181,7 +12213,9 @@ var Sao = {
                 set_sensitive(button_id, position && can_be_sensitive);
             }
             set_sensitive(
-                'switch_', (position || (view_type == 'form')) && has_views);
+                'switch_',
+                (position || (view_type == 'form') || (next_view_type != 'form')) &&
+                has_views);
             set_sensitive('delete_', this.screen.deletable);
             set_sensitive('previous', this.screen.has_previous());
             set_sensitive('next', this.screen.has_next());
@@ -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);
@@ -13309,6 +13349,15 @@ var Sao = {
         get view_index() {
             return this.views.indexOf(this.current_view);
         },
+        get next_view_type() {
+            var views = this.views.concat(this.view_to_load)
+            var next_view_index = (this.view_index + 1) % views.length;
+            var next_view = views[next_view_index];
+            if (typeof next_view != 'string') {
+                next_view = next_view.view_type;
+            }
+            return next_view;
+        },
         switch_view: function(
             view_type=null, view_id=null, creatable=null, display=true) {
             if (view_id !== null) {
@@ -13669,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;
@@ -13979,7 +14025,6 @@ var Sao = {
         },
         save_current: function() {
             var current_record = this.current_record;
-            let new_record = current_record.id < 0;
             if (!current_record) {
                 if (this.current_view &&
                     (this.current_view.view_type == 'tree') &&
@@ -13990,6 +14035,7 @@ var Sao = {
                     return jQuery.when();
                 }
             }
+            let new_record = current_record.id < 0;
             if (this.current_view) {
                 this.current_view.set_value();
                 var fields = this.current_view.get_fields();
@@ -14668,7 +14714,8 @@ var Sao = {
                     return view.display(selected_nodes);
                 } else {
                     var record;
-                    if (!jQuery.isEmptyObject(selected_nodes)) {
+                    if (!jQuery.isEmptyObject(selected_nodes) &&
+                        !this.current_record) {
                         for (const id of selected_nodes[0]) {
                             const new_record = this.group.get(id);
                             if (!new_record) {
@@ -25073,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.18",
+  "version": "7.2.20",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -828,7 +828,7 @@
                 });
             }
         };
-        this._selection_prm.done(_update_selection);
+        this._selection_prm.always(_update_selection);
     };
     Sao.common.selection_mixin.filter_selection = function(
             domain, record, field) {
@@ -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

@@ -4,7 +4,7 @@
     'use strict';
 
     function get_x2m_sub_fields(f_attrs, prefix) {
-        if (f_attrs.visible && f_attrs.views) {
+        if (f_attrs.visible && !jQuery.isEmptyObject(f_attrs.views)) {
             // There's only one key but we don't know its value
             const [[, view],] = Object.entries(f_attrs.views);
 
@@ -583,6 +583,7 @@
             this.autocompletion = {};
             this.exception = false;
             this.destroyed = false;
+            this._save_prm = jQuery.when();
         },
         get modified() {
             if (!jQuery.isEmptyObject(this.modified_fields)) {
@@ -596,33 +597,28 @@
         },
         save: function(force_reload=false) {
             var context = this.get_context();
+            if (this._save_prm.state() == 'pending') {
+                return this._save_prm.then(() => this.save(force_reload));
+            }
             var prm = jQuery.when();
             if ((this.id < 0) || this.modified) {
                 var values = this.get();
-                try {
-                    // synchronous call to avoid multiple creation or save
-                    if (this.id < 0) {
-                        this.id = this.model.execute(
-                            'create', [[values]], context,  false)[0];
-
-                    } else {
-                        if (!jQuery.isEmptyObject(values)) {
-                            context._timestamp = this.get_timestamp();
-                            this.model.execute(
-                                'write', [[this.id], values], context, false);
-                        }
-                    }
-                } catch (e) {
-                    if (e.promise) {
-                        return e.then(() => this.save(force_reload));
-                    } else {
-                        return jQuery.Deferred().reject();
+                if (this.id < 0) {
+                    prm = this.model.execute('create', [[values]], context)
+                        .then(ids => this.id = ids[0]);
+                } else {
+                    if (!jQuery.isEmptyObject(values)) {
+                        context._timestamp = this.get_timestamp();
+                        prm = this.model.execute(
+                            'write', [[this.id], values], context);
                     }
                 }
-                this.cancel();
-                if (force_reload) {
-                    return this.reload();
-                }
+                prm = prm.then(() => {
+                    this.cancel();
+                    if (force_reload) {
+                        return this.reload();
+                    }
+                });
                 if (this.group) {
                     prm = prm.then(() => this.group.written(this.id));
                 }
@@ -631,6 +627,7 @@
                 delete this.group.parent.modified_fields[this.group.child_name];
                 prm = prm.then(() => this.group.parent.save(force_reload));
             }
+            this._save_prm = prm;
             return prm;
         },
         reload: function(fields, async=true) {
@@ -2524,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) {
@@ -2533,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];
                                 }
                             }
@@ -2569,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.18',
+    __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);
@@ -927,6 +933,15 @@
         get view_index() {
             return this.views.indexOf(this.current_view);
         },
+        get next_view_type() {
+            var views = this.views.concat(this.view_to_load)
+            var next_view_index = (this.view_index + 1) % views.length;
+            var next_view = views[next_view_index];
+            if (typeof next_view != 'string') {
+                next_view = next_view.view_type;
+            }
+            return next_view;
+        },
         switch_view: function(
             view_type=null, view_id=null, creatable=null, display=true) {
             if (view_id !== null) {
@@ -1287,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;
@@ -1597,7 +1609,6 @@
         },
         save_current: function() {
             var current_record = this.current_record;
-            let new_record = current_record.id < 0;
             if (!current_record) {
                 if (this.current_view &&
                     (this.current_view.view_type == 'tree') &&
@@ -1608,6 +1619,7 @@
                     return jQuery.when();
                 }
             }
+            let new_record = current_record.id < 0;
             if (this.current_view) {
                 this.current_view.set_value();
                 var fields = this.current_view.get_fields();
@@ -2286,7 +2298,8 @@
                     return view.display(selected_nodes);
                 } else {
                     var record;
-                    if (!jQuery.isEmptyObject(selected_nodes)) {
+                    if (!jQuery.isEmptyObject(selected_nodes) &&
+                        !this.current_record) {
                         for (const id of selected_nodes[0]) {
                             const new_record = this.group.get(id);
                             if (!new_record) {

package/src/tab.js

@@ -1496,6 +1496,7 @@
                 }
             }
             const view_type = this.screen.current_view.view_type;
+            var next_view_type = this.screen.next_view_type;
             const has_views = this.screen.number_of_views > 1;
             var buttons = ['print', 'relate', 'email', 'attach'];
             for (const button_id of buttons) {
@@ -1516,7 +1517,9 @@
                 set_sensitive(button_id, position && can_be_sensitive);
             }
             set_sensitive(
-                'switch_', (position || (view_type == 'form')) && has_views);
+                'switch_',
+                (position || (view_type == 'form') || (next_view_type != 'form')) &&
+                has_views);
             set_sensitive('delete_', this.screen.deletable);
             set_sensitive('previous', this.screen.has_previous());
             set_sensitive('next', this.screen.has_next());

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();