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

[12.0][MIG] event_track_location_overlap: Migration to v12 #132

Merged
merged 3 commits into from
Apr 18, 2019

Conversation

cristinamartinrod
Copy link
Member

@cristinamartinrod cristinamartinrod commented Mar 5, 2019

Forward-port of #108.

cc @Tecnativa

@cristinamartinrod cristinamartinrod marked this pull request as ready for review March 5, 2019 12:39
@cristinamartinrod cristinamartinrod mentioned this pull request Mar 5, 2019
24 tasks
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

Please squash those !fixup commits.

event_track_location_overlap/README.rst Outdated Show resolved Hide resolved
@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch from 9da3619 to 59dccf3 Compare March 5, 2019 12:47
@pedrobaeza pedrobaeza added this to the 12.0 milestone Mar 5, 2019
a_track = remaining_tracks[0]
remaining_tracks -= a_track
# Get track A's dates
a_start = fields.Datetime.from_string(a_track.date)
Copy link
Member

Choose a reason for hiding this comment

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

These are already dates, so remove the conversions

setup/_metapackage/VERSION.txt Outdated Show resolved Hide resolved
@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch 2 times, most recently from 37ac9e2 to f7e4b6e Compare March 6, 2019 10:54
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

Do a proper rebase please.

@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch from 1dc1759 to 697edb4 Compare March 8, 2019 09:16
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

Also, please:

  1. remove commit adb72fc
  2. remove commit 7a26a1e

setup/_metapackage/VERSION.txt Outdated Show resolved Hide resolved
@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch from 697edb4 to 9b9062e Compare March 8, 2019 12:22
New module that allows to forbid overlapping multiple tracks in the same room at the same time... or not.
@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch 2 times, most recently from 767c99b to 4749a3c Compare April 5, 2019 09:14
@cristinamartinrod cristinamartinrod force-pushed the 12.0-mig-event_track_location_overlap branch from 4749a3c to 1559ea1 Compare April 5, 2019 10:21
The new data model in Odoo 12.0 replaces `state` for `stage_id`, which includes a flag that indicates if the stage is cancelled. Use it now.
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

All comments attended, it should go ✔️ now.

@pedrobaeza pedrobaeza merged commit ac63269 into OCA:12.0 Apr 18, 2019
@pedrobaeza pedrobaeza deleted the 12.0-mig-event_track_location_overlap branch April 18, 2019 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants