tryton-sao 6.0.30 → 6.0.32

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.0.32 - 2023-11-03
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 6.0.31 - 2023-10-04
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.0.30 - 2023-05-17
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -7238,18 +7238,18 @@ var Sao = {};
             if (this.indexOf(record) < 0) {
                 this.splice(position, 0, record);
             }
-            for (var record_rm in this.record_removed) {
+            this.record_removed.forEach(function(record_rm) {
                 if (record_rm.id == record.id) {
                     this.record_removed.splice(
                             this.record_removed.indexOf(record_rm), 1);
                 }
-            }
-            for (var record_del in this.record_deleted) {
+            });
+            this.record_deleted.forEach(function(record_del) {
                 if (record_del.id == record.id) {
                     this.record_deleted.splice(
                             this.record_deleted.indexOf(record_del), 1);
                 }
-            }
+            });
             record._changed.id = true;
             if (changed) {
                 this.changed();
@@ -8131,7 +8131,7 @@ var Sao = {};
         get_eval: function() {
             var value = {};
             for (var key in this.model.fields) {
-                if (!this.model.fields.hasOwnProperty(key) && this.id >= 0)
+                if (!this._loaded.hasOwnProperty(key) && this.id >= 0)
                     continue;
                 value[key] = this.model.fields[key].get_eval(this);
             }
@@ -10933,6 +10933,7 @@ var Sao = {};
                         revision.add(1, 'milliseconds');
                     }
                     if ((this.screen.current_view.view_type == 'form') &&
+                            revision &&
                             (revision < revisions[revisions.length - 1][0])) {
                         revision = revisions[revisions.length - 1][0];
                     }
@@ -10961,8 +10962,14 @@ var Sao = {};
                 return this.screen.model.execute('history_revisions',
                     [ids], this.screen.context)
                     .then(function(revisions) {
-                        new Sao.Window.Revision(revisions, set_revision(revisions));
-                    });
+                        var revision = this.screen.context._datetime;
+                        if (revision) {
+                            // Remove a millisecond as microseconds are truncated
+                            revision.add(-1, 'milliseconds');
+                        }
+                        new Sao.Window.Revision(
+                            revisions, revision, set_revision(revisions));
+                    }.bind(this));
             }.bind(this));
         },
         update_revision: function() {
@@ -12671,7 +12678,8 @@ var Sao = {};
             var domain = this.search_domain(search_string, true);
 
             var context = this.context;
-            if (this.screen_container.but_active.hasClass('active')) {
+            if ((this.screen_container.but_active.css('display') != 'none') &&
+                this.screen_container.but_active.hasClass('active')) {
                 context.active_test = false;
             }
             var search = function() {
@@ -12752,7 +12760,8 @@ var Sao = {};
             } else {
                 domain = this.domain;
             }
-            if (this.screen_container.but_active.hasClass('active')) {
+            if ((this.screen_container.but_active.css('display') != 'none') &&
+                this.screen_container.but_active.hasClass('active')) {
                 if (!jQuery.isEmptyObject(domain)) {
                     domain = [domain, ['active', '=', false]];
                 } else {
@@ -12939,6 +12948,17 @@ var Sao = {};
                         deferreds.push(this.views[i].display());
                     }
                 }
+                if (this.current_view.view_type == 'tree') {
+                    var view_tree = this.fields_view_tree[
+                        this.current_view.view_id] || {};
+                    if ('active' in view_tree.fields) {
+                        this.screen_container.but_active.show();
+                    } else {
+                        this.screen_container.but_active.hide();
+                    }
+                } else {
+                    this.screen_container.but_active.hide();
+                }
             }
             return jQuery.when.apply(jQuery, deferreds).then(function() {
                 return this.set_tree_state().then(function() {
@@ -13377,12 +13397,6 @@ var Sao = {};
                 fields = dom_fields;
             }
 
-            if ('active' in view_tree.fields) {
-                this.screen_container.but_active.show();
-            } else {
-                this.screen_container.but_active.hide();
-            }
-
             // Add common fields
             [
                 ['id', Sao.i18n.gettext('ID'), 'integer'],
@@ -23348,8 +23362,7 @@ function eval_pyson(value){
                 }
             }.bind(this));
 
-            var readonly = (this.screen.attributes.readonly ||
-                    this.screen.group.readonly);
+            var readonly = this.screen.readonly || this.screen.group.readonly;
 
             this._initial_value = null;
             if (view_type == 'form') {
@@ -23386,7 +23399,7 @@ function eval_pyson(value){
                 }.bind(this)));
             }
 
-            if (this.save_current) {
+            if (this.save_current && !readonly) {
                 dialog.footer.append(jQuery('<button/>', {
                     'class': 'btn btn-primary',
                     'type': 'submit'
@@ -23542,7 +23555,7 @@ function eval_pyson(value){
             var name = '_';
             var access = Sao.common.MODELACCESS.get(this.screen.model_name);
             var deletable = this.screen.deletable;
-            var readonly = this.screen.group.readonly || this.screen.readonly;
+            var readonly = this.screen.readonly || this.screen.group.readonly;
             if (data[0] >= 1) {
                 name = data[0];
                 if (this.domain) {
@@ -23619,7 +23632,7 @@ function eval_pyson(value){
         response: function(response_id) {
             var result;
             this.screen.current_view.set_value();
-            var readonly = this.screen.group.readonly;
+            var readonly = this.screen.readonly || this.screen.group.readonly;
             if (~['RESPONSE_OK', 'RESPONSE_ACCEPT'].indexOf(response_id) &&
                     !readonly &&
                     this.screen.current_record) {
@@ -24092,7 +24105,7 @@ function eval_pyson(value){
     });
 
     Sao.Window.Revision = Sao.class_(Object, {
-        init: function(revisions, callback) {
+        init: function(revisions, revision, callback) {
             this.callback = callback;
             var dialog = new Sao.Dialog(
                     Sao.i18n.gettext('Revision'), '', 'lg');
@@ -24133,13 +24146,16 @@ function eval_pyson(value){
             }));
             revisions.forEach(function(revision) {
                 var name = revision[2];
-                revision = revision[0];
+                rev = revision[0];
                 this.select.append(jQuery('<option/>', {
-                    value: revision.valueOf(),
+                    value: rev.valueOf(),
                     text: Sao.common.format_datetime(
-                        date_format + ' ' + time_format, revision) + ' ' + name,
+                        date_format + ' ' + time_format, rev) + ' ' + name,
                 }));
             }.bind(this));
+            if (revision) {
+                this.select.val(revision.valueOf());
+            }
             this.el.modal('show');
             this.el.on('hidden.bs.modal', function(event) {
                 jQuery(this).remove();