Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 28, 2025

task-4946909

Forward-Port-Of: #14384

@robodoo
Copy link
Collaborator

robodoo commented Aug 28, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 28, 2025

@emmi-odoo @auva-odoo cherrypicking of pull request #14384 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale/restaurant.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/restaurant.rst

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

@emmi-odoo emmi-odoo force-pushed the saas-18.3-18.0-pos-terminals-emmi-459394-fw branch from c997c23 to b7d7941 Compare August 29, 2025 08:30
@C3POdoo C3POdoo requested a review from a team August 29, 2025 08:33
@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 5, 2025

@emmi-odoo @auva-odoo this forward port of #14384 is awaiting action (not merged or closed).

@emmi-odoo emmi-odoo force-pushed the saas-18.3-18.0-pos-terminals-emmi-459394-fw branch from b7d7941 to 5cfa6d2 Compare September 5, 2025 08:11
@emmi-odoo emmi-odoo force-pushed the saas-18.3-18.0-pos-terminals-emmi-459394-fw branch from 5cfa6d2 to 9466a84 Compare September 5, 2025 08:36
@emmi-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Sep 5, 2025
task-4946909

closes #14439

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
Signed-off-by: Emmanuel Minga (EMMI) <emmi@odoo.com>
@robodoo robodoo closed this Sep 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants