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] Port nationality code to res_country #741

Merged
merged 1 commit into from Oct 23, 2019

Conversation

hendrixcosta
Copy link
Member

No description provided.

@hendrixcosta
Copy link
Member Author

Issue: #739

Copy link
Member

@mileo mileo left a comment

Choose a reason for hiding this comment

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

Os dados da tabela l10n_br_hr/data/hr_employee_nationality_code_data.xml não deveriam ser inseridos no l10n_br_base, seja no próprio módulo ou através do módulo do l10n_br_hr?

Então creio que a modificação poderia ser efetuada apenas no l10n_br_hr, removendo a tabela e extendendo o res.contry

l10n_br_hr/models/hr_employee.py Show resolved Hide resolved
@mileo
Copy link
Member

mileo commented Oct 23, 2019

@hendrixcosta pode resolver o conflito para fazermos o merge?

@mileo
Copy link
Member

mileo commented Oct 23, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-741-by-mileo-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 23, 2019
Signed-off-by mileo
@OCA-git-bot OCA-git-bot merged commit 220755a into OCA:12.0 Oct 23, 2019
@OCA-git-bot
Copy link
Contributor

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

@mileo mileo deleted the feature/port-codigo-nacional branch October 23, 2019 15:06
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.

None yet

5 participants