Skip to content

[IMP] POS: payment in self-ordering mode - #19804

Closed
fw-bot wants to merge 1 commit into
saas-18.4from
saas-18.4-18.0-pos-self-ordering-lman-561545-fw
Closed

[IMP] POS: payment in self-ordering mode#19804
fw-bot wants to merge 1 commit into
saas-18.4from
saas-18.4-18.0-pos-self-ordering-lman-561545-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Aug 27, 2026

Copy link
Copy Markdown
Collaborator

task-4765943

Forward-Port-Of: #19417

@robodoo

robodoo commented Aug 27, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Aug 27, 2026

Copy link
Copy Markdown
Collaborator Author

@lman-odoo @mcsi-odoo cherrypicking of pull request #19417 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
Auto-merging content/applications/sales/point_of_sale/self_order.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo
C3POdoo requested a review from a team August 28, 2026 07:11
@lman-odoo
lman-odoo removed the request for review from a team August 28, 2026 08:01
@lman-odoo

Copy link
Copy Markdown
Contributor

@robodoo r+

@robodoo

robodoo commented Aug 28, 2026

Copy link
Copy Markdown
Collaborator

@lman-odoo @mcsi-odoo because this PR has multiple commits, I need to know how to merge it:

  • merge to merge directly, using the PR as merge commit message
  • rebase-merge to rebase and merge, using the PR as merge commit message
  • rebase-ff to rebase and fast-forward

task-4765943

X-original-commit: e0377a4

[IMP] POS: payment in self-ordering mode

task-4765943

X-original-commit: e0377a4
@lman-odoo
lman-odoo force-pushed the saas-18.4-18.0-pos-self-ordering-lman-561545-fw branch from 67445c3 to a42cc75 Compare August 28, 2026 08:09
@lman-odoo

Copy link
Copy Markdown
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Aug 28, 2026
task-4765943

X-original-commit: e0377a4

[IMP] POS: payment in self-ordering mode

task-4765943

closes #19804

X-original-commit: e0377a4
Signed-off-by: Siobhan McGonigle (mcsi) <mcsi@odoo.com>
Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
@robodoo robodoo closed this Aug 28, 2026
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