[MERGE] forward port branch saas-10 up to 897b9b8

This commit is contained in:
Christophe Simonis
2016-09-02 16:28:28 +02:00
36 changed files with 446 additions and 138 deletions
@@ -1440,7 +1440,7 @@ var FieldStatus = common.AbstractField.extend({
});
}
}
}, 300),
}, 300, true),
});
var FieldMonetary = FieldFloat.extend({
@@ -692,7 +692,6 @@ var PivotView = View.extend({
if (width > 1) {
var total_cell = {width:nbr_measures, height: depth, title:""};
if (nbr_measures === 1) {
total_cell.title = this.measures[this.active_measures[0]].string;
total_cell.total = true;
}
result[0].push(total_cell);