Closed fw-bot closed 2 weeks ago
@pro-odoo @LucasLefevre cherrypicking of pull request odoo/o-spreadsheet#4515 failed.
stdout:
Auto-merging src/plugins/ui_core_views/pivot_ui.ts
CONFLICT (content): Merge conflict in src/plugins/ui_core_views/pivot_ui.ts
stderr:
08:31:43.780952 git.c:463 trace: built-in: git cherry-pick 1362eafeed7cf26f48a38bd16ede6978a4c5706d --strategy ort
error: could not apply 1362eafee... [FIX] spreadsheet: correctly get pivot id from position
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
Steps to reproduce in 17.0:
There's no way to reproduce the issue in 17.0 because the faulty getter in only called on positions in the active sheet (pivot autofill, global filter auto-matching)
Steps to reproduce in saas-17.1:
Task: 3859472 X-original-commit: https://github.com/odoo/odoo/commit/0f9161ebc3589678fea5a0b242b00c01b8df2725
Description:
description of this task, what is implemented and why it is implemented that way.
Task: : TASK_ID
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4515