tryton-sao 7.2.8 → 7.2.10

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.2.10 - 2024-11-06
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.2.9 - 2024-10-18
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.8 - 2024-10-05
 --------------------------
 * 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.8',
+    __version__: '7.2.10',
 };
 /* eslint-enable no-redeclare */
 
@@ -4588,10 +4588,18 @@ var Sao = {
                         .replace('not', '!').trim();
                 }
                 if (operator.endsWith('in')) {
-                    if (operator == 'not in') {
-                        operator = '!';
+                    if (value instanceof Array && value.length == 1) {
+                        if (operator == 'not in') {
+                            operator = '!=';
+                        } else {
+                            operator = '=';
+                        }
                     } else {
-                        operator = '';
+                        if (operator == 'not in') {
+                            operator = '!';
+                        } else {
+                            operator = '';
+                        }
                     }
                 }
                 var formatted_value = this.format_value(field, value, target);
@@ -5229,10 +5237,13 @@ var Sao = {
                 .replace(escape + '%', '%')
                 .replace(escape + '_', '_');
         },
-        quote: function(value) {
+        quote: function(value, empty=false) {
             if (typeof value != 'string') {
                 return value;
             }
+            if (empty && value === '') {
+                return '""';
+            }
             if (value.contains('\\')) {
                 value = value.replace(new RegExp('\\\\', 'g'), '\\\\');
             }
@@ -5391,7 +5402,8 @@ var Sao = {
                 return value;
             }
         },
-        format_value: function(field, value, target=null, context={}) {
+        format_value: function(
+            field, value, target=null, context={}, _quote_empty=false) {
             var format_float = function() {
                 if (!value && value !== 0 && value !== new Sao.Decimal(0)) {
                     return '';
@@ -5502,7 +5514,9 @@ var Sao = {
             };
             converts.timestamp = converts.datetime;
             if (value instanceof Array) {
-                return value.map(v => this.format_value(field, v)).join(';');
+                return value.map(
+                    v => this.format_value(field, v, null, context, true))
+                    .join(';');
             } else {
                 var func = converts[field.type];
                 if (func) {
@@ -5510,7 +5524,7 @@ var Sao = {
                 } else if (value === null) {
                     return '';
                 } else {
-                    return this.quote(value);
+                    return this.quote(value, _quote_empty);
                 }
             }
         },
@@ -13905,10 +13919,10 @@ var Sao = {
                     if (previous_view.view_type == 'calendar') {
                         previous_view.set_default_date(record, selected_date);
                     }
-                    this.display().done(() => {
+                    return this.display().then(() => {
                         this.set_cursor(true, true);
+                        return record;
                     });
-                    return record;
                 });
             });
         },
@@ -20152,7 +20166,7 @@ function eval_pyson(value){
             this.input.prop('disabled', readonly);
         },
         set_value: function(value) {
-            this.input.prop('checked', value);
+            this.input.prop('checked', Boolean(value));
         }
     });
 
@@ -20255,7 +20269,8 @@ function eval_pyson(value){
             return value;
         },
         set_value: function(value, options) {
-            if (value !== null) {
+            if ((typeof(value) == 'number') ||
+                (value instanceof Sao.Decimal)) {
                 this.input.val(value);
                 this.input_text.val(value.toLocaleString(
                     Sao.i18n.BC47(Sao.i18n.getlang()), options));
@@ -20390,7 +20405,13 @@ function eval_pyson(value){
             return this._parse(this.format, this.input.val());
         },
         set_value: function(value) {
-            this.input.val(this._format(this.format, value));
+            if ((value instanceof Sao.DateTime) ||
+                (value instanceof Sao.Date)) {
+                value = this._format(this.format, value);
+            } else {
+                value = '';
+            }
+            this.input.val(value);
         },
     });
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.2.8",
+  "version": "7.2.10",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -1293,10 +1293,18 @@
                         .replace('not', '!').trim();
                 }
                 if (operator.endsWith('in')) {
-                    if (operator == 'not in') {
-                        operator = '!';
+                    if (value instanceof Array && value.length == 1) {
+                        if (operator == 'not in') {
+                            operator = '!=';
+                        } else {
+                            operator = '=';
+                        }
                     } else {
-                        operator = '';
+                        if (operator == 'not in') {
+                            operator = '!';
+                        } else {
+                            operator = '';
+                        }
                     }
                 }
                 var formatted_value = this.format_value(field, value, target);
@@ -1934,10 +1942,13 @@
                 .replace(escape + '%', '%')
                 .replace(escape + '_', '_');
         },
-        quote: function(value) {
+        quote: function(value, empty=false) {
             if (typeof value != 'string') {
                 return value;
             }
+            if (empty && value === '') {
+                return '""';
+            }
             if (value.contains('\\')) {
                 value = value.replace(new RegExp('\\\\', 'g'), '\\\\');
             }
@@ -2096,7 +2107,8 @@
                 return value;
             }
         },
-        format_value: function(field, value, target=null, context={}) {
+        format_value: function(
+            field, value, target=null, context={}, _quote_empty=false) {
             var format_float = function() {
                 if (!value && value !== 0 && value !== new Sao.Decimal(0)) {
                     return '';
@@ -2207,7 +2219,9 @@
             };
             converts.timestamp = converts.datetime;
             if (value instanceof Array) {
-                return value.map(v => this.format_value(field, v)).join(';');
+                return value.map(
+                    v => this.format_value(field, v, null, context, true))
+                    .join(';');
             } else {
                 var func = converts[field.type];
                 if (func) {
@@ -2215,7 +2229,7 @@
                 } else if (value === null) {
                     return '';
                 } else {
-                    return this.quote(value);
+                    return this.quote(value, _quote_empty);
                 }
             }
         },

package/src/sao.js

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

package/src/screen.js

@@ -1544,10 +1544,10 @@
                     if (previous_view.view_type == 'calendar') {
                         previous_view.set_default_date(record, selected_date);
                     }
-                    this.display().done(() => {
+                    return this.display().then(() => {
                         this.set_cursor(true, true);
+                        return record;
                     });
-                    return record;
                 });
             });
         },

package/src/view/form.js

@@ -5317,7 +5317,7 @@ function eval_pyson(value){
             this.input.prop('disabled', readonly);
         },
         set_value: function(value) {
-            this.input.prop('checked', value);
+            this.input.prop('checked', Boolean(value));
         }
     });
 
