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

[14.0] [MIG] stock_picking_return_lot #1634

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

renda-dev
Copy link
Contributor

Migration of stock_picking_return_lot from version 12.0 to version 14.0

Copy link
Contributor

@francesco-ooops francesco-ooops left a comment

Choose a reason for hiding this comment

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

Functional ok

Copy link

@GSLabIt GSLabIt left a comment

Choose a reason for hiding this comment

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

code LGTM

@rousseldenis
Copy link
Contributor

@renda-dev You should preserve commit history. See : https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-14.0

@rousseldenis
Copy link
Contributor

/ocabot migration stock_picking_return_lot

@OCA-git-bot OCA-git-bot added this to the 14.0 milestone Jun 19, 2024
@OCA-git-bot OCA-git-bot mentioned this pull request Jun 19, 2024
57 tasks
@rousseldenis
Copy link
Contributor

@renda-dev @GSLabIt @francesco-ooops A little approval there: #1635

It fixes current errors in main 14.0 branch.

@renda-dev renda-dev force-pushed the 14.0-mig-stock_picking_return_lot branch from 6dee4b4 to 9cdf84a Compare June 20, 2024 09:04
@renda-dev
Copy link
Contributor Author

@renda-dev You should preserve commit history. See : https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-14.

Done, let me know if it looks right :)

@renda-dev renda-dev force-pushed the 14.0-mig-stock_picking_return_lot branch 3 times, most recently from ba00aa0 to a2fccde Compare June 20, 2024 09:38
@renda-dev renda-dev force-pushed the 14.0-mig-stock_picking_return_lot branch from a2fccde to 687ef89 Compare June 20, 2024 13:43
@GSLabIt
Copy link

GSLabIt commented Jun 20, 2024

@rousseldenis could u please double check and merge? Thx

@francesco-ooops
Copy link
Contributor

@pedrobaeza can we ask for merge? thanks!

@rousseldenis
Copy link
Contributor

@renda-dev I would say commit history in 12.0 looks like :

image

Why having removed everything ?

@francesco-ooops
Copy link
Contributor

@rousseldenis isn't that what's requested in the migration guide, specifically:

Squash administrative commits (if any) with the previous commit for reducing commit noise. Check https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate for details.

?

@rousseldenis
Copy link
Contributor

@rousseldenis isn't that what's requested in the migration guide, specifically:

Squash administrative commits (if any) with the previous commit for reducing commit noise. Check https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate for details.

?

This is not mandatory. But ok.

@rousseldenis
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-1634-by-rousseldenis-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-1634-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 21, 2024
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-1634-by-pedrobaeza-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@OCA-git-bot OCA-git-bot merged commit 41120d1 into OCA:14.0 Jun 21, 2024
11 checks passed
@OCA-git-bot
Copy link
Contributor

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

@renda-dev renda-dev deleted the 14.0-mig-stock_picking_return_lot branch June 21, 2024 10:17
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.

5 participants