Skip to content

[FW][FIX] point_of_sale, pos_restaurant: sync issue during order cancelation #191836

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][FIX] point_of_sale, pos_restaurant: sync issue during order cancelation #191836

wants to merge 1 commit into from

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 26, 2024

When an order is canceled, the order is removed from the store and the session. This commit ensures that the order is removed from the store

Forward-Port-Of: #191232

@robodoo
Copy link
Contributor

robodoo commented Dec 26, 2024

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 26, 2024

@davidmonnom @adgu-odoo cherrypicking of pull request #191232 failed.

stdout:

Auto-merging addons/point_of_sale/models/pos_order.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_order.py
Auto-merging addons/point_of_sale/models/pos_session.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_session.py
Auto-merging addons/point_of_sale/static/src/app/models/data_service.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/models/data_service.js
Auto-merging addons/point_of_sale/static/src/app/models/pos_order.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/models/pos_order.js
Auto-merging addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
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
Auto-merging addons/pos_restaurant/static/src/overrides/components/receipt_screen/receipt_screen.js
Auto-merging addons/pos_restaurant/static/src/overrides/models/pos_store.js

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 Dec 26, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Dec 26, 2024
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-sytnc_issue-moda-gfw--fw branch 2 times, most recently from 87150bd to da524c4 Compare December 26, 2024 17:11
@C3POdoo C3POdoo requested review from a team and adgu-odoo and removed request for a team December 26, 2024 17:14
@davidmonnom
[FIX] point_of_sale, pos_restaurant: sync issue during order cancelation
705548c 
When an order is canceled, the order is removed from the store and the
session. This commit ensures that the order is removed from the store

X-original-commit: 74c6880
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-sytnc_issue-moda-gfw--fw branch from da524c4 to 705548c Compare December 27, 2024 08:52
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 30, 2024

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

6 similar comments
@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 31, 2024

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 1, 2025

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 2, 2025

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 3, 2025

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 4, 2025

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 5, 2025

@davidmonnom @adgu-odoo this forward port of #191232 is awaiting action (not merged or closed).

@davidmonnom
Copy link
Contributor

Implemented in #192357

@davidmonnom davidmonnom closed this Jan 6, 2025
@xmo-odoo xmo-odoo deleted the 18.0-saas-17.4-sytnc_issue-moda-gfw--fw branch March 7, 2025 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adgu-odoo adgu-odoo Awaiting requested review from adgu-odoo adgu-odoo was automatically assigned from odoo/pos

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@fw-bot @robodoo @davidmonnom @C3POdoo