Merge PR #1942 into 14.0

Signed-off-by etobella
pull/2322/head
OCA-git-bot 2022-10-16 20:23:05 +00:00
commit eb2290dc9f
1 changed files with 4 additions and 8 deletions

View File

@ -59,17 +59,13 @@ odoo.define("web_widget_x2many_2d_matrix.widget", function (require) {
) )
); );
} }
this.show_row_totals = this.parse_boolean( this.show_row_totals = Boolean(
node.show_row_totals || this.parse_boolean(node.show_row_totals || "1") &&
this.is_aggregatable(field_defs[this.field_value]) this.is_aggregatable(field_defs[this.field_value])
? "1"
: ""
); );
this.show_column_totals = this.parse_boolean( this.show_column_totals = Boolean(
node.show_column_totals || this.parse_boolean(node.show_column_totals || "1") &&
this.is_aggregatable(field_defs[this.field_value]) this.is_aggregatable(field_defs[this.field_value])
? "1"
: ""
); );
}, },