tryton-sao 8.0.3 → 8.0.4

package/CHANGELOG

@@ -1,4 +1,9 @@
 
+Version 8.0.4 - 2026-06-02
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 8.0.3 - 2026-05-20
 --------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '8.0.3',
+    __version__: '8.0.4',
 };
 /* eslint-enable no-redeclare */
 
@@ -1490,11 +1490,6 @@ var Sao = {
         };
 
         var ajax_error = function(query, status_, error) {
-            if (!process_exception) {
-                console.debug(`RPC error calling ${args}: ${status_}: ${error}.`);
-                dfd.reject();
-                return;
-            }
             if (query.status == 503) {
                 this.retries++;
                 if (this.retries < 5) {
@@ -1520,8 +1515,7 @@ var Sao = {
                     }
                     return;
                 }
-            }
-            if (query.status == 401) {
+            } else if (query.status == 401) {
                 //Try to relog
                 Sao.Session.renew(session).then(function() {
                     if (async) {
@@ -1531,6 +1525,10 @@ var Sao = {
                         dfd.resolve();
                     }
                 }, dfd.reject);
+            } else if (!process_exception) {
+                console.debug(`RPC error calling ${args}: ${status_}: ${error}.`);
+                dfd.reject();
+                return;
             } else {
                 var err_msg = `[${query.status}] ${error}`;
                 Sao.common.message.run(
@@ -4965,7 +4963,9 @@ var Sao = {
             };
 
             var complete_datetime = function() {
-                return [Sao.Date(), Sao.DateTime().utc()];
+                return [Sao.Date(), Sao.DateTime(
+                    undefined, undefined, undefined,
+                    0, 0, 0, 0, true)];
             };
 
             var complete_date = function() {
@@ -5272,6 +5272,32 @@ var Sao = {
                                     ]);
                             return;
                         }
+                        if ((typeof value == 'string') &&
+                            ['datetime', 'timestamp'].includes(field.type) &&
+                            (operator == '=')) {
+                            let ctx, format_, parsed_date;
+                            if (this.context && Object.keys(this.context).length) {
+                                ctx = this.context;
+                            } else {
+                                ctx = {};
+                            }
+                            format_ = Sao.common.date_format(ctx.date_format);
+                            parsed_date = Sao.common.parse_date(format_, value);
+                            if (parsed_date &&
+                                (Sao.common.format_date(format_, parsed_date) == value)) {
+                                let date = Sao.DateTime.combine(parsed_date, Sao.Time());
+                                let next_day = Sao.DateTime(
+                                    date.year(), date.month(), date.date(),
+                                    date.hour(), date.minute(), date.second(),
+                                    date.millisecond())
+                                next_day.add(1, 'day');
+                                result.push(this._clausify([
+                                    [field_name, '>=', date],
+                                    [field_name, '<', next_day]
+                                ]));
+                                return;
+                            }
+                        }
                     }
                     if (['many2one', 'one2many', 'many2many', 'one2one',
                         'many2many', 'one2one'].includes(field.type) && value) {
@@ -19158,9 +19184,8 @@ function eval_pyson(value){
             if (record) {
                 var fields = this.screen.current_view.get_fields();
                 if (!record.validate(fields)) {
-                    this.screen.display(true);
-                    prm.reject();
-                    return;
+                    this.screen.display(true).always(() => prm.reject());
+                    return prm;
                 }
                 if (this.screen.pre_validate) {
                     return record.pre_validate().then(
@@ -23904,7 +23929,7 @@ function eval_pyson(value){
                 fields, false, false)) {
                 var value = cell.prop('checked');
                 this.field.set_client(record, value);
-                if (record !== current_record) {
+                if ((!this.group.parent) & (record !== current_record)) {
                     // we can not rely on editable tree handler to save the row
                     record.save();
                 }
@@ -25455,6 +25480,7 @@ function eval_pyson(value){
         },
         button_clicked: function(event) {
             if (Sao.common.compare(this.screen.selected_records, [this.record])) {
+                event.stopPropagation();
                 Sao.View.ListGroupViewForm._super.button_clicked.call(this, event);
             }
         }
@@ -28829,6 +28855,7 @@ function eval_pyson(value){
             if (this.__processing || this.__waiting_response) {
                 return jQuery.when();
             }
+            this.__processing = true;
             var process = function() {
                 if (this.state == this.end_state) {
                     return this.end();
@@ -28887,8 +28914,8 @@ function eval_pyson(value){
                     } else {
                         prms.push(execute_actions());
                     }
-                    this.__processing = false;
-                    return jQuery.when.apply(jQuery, prms);
+                    return jQuery.when.apply(jQuery, prms).then(
+                        () => this.__processing = false);
                 }, result => {
                     if (!result || !this.screen) {
                         this.state = this.end_state;
@@ -29011,11 +29038,14 @@ function eval_pyson(value){
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Form._super._get_button.call(this,
                 definition);
             this.footer.append(button.el);
             button.el.click(() => {
-                this.response(definition);
+                if (this.state === state) {
+                    this.response(definition);
+                }
             });
             return button;
         },
@@ -29063,19 +29093,24 @@ function eval_pyson(value){
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Dialog._super._get_button.call(this,
                     definition);
             this.footer.append(button.el);
             if (definition['default']) {
                 this.content.unbind('submit');
                 this.content.submit(e => {
-                    this.response(definition);
                     e.preventDefault();
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
                 button.el.attr('type', 'submit');
             } else {
                 button.el.click(() => {
-                    this.response(definition);
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
             }
             return button;

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "homepage": "https://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -1644,7 +1644,9 @@
             };
 
             var complete_datetime = function() {
-                return [Sao.Date(), Sao.DateTime().utc()];
+                return [Sao.Date(), Sao.DateTime(
+                    undefined, undefined, undefined,
+                    0, 0, 0, 0, true)];
             };
 
             var complete_date = function() {
@@ -1951,6 +1953,32 @@
                                     ]);
                             return;
                         }
+                        if ((typeof value == 'string') &&
+                            ['datetime', 'timestamp'].includes(field.type) &&
+                            (operator == '=')) {
+                            let ctx, format_, parsed_date;
+                            if (this.context && Object.keys(this.context).length) {
+                                ctx = this.context;
+                            } else {
+                                ctx = {};
+                            }
+                            format_ = Sao.common.date_format(ctx.date_format);
+                            parsed_date = Sao.common.parse_date(format_, value);
+                            if (parsed_date &&
+                                (Sao.common.format_date(format_, parsed_date) == value)) {
+                                let date = Sao.DateTime.combine(parsed_date, Sao.Time());
+                                let next_day = Sao.DateTime(
+                                    date.year(), date.month(), date.date(),
+                                    date.hour(), date.minute(), date.second(),
+                                    date.millisecond())
+                                next_day.add(1, 'day');
+                                result.push(this._clausify([
+                                    [field_name, '>=', date],
+                                    [field_name, '<', next_day]
+                                ]));
+                                return;
+                            }
+                        }
                     }
                     if (['many2one', 'one2many', 'many2many', 'one2one',
                         'many2many', 'one2one'].includes(field.type) && value) {

package/src/rpc.js

@@ -119,11 +119,6 @@
         };
 
         var ajax_error = function(query, status_, error) {
-            if (!process_exception) {
-                console.debug(`RPC error calling ${args}: ${status_}: ${error}.`);
-                dfd.reject();
-                return;
-            }
             if (query.status == 503) {
                 this.retries++;
                 if (this.retries < 5) {
@@ -149,8 +144,7 @@
                     }
                     return;
                 }
-            }
-            if (query.status == 401) {
+            } else if (query.status == 401) {
                 //Try to relog
                 Sao.Session.renew(session).then(function() {
                     if (async) {
@@ -160,6 +154,10 @@
                         dfd.resolve();
                     }
                 }, dfd.reject);
+            } else if (!process_exception) {
+                console.debug(`RPC error calling ${args}: ${status_}: ${error}.`);
+                dfd.reject();
+                return;
             } else {
                 var err_msg = `[${query.status}] ${error}`;
                 Sao.common.message.run(

package/src/sao.js

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

package/src/view/form.js

@@ -3959,9 +3959,8 @@ function eval_pyson(value){
             if (record) {
                 var fields = this.screen.current_view.get_fields();
                 if (!record.validate(fields)) {
-                    this.screen.display(true);
-                    prm.reject();
-                    return;
+                    this.screen.display(true).always(() => prm.reject());
+                    return prm;
                 }
                 if (this.screen.pre_validate) {
                     return record.pre_validate().then(

package/src/view/list_form.js

@@ -12,6 +12,7 @@
         },
         button_clicked: function(event) {
             if (Sao.common.compare(this.screen.selected_records, [this.record])) {
+                event.stopPropagation();
                 Sao.View.ListGroupViewForm._super.button_clicked.call(this, event);
             }
         }

package/src/view/tree.js

@@ -2791,7 +2791,7 @@
                 fields, false, false)) {
                 var value = cell.prop('checked');
                 this.field.set_client(record, value);
-                if (record !== current_record) {
+                if ((!this.group.parent) & (record !== current_record)) {
                     // we can not rely on editable tree handler to save the row
                     record.save();
                 }

package/src/wizard.js

@@ -55,6 +55,7 @@
             if (this.__processing || this.__waiting_response) {
                 return jQuery.when();
             }
+            this.__processing = true;
             var process = function() {
                 if (this.state == this.end_state) {
                     return this.end();
@@ -113,8 +114,8 @@
                     } else {
                         prms.push(execute_actions());
                     }
-                    this.__processing = false;
-                    return jQuery.when.apply(jQuery, prms);
+                    return jQuery.when.apply(jQuery, prms).then(
+                        () => this.__processing = false);
                 }, result => {
                     if (!result || !this.screen) {
                         this.state = this.end_state;
@@ -237,11 +238,14 @@
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Form._super._get_button.call(this,
                 definition);
             this.footer.append(button.el);
             button.el.click(() => {
-                this.response(definition);
+                if (this.state === state) {
+                    this.response(definition);
+                }
             });
             return button;
         },
@@ -289,19 +293,24 @@
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Dialog._super._get_button.call(this,
                     definition);
             this.footer.append(button.el);
             if (definition['default']) {
                 this.content.unbind('submit');
                 this.content.submit(e => {
-                    this.response(definition);
                     e.preventDefault();
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
                 button.el.attr('type', 'submit');
             } else {
                 button.el.click(() => {
-                    this.response(definition);
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
             }
             return button;

package/tests/sao.js

@@ -1933,6 +1933,12 @@
                 'name': 'integer',
                 'type': 'integer'
             },
+            'timestamp': {
+                'name': 'timestamp',
+                'string': 'Timestamp',
+                'type': 'timestamp',
+                'format': '"%H:%M:%S"',
+            },
             'selection': {
                 'string': 'Selection',
                 'name': 'selection',
@@ -2033,6 +2039,7 @@
             c(['integer', '>=', 3]),
             c(['integer', '<=', 5])
             ]]],
+        [[c(['Timestamp', null, null])], [c(['timestamp', '=', null])]],
         [[c(['Reference', null, 'foo'])],
             [c(['reference', 'ilike', '%foo%'])]],
         [[c(['Reference', null, 'Spam'])],
@@ -2073,6 +2080,33 @@
             QUnit.assert.deepEqual(parser.parse_clause(value), result,
                 'parse_clause(' + JSON.stringify(value) + ')');
         });
+
+        let clause = parser.parse_clause([c(
+            ['Timestamp', '=', Sao.common.format_date('%x', Sao.Date(2002, 12, 4))])]);
+        QUnit.assert.strictEqual(clause[0].length, 2);
+        let [ , operator, value] = clause[0][0];
+        QUnit.assert.strictEqual(operator, '>=');
+        QUnit.assert.ok(value.isSame(Sao.Date(2002, 12, 4)));
+        [ , operator, value] = clause[0][1];
+        QUnit.assert.strictEqual(operator, '<');
+        QUnit.assert.ok(value.isSame(Sao.Date(2002, 12, 5)));
+
+        clause = parser.parse_clause([c(
+            ['Timestamp', '=',
+                Sao.common.format_datetime('%x %X', Sao.DateTime(2002, 12, 4, 12, 30))])]);
+        [ , operator, value] = clause[0];
+        QUnit.assert.strictEqual(operator, '=');
+        QUnit.assert.ok(value.isSame(Sao.DateTime(2002, 12, 4, 12, 30)));
+
+        clause = parser.parse_clause([c(
+            ['Timestamp', null, [
+                        `${Sao.common.format_date('%x', Sao.Date(2002, 12, 4))}`,
+                        `${Sao.common.format_date('%x', Sao.Date(2002, 12, 5))}`,
+                        ]])]);
+        [ , operator, value] = clause[0];
+        QUnit.assert.strictEqual(operator, 'in');
+        QUnit.assert.ok(value[0].isSame(Sao.DateTime(2002, 12, 4)));
+        QUnit.assert.ok(value[1].isSame(Sao.DateTime(2002, 12, 5)));
     });
 
     QUnit.test('DomainParser.format_value', function() {