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][IMP] POS: move replicated title into one page #11229

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 18, 2024

task-3973404

Must come back in 16.0 & 17.0

Forward-Port-Of: #11019
Forward-Port-Of: #11009

@robodoo
Copy link
Collaborator

robodoo commented Oct 18, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 18, 2024

@LoredanaLrpz cherrypicking of pull request #11009 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals.rst
CONFLICT (modify/delete): content/applications/sales/point_of_sale/payment_methods/terminals/vantiv.rst deleted in e9c19f63d4f0abae8b6d7cc0b30bbedaa72cbb94 and modified in 1eaef0c92ed253878d7dad519d45cb55ba96a1ab.  Version 1eaef0c92ed253878d7dad519d45cb55ba96a1ab of content/applications/sales/point_of_sale/payment_methods/terminals/vantiv.rst left in tree.

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 19, 2024

@LoredanaLrpz this forward port of #11009 is awaiting action (not merged or closed).

task-3973404

Must come back in 16.0 & 17.0

X-original-commit: 04a8e46
@LoredanaLrpz
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested a review from a team October 21, 2024 09:01
@robodoo
Copy link
Collaborator

robodoo commented Oct 21, 2024

@LoredanaLrpz 'ci/documentation' failed on this reviewed PR.

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