@@ -5420,7 +5420,8 @@ function eval_pyson(value){
             return value;
         },
         set_value: function(value, options) {
-            if (value !== null) {
+            if ((typeof(value) == 'number') ||
+                (value instanceof Sao.Decimal)) {
                 this.input.val(value);
                 this.input_text.val(value.toLocaleString(
                     Sao.i18n.BC47(Sao.i18n.getlang()), options));
@@ -5555,7 +5556,13 @@ function eval_pyson(value){
             return this._parse(this.format, this.input.val());
         },
         set_value: function(value) {
-            this.input.val(this._format(this.format, value));
+            if ((value instanceof Sao.DateTime) ||
+                (value instanceof Sao.Date)) {
+                value = this._format(this.format, value);
+            } else {
+                value = '';
+            }
+            this.input.val(value);
         },
     });
 

package/tests/sao.js

@@ -2273,7 +2273,10 @@
         [[['name', 'ilike', 'Doe\\%']], 'Name: =Doe%'],
         [[['name', 'not ilike', '%Doe%']], 'Name: !Doe'],
         [[['name', 'in', ['John', 'Jane']]], 'Name: John;Jane'],
+        [[['name', 'in', ['John', '']]], 'Name: John;""'],
+        [[['name', 'in', ['John']]], 'Name: =John'],
         [[['name', 'not in', ['John', 'Jane']]], 'Name: !John;Jane'],
+        [[['name', 'not in', ['John']]], 'Name: !=John'],
         [[
             ['name', 'ilike', '%Doe%'],
             ['name', 'ilike', '%Jane%']