Merge PR OCA#2705 into 16.0

Signed-off-by ChrisOForgeFlow
xcgd · Jan 5, 2024 · b801538 · b801538
2 parents cf0dc77 + 62d36f4
commit b801538
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/...d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js b/...d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js
@@ -133,16 +133,22 @@ export class X2Many2DMatrixRenderer extends Component {
     getValueFieldProps(column, row) {
         const x = this.columns.findIndex((c) => c.value === column);
         const y = this.rows.findIndex((r) => r.value === row);
-        const props = this.list.activeFields[this.matrixFields.value].props;
-        const propsFromAttrs =
-            this.list.activeFields[this.matrixFields.value].propsFromAttrs;
-        const record = this.matrix[y][x].records[0];
-        let value = this.matrix[y][x].value;
-        if (!this._canAggregate()) {
-            value = record.data[this.matrixFields.value];
+        const {props, propsFromAttrs} = this.list.activeFields[this.matrixFields.value];
+        let record = null;
+        let value = null;
+        if (
+            this.matrix[y] &&
+            this.matrix[y][x] &&
+            (record = this.matrix[y][x].records[0])
+        ) {
+            record = this.matrix[y][x].records[0];
+            value = this.matrix[y][x].value;
         }
-
-        return {
+        value =
+            !this._canAggregate() && record
+                ? record.data[this.matrixFields.value]
+                : value;
+        const result = {
             ...props,
             ...propsFromAttrs,
             value: value,
@@ -151,6 +157,10 @@ export class X2Many2DMatrixRenderer extends Component {
             record: record,
             name: this.matrixFields.value,
         };
+        if (value === null) {
+            result.readonly = true;
+        }
+        return result;
     }
 }