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: show the loading PoS data error #161624

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 12, 2024

Before this commit, if there was an error, the PoS stays on
the loading page which was confusing for the user.

owp-3834647


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

Forward-Port-Of: #160113
Forward-Port-Of: #159710

@robodoo
Copy link
Contributor

robodoo commented Apr 12, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 12, 2024

@pedrambiria @adgu-odoo cherrypicking of pull request #159710 failed.

stdout:

Auto-merging addons/point_of_sale/static/src/app/main.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/main.js

stderr:

10:24:19.145007 git.c:463               trace: built-in: git cherry-pick 74901d1fc916fe405e29edc56542efa34f760b8e
error: could not apply 74901d1fc916... [FIX] point_of_sale: show the loading PoS data error
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 Apr 12, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 12, 2024
Before this commit, if there was an error, the PoS stays on
the loading page which was confusing for the user.

owp-3834647

X-original-commit: da88f6b
@pedrambiria pedrambiria force-pushed the saas-17.2-17.0-fix-pos-3834647-pebr-g4-t-fw branch from a4f66ac to fd3d2c6 Compare April 12, 2024 13:26
@C3POdoo C3POdoo requested review from a team and caburj and removed request for a team April 12, 2024 13:53
@pedrambiria
Copy link
Contributor

Hello @xmo-odoo
could you please put a security override on this branch?

@xmo-odoo
Copy link
Collaborator

@robodoo override=ci/security

@pedrambiria
Copy link
Contributor

robodoo r+

robodoo pushed a commit that referenced this pull request Apr 18, 2024
Before this commit, if there was an error, the PoS stays on
the loading page which was confusing for the user.

owp-3834647

closes #161624

X-original-commit: da88f6b
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
@robodoo robodoo closed this Apr 18, 2024
@fw-bot fw-bot deleted the saas-17.2-17.0-fix-pos-3834647-pebr-g4-t-fw branch May 2, 2024 12:47
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 RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants