Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

This PR adds more details about Stripe coverage and supported payment methods and terminals.

task-3865904

Forward-Port-Of: #8718

@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 #8718 failed.

stdout:

CONFLICT (modify/delete): content/applications/finance/payment_acquirers/stripe.rst deleted in HEAD and modified in 3e34697f1 ([IMP] finance: add Stripe links for more info).  Version 3e34697f1 ([IMP] finance: add Stripe links for more info) of content/applications/finance/payment_acquirers/stripe.rst left in tree.

stderr:

18:46:48.527676 git.c:463               trace: built-in: git cherry-pick 3e34697f1b408bd0976c426f5463bf89b12be06d
error: could not apply 3e34697f1... [IMP] finance: add Stripe links for more info
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

This PR adds more details about Stripe coverage and supported payment
methods and terminals.

task-3865904
@jcs-odoo jcs-odoo force-pushed the 16.0-15.0-stripe-add-details-yaso-CW0z-fw branch from 383efdf to d9dc36d Compare April 17, 2024 12:57
@jcs-odoo
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested a review from a team April 17, 2024 12:59
robodoo pushed a commit that referenced this pull request Apr 17, 2024
This PR adds more details about Stripe coverage and supported payment
methods and terminals.

task-3865904

closes #8750

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