tryton-sao 7.4.17 → 7.4.18

package/CHANGELOG

@@ -1,4 +1,9 @@
 
+Version 7.4.18 - 2025-10-02
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.4.17 - 2025-09-15
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.4.17',
+    __version__: '7.4.18',
 };
 /* eslint-enable no-redeclare */
 
@@ -24220,20 +24220,15 @@ function eval_pyson(value){
                     }
                 };
             }
+            let keys = this._data_keys(data);
             var color = this.view.attributes.color || Sao.config.graph_color;
             var rgb = Sao.common.hex2rgb(
                 Sao.common.COLOR_SCHEMES[color] || color);
             var maxcolor = Math.max.apply(null, rgb);
-            var keys = [];
-            var i, yfield;
-            for (i = 0; i < this.yfields.length; i++) {
-                yfield = this.yfields[i];
-                keys.push(yfield.key || yfield.name);
-            }
             var colors = Sao.common.generateColorscheme(
                 color, keys, maxcolor / (keys.length || 1));
-            for (i = 0; i < this.yfields.length; i++) {
-                yfield = this.yfields[i];
+            for (let i = 0; i < this.yfields.length; i++) {
+                let yfield = this.yfields[i];
                 if (yfield.color) {
                     colors[yfield.key || yfield.name] = yfield.color;
                 }
@@ -24245,6 +24240,14 @@ function eval_pyson(value){
             };
             return c3_config;
         },
+        _data_keys: function(data) {
+            let keys = [];
+            for (let i = 0; i < this.yfields.length; i++) {
+                let yfield = this.yfields[i];
+                keys.push(yfield.key || yfield.name);
+            }
+            return keys;
+        },
         action: function(data, element) {
             var ids = this.ids[this._action_key(data)];
             var ctx = jQuery.extend({}, this.view.screen.group._context);
@@ -24343,8 +24346,16 @@ function eval_pyson(value){
 
             config.data.columns = pie_columns;
             config.data.names = pie_names;
+            config.data.order = null;
             return config;
         },
+        _data_keys: function(data) {
+            let keys = [];
+            for (let i = 0; i < data.columns[1].length - 1; i++) {
+                keys.push(i);
+            };
+            return keys;
+        },
         _add_id: function(key, id) {
             var type = this.xfield.type;
             if ((type == 'date') || (type == 'datetime')) {

package/package.json

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

package/src/sao.js

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

package/src/view/graph.js

@@ -211,20 +211,15 @@
                     }
                 };
             }
+            let keys = this._data_keys(data);
             var color = this.view.attributes.color || Sao.config.graph_color;
             var rgb = Sao.common.hex2rgb(
                 Sao.common.COLOR_SCHEMES[color] || color);
             var maxcolor = Math.max.apply(null, rgb);
-            var keys = [];
-            var i, yfield;
-            for (i = 0; i < this.yfields.length; i++) {
-                yfield = this.yfields[i];
-                keys.push(yfield.key || yfield.name);
-            }
             var colors = Sao.common.generateColorscheme(
                 color, keys, maxcolor / (keys.length || 1));
-            for (i = 0; i < this.yfields.length; i++) {
-                yfield = this.yfields[i];
+            for (let i = 0; i < this.yfields.length; i++) {
+                let yfield = this.yfields[i];
                 if (yfield.color) {
                     colors[yfield.key || yfield.name] = yfield.color;
                 }
@@ -236,6 +231,14 @@
             };
             return c3_config;
         },
+        _data_keys: function(data) {
+            let keys = [];
+            for (let i = 0; i < this.yfields.length; i++) {
+                let yfield = this.yfields[i];
+                keys.push(yfield.key || yfield.name);
+            }
+            return keys;
+        },
         action: function(data, element) {
             var ids = this.ids[this._action_key(data)];
             var ctx = jQuery.extend({}, this.view.screen.group._context);
@@ -334,8 +337,16 @@
 
             config.data.columns = pie_columns;
             config.data.names = pie_names;
+            config.data.order = null;
             return config;
         },
+        _data_keys: function(data) {
+            let keys = [];
+            for (let i = 0; i < data.columns[1].length - 1; i++) {
+                keys.push(i);
+            };
+            return keys;
+        },
         _add_id: function(key, id) {
             var type = this.xfield.type;
             if ((type == 'date') || (type == 'datetime')) {