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

[15.0][FIX] resource_booking: Change combination_id mandatory when autoassign is false #131

Conversation

carolinafernandez-tecnativa
  • Change combination_id mandatory when autoassgin is false.
  • Previously it was required when date is set but it is not taking into account if we share link and tried to book, user get an internal error server if combination_id is not set.

image

@Tecnativa
@pedrobaeza @victoralmau

@OCA-git-bot
Copy link
Contributor

Hi @pedrobaeza,
some modules you are maintaining are being modified, check this out!

@pedrobaeza pedrobaeza added this to the 15.0 milestone Jun 27, 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.

Same as 16.0

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 15.0-ocabot-merge-pr-131-by-pedrobaeza-bump-minor, awaiting test results.

@OCA-git-bot
Copy link
Contributor

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

To https://github.com/OCA/calendar
 ! [rejected]        15.0-ocabot-merge-pr-131-by-pedrobaeza-bump-minor -> 15.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/calendar'
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 ed492e8 into OCA:15.0 Jun 27, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@pedrobaeza pedrobaeza deleted the 15.0-fix-resource_booking-mandatory-fields-combination branch June 27, 2024 10:20
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.

3 participants