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

[17.0][MIG] product route profile: Migration to 17.0 #2097

Merged
merged 19 commits into from
Oct 8, 2024
Merged

[17.0][MIG] product route profile: Migration to 17.0 #2097

merged 19 commits into from
Oct 8, 2024

Conversation

StefanRijnhart
Copy link
Member

@StefanRijnhart StefanRijnhart commented Jul 4, 2024 •
edited
Loading

Based on unmerged #1775
Includes #1939

@StefanRijnhart StefanRijnhart added this to the 17.0 milestone Jul 4, 2024
@StefanRijnhart StefanRijnhart mentioned this pull request Jul 4, 2024
Merged
@StefanRijnhart StefanRijnhart force-pushed the 17.0-mig-product_route_profile branch from 4331dcd to cfa1eb8 Compare July 4, 2024 14:20
@StefanRijnhart StefanRijnhart mentioned this pull request Jul 4, 2024
Open
@rousseldenis
Copy link
Contributor

/ocabot migration product_route_profile

@OCA-git-bot OCA-git-bot mentioned this pull request Jul 5, 2024
Open
47 tasks
bosd
bosd approved these changes Sep 30, 2024
View reviewed changes
Copy link
Contributor

@bosd bosd left a comment

Choose a reason for hiding this comment

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

LGTM

jbaudoux
jbaudoux reviewed Oct 7, 2024
View reviewed changes
Copy link
Contributor

@jbaudoux jbaudoux left a comment

Choose a reason for hiding this comment

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

I would drop the binary files from the commit that introduced them

@StefanRijnhart
Copy link
Member Author

@jbaudoux That would be the best but it's not possible without a hard reset of the target branch, because the files were added in a commit related to another module. It was discussed in https://odoo-community.org/groups/contributors-15/contributors-1946820, and it was agreed that the cons would outweigh the pros.

@rousseldenis
Copy link
Contributor

@jbaudoux That would be the best but it's not possible without a hard reset of the target branch, because the files were added in a commit related to another module. It was discussed in https://odoo-community.org/groups/contributors-15/contributors-1946820, and it was agreed that the cons would outweigh the pros.

In fact, in this case, base 17.0 branch does not contain those files. So, please remove them.

Kev-Roche and others added 18 commits October 8, 2024 11:55
@Kev-Roche @StefanRijnhart
[ADD] module: product_route_profile
a2c69b8
@StefanRijnhart
[UPD] Update product_route_profile.pot
46272e5
@OCA-git-bot @StefanRijnhart
[UPD] README.rst
736ed22
@OCA-git-bot @StefanRijnhart
[ADD] icon.png
0636b06
@OCA-git-bot @StefanRijnhart
product_route_profile 14.0.1.0.1
e78d88c
@awisky @StefanRijnhart
[FIX] product_route_profile _inverse_route_ids store selected route_p…
115bff1 
…rofile_id
@OCA-git-bot @StefanRijnhart
product_route_profile 14.0.1.0.2
cf0c059
@bosd @StefanRijnhart
Added translation using Weblate (Dutch)
035a995
@OCA-git-bot @StefanRijnhart
[UPD] README.rst
955fc51
@weblate @StefanRijnhart
Update translation files
2b33909 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: stock-logistics-warehouse-14.0/stock-logistics-warehouse-14.0-product_route_profile
Translate-URL: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-product_route_profile/
@etobella @StefanRijnhart
*: Fix pylint
06515e9
@StefanRijnhart
[UPD] Update product_route_profile.pot
89a7911
@OCA-git-bot @StefanRijnhart
[BOT] post-merge updates
380b1fe
@weblate @StefanRijnhart
Update translation files
2221c58 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: stock-logistics-warehouse-14.0/stock-logistics-warehouse-14.0-product_route_profile
Translate-URL: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-product_route_profile/
@bosd @StefanRijnhart
[MIG] product_route_profile: Migration to 15.0
cbdb849
@bosd @StefanRijnhart
[IMP] product_route_profile: add custom icon
83f77d9 
generated with oca icon generator.
@StefanRijnhart
[IMP] product_route_profile: pre-commit auto fixes
a47d107
@StefanRijnhart
[MIG] product_route_profile: Migration to 17.0
a1defea
@bguillot @StefanRijnhart
[FIX] product_route_profile: prevent triggering inverse method
ba9f531 
Set route_ids as readonly to avoid triggering inverse method and changing
the route_profile_id when adding force_route_profile_id
@StefanRijnhart
Copy link
Member Author

@rousseldenis In that case, the files have been removed in another PR. I rebased onto 17.0 so that the removal of the files is no longer visible in the diff.

@jbaudoux
Copy link
Contributor

jbaudoux commented Oct 8, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 17.0-ocabot-merge-pr-2097-by-jbaudoux-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit ac9fcae into OCA:17.0 Oct 8, 2024
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@bosd bosd bosd approved these changes

@jbaudoux jbaudoux jbaudoux approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 migration needs review
Projects
None yet
Milestone
17.0
Development

Successfully merging this pull request may close these issues.
10 participants
@StefanRijnhart @rousseldenis @jbaudoux @OCA-git-bot @bosd @Kev-Roche @awisky @weblate @etobella @bguillot