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

18.0 mig l10n fr siret lookup #579

Open
wants to merge 21 commits into
base: 18.0
Choose a base branch
from

Conversation

fredericgrall
Copy link

No description provided.

alexis-via and others added 17 commits October 30, 2024 09:51
Rename wizard obj to fr.siret.lookup
Test on stdnum version number
Currently translated at 97.7% (43 of 44 strings)

Translation: l10n-france-14.0/l10n-france-14.0-l10n_fr_siret_lookup
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-14-0/l10n-france-14-0-l10n_fr_siret_lookup/fr/
'codedepartementetablissement' is not always set (in particular for companies in Corsica), so we now only use codepostaletablissement
Currently translated at 100.0% (44 of 44 strings)

Translation: l10n-france-14.0/l10n-france-14.0-l10n_fr_siret_lookup
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-14-0/l10n-france-14-0-l10n_fr_siret_lookup/fr/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-france-16.0/l10n-france-16.0-l10n_fr_siret_lookup
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-16-0/l10n-france-16-0-l10n_fr_siret_lookup/
Currently translated at 100.0% (44 of 44 strings)

Translation: l10n-france-16.0/l10n-france-16.0-l10n_fr_siret_lookup
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-16-0/l10n-france-16-0-l10n_fr_siret_lookup/es/
@fredericgrall fredericgrall mentioned this pull request Oct 30, 2024
17 tasks
@sbidoul
Copy link
Member

sbidoul commented Nov 24, 2024

/ocabot migration l10n_fr_siret_lookup

@OCA-git-bot
Copy link
Contributor

@sbidoul The migration issue commenter process could not start, because of exception Command '['git', 'fetch', '--quiet', '--force', '--prune', 'https://github.com/OCA/l10n-france', 'refs/heads/:refs/heads/']' returned non-zero exit status 128..

@sbidoul
Copy link
Member

sbidoul commented Nov 24, 2024

/ocabot migration l10n_fr_siret_lookup

@OCA-git-bot OCA-git-bot added this to the 18.0 milestone Nov 24, 2024
@alexis-via
Copy link
Contributor

Thanks for your work on this. I propose minor updates to your PR here: apikcloud#1

Copy link
Contributor

@remi-filament remi-filament left a comment

Choose a reason for hiding this comment

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

Thanks @fredericgrall
It works fine.

Could you please run pre-commit locally to fix reported issue, rebase on v18.0 and force push your changes ?
Best Regards,

Improve your OCA v18 mig PR of l10n_fr_siret_lookup
@fredericgrall fredericgrall force-pushed the 18.0-mig-l10n_fr_siret_lookup branch from f0e45b0 to 342001e Compare January 6, 2025 11:00
@fredericgrall
Copy link
Author

@remi-filament it's done

@fredericgrall fredericgrall force-pushed the 18.0-mig-l10n_fr_siret_lookup branch from 3f26780 to 12a0cd7 Compare January 6, 2025 11:19
@remi-filament
Copy link
Contributor

Thanks @fredericgrall however you merged branch 18.0 on your own branch instead of rebasing so that you add extra commit in history.
Also pre-commit is still failing.
You also need to clean-up history as per https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

If you are not familiar with these instructions, let me try to guide you step by step :

  1. Before changing history, backup your updates in a backup branch : git checkout 18.0-mig-l10n_fr_siret_lookup && git branch pr-579-bak
  2. Go back to your last commit : git reset --hard 8535c72c58694270352e012c897c7debd4c0089e
  3. Clean-up existing history : git rebase -i origin/18.0 (assuming origin is OCA repo and your local copy is up to date) then fixup all commits starting with [UPD] and also squash your 2 last commits in one

You should have something like :

pick 4504efd9 Rename module to l10n_fr_siret_lookup
f d201ae83 [UPD] Update l10n_fr_siret_lookup.pot
f 591fb801 [UPD] README.rst
pick b5579df5 Translated using Weblate (French)
pick b87aaba7 [FIX] l10n_fr_siret_lookup: zip is now given as int by the API
f 22f68391 l10n_fr_siret_lookup 14.0.1.1.0
f 822b8e9c Translated using Weblate (French)
pick 35ec202c [MIG] l10n_fr_siret_lookup to v16
f 56a491bb [UPD] Update l10n_fr_siret_lookup.pot
f 21802629 [UPD] README.rst
f afd63a46 Update translation files
pick 8d9c45f2 Added translation using Weblate (Spanish)
f 240a339f [UPD] README.rst
f b542795f Translated using Weblate (Spanish)
pick ce5fdccb [IMP] l10n_fr_siret_lookup: pre-commit auto fixes
pick 41ecc6ae [MIG] l10n_fr_siret_lookup: Migration to 18.0
f 8535c72c [MIG] l10n_fr_siret_lookup: Migration to 18.0
  1. Cherry pick commits from Alexis : git cherry-pick 262746088d87ab7592fb04618026b179ae300cf5 4e4bbb18c89a70dcdc9ca15f3a3936363715d067
  2. Run pre-commit : pre-commit run --file l10n_fr_siret_lookup/
  3. Add pre-commit result in last commit : git commit l10n_fr_siret_lookup/README.rst l10n_fr_siret_lookup/static/description/index.html --amend
  4. Check that you get the same result as your backup branch : git diff 18.0-mig-l10n_fr_siret_lookup pr-579-bak (you should though have a difference on the latest README.rst and index.html files modified by pre-commit)
  5. Check your module is properly working and force push your branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants