Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Oct 31, 2025

Menu mode was broken in self ordering. This commit fix it.

Forward-Port-Of: #232503

@robodoo
Copy link
Contributor

robodoo commented Oct 31, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Oct 31, 2025

@davidmonnom @stva-odoo cherrypicking of pull request #232503 failed.

stdout:

Auto-merging addons/pos_self_order/controllers/self_entry.py
Auto-merging addons/pos_self_order/static/src/app/services/data_service.js
Auto-merging addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
CONFLICT (content): Merge conflict in addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
Auto-merging addons/pos_self_order/static/tests/tours/utils/common.js
Auto-merging addons/pos_self_order/tests/test_self_order_mobile.py

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 Oct 31, 2025
@davidmonnom davidmonnom force-pushed the saas-18.2-18.0-fix_self_order-moda-471963-fw branch from f91cadc to 460f65b Compare November 3, 2025 14:22
@C3POdoo C3POdoo requested review from a team and manv-afk and removed request for a team November 3, 2025 14:49
@davidmonnom davidmonnom force-pushed the saas-18.2-18.0-fix_self_order-moda-471963-fw branch 2 times, most recently from 5d2a91b to 207f325 Compare November 4, 2025 10:28
Menu mode was broken in self ordering. This commit fix it.

X-original-commit: b2a9e43
@davidmonnom davidmonnom force-pushed the saas-18.2-18.0-fix_self_order-moda-471963-fw branch from 207f325 to 0255175 Compare November 4, 2025 18:51
Copy link
Contributor

@davidmonnom davidmonnom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo pushed a commit that referenced this pull request Nov 4, 2025
Menu mode was broken in self ordering. This commit fix it.

closes #234019

X-original-commit: b2a9e43
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
@robodoo robodoo closed this Nov 4, 2025
@fw-bot fw-bot deleted the saas-18.2-18.0-fix_self_order-moda-471963-fw branch November 11, 2025 23:43
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants