Skip to content

Conversation

@alexis-via
Copy link
Contributor

This is a backport of 18.0 fixes

@alexis-via
Copy link
Contributor Author

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

@alexis-via The merge process could not start, because command `git merge --no-ff -m 'Merge PR #704 into 16.0

Signed-off-by alexis-via' tmp-pr-704` failed with output:

Auto-merging l10n_fr_account_invoice_import_facturx/wizard/account_invoice_import.py
CONFLICT (content): Merge conflict in l10n_fr_account_invoice_import_facturx/wizard/account_invoice_import.py
Automatic merge failed; fix conflicts and then commit the result.

@alexis-via alexis-via force-pushed the 16-imp-l10n_fr_import_modules branch from ad94019 to d8e2d8f Compare January 16, 2026 17:50
@alexis-via
Copy link
Contributor Author

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-704-by-alexis-via-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 2806fef into OCA:16.0 Jan 16, 2026
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 5bdd899. 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.

2 participants