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

[MIG][12.0] fleet vehicle service calendar: Backporting 13.0 to 12.0 #11

Merged
merged 4 commits into from
Jun 22, 2020
Merged

[MIG][12.0] fleet vehicle service calendar: Backporting 13.0 to 12.0 #11

merged 4 commits into from
Jun 22, 2020

Conversation

mymage
Copy link
Member

@mymage mymage commented Jun 8, 2020

Backportig from 13.0

@OCA-git-bot
Copy link
Contributor

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

@mymage mymage marked this pull request as draft June 8, 2020 17:15
@mymage
Copy link
Member Author

mymage commented Jun 8, 2020 •
edited
Loading

It depends on #12

@mymage mymage mentioned this pull request Jun 16, 2020
Merged
@mymage mymage force-pushed the 12.0-mig-fleet_vehicle_service_calendar branch from bcb9f6c to 9f97c21 Compare June 17, 2020 13:02
@mymage mymage marked this pull request as ready for review June 17, 2020 13:46
@mymage
Copy link
Member Author

mymage commented Jun 17, 2020

@ivantodorovich @mamcode and the last one gone.

I will ask you a little favor: if you know someone who can review my PR on the management system (integrations of non-compliance) who has been waiting for months. As you can see for the others, I will quickly bring them to 12 and 13 versions.
Thanks in advance.

MIG OCA/management-system#326
MIG OCA/management-system#325

OCA/management-system#286
OCA/management-system#284
OCA/management-system#283
OCA/management-system#263
OCA/management-system#267
OCA/management-system#266

@mymage mymage force-pushed the 12.0-mig-fleet_vehicle_service_calendar branch from 9f97c21 to eca8c23 Compare June 18, 2020 15:09
@mamcode
Copy link
Member

mamcode commented Jun 19, 2020

@mymage I think the best thing is that you leave the button as it was before (within the div button_box) and for now just remove the attrs from the div button_box, and as @ivantodorovich says in another PR you can fix the toogle_active button in fleet_vehicle_service_kanban.

@mymage mymage force-pushed the 12.0-mig-fleet_vehicle_service_calendar branch from eca8c23 to 598aa4f Compare June 19, 2020 12:58
@mymage
Copy link
Member Author

mymage commented Jun 19, 2020 •
edited
Loading

@mamcode So, I tried to do what you suggested. With #14 I try a solution but need some fix.

mamcode
mamcode approved these changes Jun 20, 2020
View reviewed changes
Copy link
Member

@mamcode mamcode left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the work!

@ivantodorovich
Copy link

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-11-by-ivantodorovich-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 2256211 into OCA:12.0 Jun 22, 2020
@OCA-git-bot
Copy link
Contributor

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

@mymage mymage deleted the 12.0-mig-fleet_vehicle_service_calendar branch December 17, 2022 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivantodorovich ivantodorovich ivantodorovich approved these changes

@mamcode mamcode mamcode approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mymage @OCA-git-bot @mamcode @ivantodorovich