tryton-sao 6.0.13 → 6.0.16

package/CHANGELOG

@@ -1,3 +1,12 @@
+Version 6.0.16 - 2022-04-15
+* Bug fixes (see mercurial logs for details)
+
+Version 6.0.15 - 2022-03-01
+* Bug fixes (see mercurial logs for details)
+
+Version 6.0.14 - 2022-02-16
+* Bug fixes (see mercurial logs for details)
+
 Version 6.0.13 - 2022-02-01
 * Bug fixes (see mercurial logs for details)
 

package/Gruntfile.js

@@ -135,6 +135,7 @@ module.exports = function(grunt) {
     },
     qunit: {
         options: {
+            timeout: 300000,
             puppeteer: {
                 headless: true,
                 args: [

package/dist/tryton-sao.js

@@ -1244,7 +1244,7 @@ var Sao = {};
                     name = data.error[1][0];
                     msg = data.error[1][1];
                     description = data.error[1][2];
-                    Sao.common.userwarning.run(msg, description)
+                    Sao.common.userwarning.run(description, msg)
                         .then(function(result) {
                             if (!~['always', 'ok'].indexOf(result)) {
                                 dfd.reject();
@@ -2194,10 +2194,14 @@ var Sao = {};
     });
 
     Sao.PYSON.In.eval_ = function(value, context) {
-        if (value.v.indexOf) {
-            return Boolean(~value.v.indexOf(value.k));
+        if (value.v) {
+            if (value.v.indexOf) {
+                return Boolean(~value.v.indexOf(value.k));
+            } else {
+                return !!value.v[value.k];
+            }
         } else {
-            return !!value.v[value.k];
+            return false;
         }
     };
     Sao.PYSON.In.init_from_object = function(obj) {
@@ -6114,8 +6118,8 @@ var Sao = {};
             dialog.body.append(jQuery('<div/>', {
                 'class': 'checkbox',
             }).append(jQuery('<label/>')
-                .append(always)
-                .text(Sao.i18n.gettext('Always ignore this warning.')))
+                .text(Sao.i18n.gettext("Always ignore this warning."))
+                .prepend(always))
             );
             dialog.body.append(jQuery('<p/>')
                     .text(Sao.i18n.gettext('Do you want to proceed?')));
@@ -7722,7 +7726,7 @@ var Sao = {};
                     return;
                 }
             }
-            if (this.group.prm.state() == 'pending') {
+            if (async && this.group.prm.state() == 'pending') {
                 return this.group.prm.then(function() {
                     return this.load(name);
                 }.bind(this));
@@ -9103,27 +9107,16 @@ var Sao = {};
         set: function(record, value) {
             var rec_name = (
                 record._values[this.name + '.'] || {}).rec_name || '';
-            var store_rec_name = function(rec_name) {
-                Sao.setdefault(
-                    record._values, this.name + '.', {})
-                    .rec_name = rec_name[0].rec_name;
-            };
             if (!rec_name && (value >= 0) && (value !== null)) {
                 var model_name = record.model.fields[this.name].description
                     .relation;
-                Sao.rpc({
+                rec_name = Sao.rpc({
                     'method': 'model.' + model_name + '.read',
                     'params': [[value], ['rec_name'], record.get_context()]
-                }, record.model.session).done(store_rec_name.bind(this)).done(
-                        function() {
-                            record.group.root_group.screens.forEach(
-                                function(screen) {
-                                    screen.display();
-                            });
-                       });
-            } else {
-                store_rec_name.call(this, [{'rec_name': rec_name}]);
+                }, record.model.session, false)[0].rec_name;
             }
+            Sao.setdefault(
+                record._values, this.name + '.', {}).rec_name = rec_name;
             record._values[this.name] = value;
         },
         set_client: function(record, value, force_change) {
@@ -9674,26 +9667,21 @@ var Sao = {};
             }
             var rec_name = (
                 record._values[this.name + '.'] || {}).rec_name || '';
-            var store_rec_name = function(rec_name) {
-                Sao.setdefault(
-                    record._values, this.name + '.', {}).rec_name = rec_name;
-            }.bind(this);
             if (ref_model && ref_id !== null && ref_id >= 0) {
                 if (!rec_name && ref_id >= 0) {
-                    Sao.rpc({
+                    rec_name = Sao.rpc({
                         'method': 'model.' + ref_model + '.read',
                         'params': [[ref_id], ['rec_name'], record.get_context()]
-                    }, record.model.session).done(function(result) {
-                        store_rec_name(result[0].rec_name);
-                    });
+                    }, record.model.session, false)[0].rec_name;
                 }
             } else if (ref_model) {
                 rec_name = '';
             } else {
                 rec_name = ref_id;
             }
+            Sao.setdefault(
+                record._values, this.name + '.', {}).rec_name = rec_name;
             record._values[this.name] = [ref_model, ref_id];
-            store_rec_name(rec_name);
         },
         get_on_change_value: function(record) {
             if ((record.group.parent_name == this.name) &&
@@ -10161,10 +10149,16 @@ var Sao = {};
                 this.buttons[item.id].click(item, function(event) {
                     var item = event.data;
                     var button = this.buttons[item.id];
-                    button.prop('disabled', true);
+                    // Use data instead of disabled prop because the action may
+                    // actually disable the button.
+                    if (button.data('disabled')) {
+                        event.preventDefault();
+                        return;
+                    }
+                    button.data('disabled', true);
                     (this[item.id](this) || jQuery.when())
                         .always(function() {
-                            button.prop('disabled', false);
+                            button.data('disabled', false);
                         });
                 }.bind(this));
             };
@@ -10607,13 +10601,14 @@ var Sao = {};
                         menu.children().length);
                 }
 
-                if (menu_action[0] == 'print') {
-                    if (toolbars.exports.length && toolbars.print.length) {
+                if ((menu_action[0] == 'print') &&
+                    toolbars.exports.length) {
+                    button._can_be_sensitive = true;
+                    if (toolbars.print.length) {
                         menu.append(jQuery('<li/>', {
                             'role': 'separator',
                             'class': 'divider',
                         }));
-                        button._can_be_sensitive = true;
                     }
                     toolbars.exports.forEach(function(export_) {
                         var item = jQuery('<li/>', {
@@ -12285,11 +12280,11 @@ var Sao = {};
                     var value = this._parse(this.format, date.val());
                     value = this._format(this.format, value);
                     date.val(value);
-                });
+                }.bind(this));
                 mousetrap.bind('=', function(e, combo) {
                     e.preventDefault();
                     date.val(this._format(this.format, moment()));
-                });
+                }.bind(this));
 
                 Sao.common.DATE_OPERATORS.forEach(function(operator) {
                     mousetrap.bind(operator[0], function(e, combo) {
@@ -13567,6 +13562,7 @@ var Sao = {};
                         return record.model.execute(attributes.name, [values],
                             this.context).then(function(changes) {
                             record.set_on_change(changes);
+                            record.group.changed();
                             record.group.root_group.screens.forEach(
                                 function(screen) {
                                     screen.display();
@@ -14907,6 +14903,7 @@ function eval_pyson(value){
             this.el = jQuery('<button/>', {
                 'class': this.class_ + ' btn btn-link',
                 'name': attributes.name,
+                'type': 'button',
             });
             if (attributes.icon) {
                 var img = jQuery('<img/>', {
@@ -21135,9 +21132,13 @@ function eval_pyson(value){
                                             }.bind(this));
                                     }
                                 } else {
-                                    this._get_column_td(next_column, next_row)
-                                        .trigger('click')
-                                        .find(':input,[tabindex=0]').focus();
+                                    prm.then(function() {
+                                        this._get_column_td(
+                                            next_column, next_row)
+                                            .trigger('click')
+                                            .find(':input,[tabindex=0]')
+                                            .focus();
+                                    }.bind(this));
                                 }
                             }
                         }.bind(this));