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] point_of_sale: display popups on top #166072

Conversation

fw-bot
Copy link
Contributor

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

Prior to this commit, popups would not appear on the login page due to its z-index being set to 1000. This commit resolves the issue by setting the staring z-index of the popups to 10000, ensuring that popups are displayed on top.

opw-3930943


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #166016

Prior to this commit, popups would not appear on the login page due
to its z-index being set to 1000. This commit resolves the issue by
setting the staring z-index of the popups to 10000, ensuring that
popups are displayed on top.

opw-3930943

X-original-commit: 27620de
@robodoo
Copy link
Contributor

robodoo commented May 17, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented May 17, 2024

@pedrambiria @caburj cherrypicking of pull request #166016 failed.

stdout:

CONFLICT (modify/delete): addons/point_of_sale/static/src/app/popup/popup_service.js deleted in HEAD and modified in bc0bbed10aa5 ([FIX] point_of_sale: display popups on top).  Version bc0bbed10aa5 ([FIX] point_of_sale: display popups on top) of addons/point_of_sale/static/src/app/popup/popup_service.js left in tree.

stderr:

22:03:14.528026 git.c:463               trace: built-in: git cherry-pick bc0bbed10aa56a4d478c2c47e944fd4719af77df
error: could not apply bc0bbed10aa5... [FIX] point_of_sale: display popups on top
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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels May 17, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label May 17, 2024
@pedrambiria
Copy link
Contributor

It's not an issue in this version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants