Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] Export xlsx: export value for non-exportable formulas #4164

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 3, 2024

The recent fix in #3622 combined with a slight refactoring of the export for Excel in #2090 let to a situation where cells with non-exportable formulas containing references did not have their content replaced by the evaluated result.

Task: 3895465

Description:

description of this task, what is implemented and why it is implemented that way.

Task: : TASK_ID

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #4147
Forward-Port-Of: #4146

@robodoo
Copy link
Collaborator

robodoo commented May 3, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 3, 2024

@rrahir @LucasLefevre cherrypicking of pull request #4146 failed.

stdout:

Auto-merging src/plugins/core/cell.ts
Auto-merging src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts
CONFLICT (content): Merge conflict in src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts
Auto-merging tests/xlsx/xlsx_export.test.ts

stderr:

10:10:55.953887 git.c:463               trace: built-in: git cherry-pick bb7fa4884cbeaae1ffabb72ed3e0a0e216d3992b
error: could not apply bb7fa4884... [FIX] Export xlsx: export value for non-exportable formulas
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

The recent fix in #3622
combined with a slight refactoring of the export for Excel in
#2090 let to a situation where
cells with non-exportable formulas containing references did not have
their content replaced by the evaluated result.

Task: 3895465
X-original-commit: e8d1444
@LucasLefevre LucasLefevre force-pushed the saas-17.1-saas-16.4-fix-non-exported-functions-with-deps-rar-ADMk-fw branch from ff80839 to e6807d9 Compare May 3, 2024 08:16
Copy link
Collaborator

@LucasLefevre LucasLefevre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo r+

robodoo pushed a commit that referenced this pull request May 3, 2024
The recent fix in #3622
combined with a slight refactoring of the export for Excel in
#2090 let to a situation where
cells with non-exportable formulas containing references did not have
their content replaced by the evaluated result.

closes #4164

Task: 3895465
X-original-commit: e8d1444
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
@robodoo robodoo closed this May 3, 2024
@fw-bot fw-bot deleted the saas-17.1-saas-16.4-fix-non-exported-functions-with-deps-rar-ADMk-fw branch May 17, 2024 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants