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][IMP] spreadsheet: inherit font family #2247

Closed

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 20, 2023

Description

Now spreadsheet inherits the font family from its parent in the DOM.

Odoo task ID : 3000885

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 (_lt("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: #2108

@robodoo
Copy link
Collaborator

robodoo commented Mar 20, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 20, 2023

@hokolomopo @rrahir cherrypicking of pull request #2108 failed.

stdout:

Auto-merging src/components/composer/composer/composer.ts
CONFLICT (content): Merge conflict in src/components/composer/composer/composer.ts
Auto-merging src/components/figures/chart/scorecard/chart_scorecard.ts
Auto-merging src/components/spreadsheet/spreadsheet.ts

stderr:

16:55:26.866735 git.c:455               trace: built-in: git cherry-pick 56494c10294331f77e2c804e36f74b9013f8479f
error: could not apply 56494c10... [IMP] spreadsheet: inherit font family
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.

Now `spreadsheet` inherits the font family from its parent in the DOM.

Odoo task 3000885

X-original-commit: 93900b4
@hokolomopo hokolomopo force-pushed the saas-16.2-master-parametric-font-family-adrm-fQND-fw branch from ef47e3b to 8e9636e Compare March 27, 2023 06:40
@hokolomopo
Copy link
Contributor

@robodoo r+

@robodoo robodoo temporarily deployed to merge March 27, 2023 06:50 Inactive
@robodoo robodoo closed this in d773199 Mar 27, 2023
@robodoo robodoo closed this Mar 27, 2023
@fw-bot fw-bot deleted the saas-16.2-master-parametric-font-family-adrm-fQND-fw branch April 10, 2023 07: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.

3 participants