Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 15, 2024

This PR adds the Worldline terminal models we support to better redirect our clients and colleagues when using Worldline terminals.

task-3865904

Forward-Port-Of: #8714

@robodoo
Copy link
Collaborator

robodoo commented Apr 15, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 15, 2024

@Ysoroko @jcs-odoo cherrypicking of pull request #8714 failed.

stdout:

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

stderr:

21:56:10.738695 git.c:463               trace: built-in: git cherry-pick b68cd75900134c751f40269ed4cd6daeaf503817
error: could not apply b68cd7590... [IMP] point_of_sale: add Worldline terminal models
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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

@jcs-odoo jcs-odoo force-pushed the 16.0-15.0-worldline-models-added-yaso-1tcb-fw branch from 522f502 to 2a894b0 Compare April 17, 2024 13:05
This PR adds the Worldline terminal models we support to better redirect
our clients and colleagues when using Worldline terminals.

task-3865904
@jcs-odoo jcs-odoo force-pushed the 16.0-15.0-worldline-models-added-yaso-1tcb-fw branch from 2a894b0 to 5e88787 Compare April 17, 2024 13:06
@C3POdoo C3POdoo requested a review from a team April 17, 2024 13:07
@jcs-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 17, 2024
This PR adds the Worldline terminal models we support to better redirect
our clients and colleagues when using Worldline terminals.

task-3865904

closes #8757

Signed-off-by: Jonathan Castillo (jcs) <jcs@odoo.com>
@robodoo robodoo closed this Apr 17, 2024
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.

4 participants