Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 13, 2024

task-3973404

Must come back in 16.0 & 17.0

Forward-Port-Of: #11009

@robodoo
Copy link
Collaborator

robodoo commented Sep 13, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 13, 2024

@LoredanaLrpz cherrypicking of pull request #11009 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals.rst
Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals/six.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/payment_methods/terminals/six.rst
Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals/vantiv.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/payment_methods/terminals/vantiv.rst
Auto-merging content/applications/sales/point_of_sale/payment_methods/terminals/worldline.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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 17, 2024

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

8 similar comments
@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 18, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 19, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 20, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 21, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 22, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 23, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 25, 2024

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 3, 2024

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

task-3973404

Must come back in 16.0 & 17.0
@LoredanaLrpz LoredanaLrpz force-pushed the 16.0-15.0-pt-pay-lrpz-NlkK-fw branch from c0f2190 to 1eaef0c Compare October 18, 2024 07:54
@C3POdoo C3POdoo requested a review from a team October 18, 2024 07:56
@LoredanaLrpz
Copy link
Contributor

@robodoo r+

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