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

[FIX] companyweb_payment_info: Correct translations #200

Merged
merged 1 commit into from
Sep 4, 2023

Conversation

rousseldenis
Copy link
Contributor

@OCA/local-belgium-maintainers

@OCA-git-bot
Copy link
Contributor

Hi @xavier-bouquiaux,
some modules you are maintaining are being modified, check this out!

@rousseldenis rousseldenis marked this pull request as ready for review September 4, 2023 15:06
@sbidoul
Copy link
Member

sbidoul commented Sep 4, 2023

Thanks Looks trivial, so fast tracking.

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-200-by-sbidoul-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

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

To https://github.com/OCA/l10n-belgium
 ! [rejected]        16.0-ocabot-merge-pr-200-by-sbidoul-bump-patch -> 16.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/l10n-belgium'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@OCA-git-bot OCA-git-bot merged commit d05523c into OCA:16.0 Sep 4, 2023
4 checks passed
@OCA-git-bot
Copy link
Contributor

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

@sbidoul sbidoul deleted the 16.0-fix-pre-commit-dro branch September 4, 2023 17:28
@sbidoul
Copy link
Member

sbidoul commented Sep 4, 2023

Hm. Weird error. It is merged correctly though. Probably a side effect of the new README generator creating a commit that updates the digest in README.rst because the manifest was updated with the new version number. Something to chew on for me...

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