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

[IMP/FIX] base_user_role_company - re-add logic around multi active cids #280

Merged
merged 1 commit into from
Apr 15, 2024
Merged

[IMP/FIX] base_user_role_company - re-add logic around multi active cids #280

merged 1 commit into from
Apr 15, 2024

Conversation

ghost
Copy link

@ghost ghost commented Apr 3, 2024

Forward-port of this PR #242 and the logic around this fix is explained in the 14.0 PR

@ghost
Copy link
Author

ghost commented Apr 3, 2024

@OCA/tools-maintainers @dreispt I forwared the fix/improvement from 14.0 to 16.0 (#248) and 17.0 (this PR)
Can we merge this since the logic is exactly the same as 14.0 ?

@ghost ghost force-pushed the 17.0-user_role_company_fix branch from a9ce18a to cd532cf Compare April 3, 2024 14:12
@dreispt
Copy link
Member

dreispt commented Apr 15, 2024

FW Port
/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 17.0-ocabot-merge-pr-280-by-dreispt-bump-minor, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@dreispt The merge process could not be finalized, because command git push origin 17.0-ocabot-merge-pr-280-by-dreispt-bump-minor:17.0 failed with output:

To https://github.com/OCA/server-backend
 ! [remote rejected] 17.0-ocabot-merge-pr-280-by-dreispt-bump-minor -> 17.0 (cannot lock ref 'refs/heads/17.0': is at 1574fcdfc3e323d79ebedb56ce61125304dff6e6 but expected 7a821c5348f0abed4ba94e9c3221338e7476c7a1)
error: failed to push some refs to 'https://***@github.com/OCA/server-backend'

@OCA-git-bot OCA-git-bot merged commit fb64958 into OCA:17.0 Apr 15, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

SiesslPhillip pushed a commit to grueneerde/OCA-server-backend that referenced this pull request Nov 20, 2024
@bt-admin
Merge pull request OCA#280 from OCA/16.0
94a6b2e 
Syncing from upstream OCA/server-backend (16.0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dreispt @OCA-git-bot @jdidderen