summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/pivot/pivot_model.js
diff options
context:
space:
mode:
authorMathieu Duckerts-Antoine <dam@odoo.com>2018-08-17 16:59:27 +0200
committerMathieu Duckerts-Antoine <dam@odoo.com>2018-09-04 17:34:19 +0200
commit39cfd5baa18bcddd0df58c79ab6b4eacd45d51be (patch)
tree7ec3c2aa86253c95ce75305d8b584d1def72d1e3 /addons/web/static/src/js/views/pivot/pivot_model.js
parent4f4f111349252d651c87c8b7c306565528970152 (diff)
[FIX] web: export to excel in pivot view
Exporting data of a pivot view in comparison mode ends in a crash. The root cause is that _t was replaced by _lt so that some strings were replaced by objects with a toString method. This does not cause problems when rendering a pivot view since both QWeb or JQuery call that method. The function _exportData does not. This commit fixes that situation and adds a test of _exportData.
Diffstat (limited to 'addons/web/static/src/js/views/pivot/pivot_model.js')
-rw-r--r--addons/web/static/src/js/views/pivot/pivot_model.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 466350d5e99..9abfa4861b6 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -235,8 +235,8 @@ var PivotModel = AbstractModel.extend({
additionalHeaders = additionalHeaders.concat(
_.map(
[
- this.data.timeRangeDescription,
- this.data.comparisonTimeRangeDescription,
+ this.data.timeRangeDescription.toString(),
+ this.data.comparisonTimeRangeDescription.toString(),
'Variation'
],
makeMeasure