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

[16.0][FIX] hr_attendance_rifd: catch ValidationError in a way RFID devices can handle it #164

Merged

Conversation

AaronHForgeFlow
Copy link
Contributor

FW port of #161

in a way RFID devices can handle it
@pedrobaeza pedrobaeza added this to the 16.0 milestone Feb 26, 2024
Copy link
Member

@pedrobaeza pedrobaeza 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 patch

@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-164-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

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

To https://github.com/OCA/hr-attendance
 ! [rejected]        16.0-ocabot-merge-pr-164-by-pedrobaeza-bump-patch -> 16.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/hr-attendance'
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 586b41e into OCA:16.0 Feb 27, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

5 participants