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 #162412

Closed

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented 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


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

Forward-Port-Of: #161624
Forward-Port-Of: #159710

@robodoo
Copy link
Contributor

robodoo commented Apr 18, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 18, 2024

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

stdout:

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

stderr:

14:42:24.885925 git.c:463               trace: built-in: git cherry-pick fd3d2c65a6c94dcbbb64c99829f131647e75e6d2
error: could not apply fd3d2c65a6c9... [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 18, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label 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

X-original-commit: 7228619
@pedrambiria pedrambiria force-pushed the master-17.0-fix-pos-3834647-pebr-WalO-fw branch from c42aec2 to 892427f Compare May 10, 2024 07:56
@C3POdoo C3POdoo requested review from a team and vlst-odoo and removed request for a team May 10, 2024 07:58
@pedrambiria
Copy link
Contributor

implementation is different 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 RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants