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.

Sign up for GitHub

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

Jump to bottom

[16.0][MIG] hr employee partner external #1155

Merged
merged 10 commits into from
Nov 11, 2022
Merged

[16.0][MIG] hr employee partner external #1155

merged 10 commits into from
Nov 11, 2022

Conversation

mymage
Copy link
Member

@mymage mymage commented Nov 6, 2022

Migration to 16.0

mymage and others added 8 commits November 6, 2022 22:22
@mymage
[DEV] New module HR Employee external Partner
dc95655
@mymage
[ADD] new field to set an employee as external
612ee3e 
[UPD] Update hr_employee_partner_external.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: hr-12.0/hr-12.0-hr_employee_partner_external
Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_employee_partner_external/
@etobella @mymage
[IMP] hr_employee_partner_external: black, isort, prettier
f889795
@etobella @mymage
[MIG] hr_employee_partner_external: Migration 13.0
e591951 
[UPD] Update hr_employee_partner_external.pot

[UPD] README.rst
@etobella @mymage
Added translation using Weblate (Spanish)
d6b8dcb
@olgamarcocb @mymage
Translated using Weblate (Spanish)
f7d8c8b 
Currently translated at 100.0% (4 of 4 strings)

Translation: hr-13.0/hr-13.0-hr_employee_partner_external
Translate-URL: https://translation.odoo-community.org/projects/hr-13-0/hr-13-0-hr_employee_partner_external/es/
@albariera @mymage
[IMP] hr_employee_partner_external: black, isort, prettier
e178468
@albariera @mymage
[MIG] hr_employee_partner_external: Migration to 14.0
60bc977
@mymage mymage force-pushed the 16.0-mig-hr_employee_partner_external branch from 6039355 to 187556b Compare November 6, 2022 22:16
@nimarosa
Copy link
Contributor

nimarosa commented Nov 6, 2022

/ocabot migration hr_employee_partner_external

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Nov 6, 2022
@OCA-git-bot OCA-git-bot mentioned this pull request Nov 6, 2022
Open
28 tasks
@luistorresm
Copy link
Contributor

Hello @mymage

Could you apply this point from the Tasks to do in the migration

Squash administrative commits (if any) with the previous commit for reducing commit noise. They are named as "[UPD] README.rst", "[UPD] Update $MODULE.pot", "Update translation files" and similar names, and comes from OCA-git-bot, oca-travis or oca-transbot. IMPORTANT: Don't squash legit translation commits, authored by their translators, with the message "Translated using Weblate (...)".

Regards

@mymage mymage force-pushed the 16.0-mig-hr_employee_partner_external branch from 187556b to 1ec5235 Compare November 9, 2022 13:20
@mymage
Copy link
Member Author

mymage commented Nov 9, 2022

Hello @mymage
Could you apply ...

I did something, it's OK?

@luistorresm
Copy link
Contributor

Hello @mymage
Could you apply ...

I did something, it's OK?

Yes @mymage

Only was missing this commit:
[UPD] Update hr_employee_partner_external.pot

Regards

@mymage mymage force-pushed the 16.0-mig-hr_employee_partner_external branch from 1ec5235 to c94ec24 Compare November 10, 2022 12:58
luistorresm
luistorresm approved these changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@luistorresm luistorresm left a comment

Choose a reason for hiding this comment

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

Thanks @mymage

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

etobella
etobella approved these changes Nov 11, 2022
View reviewed changes
Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

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

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-1155-by-etobella-bump-nobump, awaiting test results.

@OCA-git-bot
Copy link
Contributor

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

To https://github.com/OCA/hr
 ! [remote rejected]   16.0-ocabot-merge-pr-1155-by-etobella-bump-nobump -> 16.0 (cannot lock ref 'refs/heads/16.0': is at 1d1f94e3e6d0256a4d8802b4eaa6c878151d450b but expected b3ab929f1670ff1878948e411f5ea7694099128d)
error: failed to push some refs to 'https://***@github.com/OCA/hr'

@OCA-git-bot OCA-git-bot merged commit efd7580 into OCA:16.0 Nov 11, 2022
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 1d1f94e. 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
Reviewers

@etobella etobella etobella approved these changes

@nimarosa nimarosa nimarosa approved these changes

@luistorresm luistorresm luistorresm approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
16.0
Development

Successfully merging this pull request may close these issues.
7 participants
@mymage @nimarosa @luistorresm @OCA-git-bot @etobella @olgamarcocb @albariera