Closed fw-bot closed 2 months ago
@hokolomopo @pro-odoo cherrypicking of pull request odoo/o-spreadsheet#4568 failed.
stdout:
Auto-merging src/helpers/figures/charts/line_chart.ts
CONFLICT (content): Merge conflict in src/helpers/figures/charts/line_chart.ts
Auto-merging tests/figures/chart/chart_plugin.test.ts
stderr:
08:20:44.997010 git.c:463 trace: built-in: git cherry-pick 77df8f9b4a0e106fc52c529c84f5fde8eec4edcf --strategy ort
error: could not apply 77df8f9b4... [FIX] chart: cumulative not working for linear charts
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:
Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).
In the former case, you may want to edit this PR message as well.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
@robodoo r+
Description
The
cumulative
chart option was not working for line charts with a linear/time axis.This was because the data in the linear charts runtime was an array of objects
{x, y}
rather than an array of numbers, and this wasn't properly handled in the cumulative computations.Task: : 4028957
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4579 Forward-Port-Of: odoo/o-spreadsheet#4568