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

[17.0][FW] [16.0][FIX] account_payment_partner: payment mode compute #1356

Conversation

sebalix
Copy link
Contributor

@sebalix sebalix commented Sep 19, 2024

Port of #1252 from 16.0 to 17.0.

@sebalix
Copy link
Contributor Author

sebalix commented Sep 19, 2024

@sebalix sebalix marked this pull request as ready for review September 19, 2024 09:31
@pedrobaeza pedrobaeza added this to the 17.0 milestone Sep 20, 2024
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for bringing these patches to latest branches, and it's a claiming action for those doing patches and not forward-porting them.

Fast-tracking it:

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 17.0-ocabot-merge-pr-1356-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 4965138 into OCA:17.0 Sep 20, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command git push origin 17.0-ocabot-merge-pr-1356-by-pedrobaeza-bump-patch:17.0 failed with output:

To https://github.com/OCA/bank-payment
 ! [rejected]          17.0-ocabot-merge-pr-1356-by-pedrobaeza-bump-patch -> 17.0 (fetch first)
error: failed to push some refs to 'https://github.com/OCA/bank-payment'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 0ed68c3. Thanks a lot for contributing to OCA. ❤️

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