search

OCA / stock-logistics-workflow

Odoo Stock, Workflow and Organization
GNU Affero General Public License v3.0
226 stars 642 forks source link

[14.0] [MIG] stock_picking_return_lot #1634

Closed renda-dev closed 2 months ago

renda-dev commented 2 months ago

Migration of stock_picking_return_lot from version 12.0 to version 14.0

rousseldenis commented 2 months ago

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

rousseldenis commented 2 months ago

/ocabot migration stock_picking_return_lot

rousseldenis commented 2 months ago

@renda-dev @GSLabIt @francesco-ooops A little approval there: https://github.com/OCA/stock-logistics-workflow/pull/1635

It fixes current errors in main 14.0 branch.

renda-dev commented 2 months ago

@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 :)

GSLabIt commented 2 months ago

@rousseldenis could u please double check and merge? Thx

francesco-ooops commented 2 months ago

@pedrobaeza can we ask for merge? thanks!

rousseldenis commented 2 months ago

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

image

Why having removed everything ?

francesco-ooops commented 2 months ago

@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 commented 2 months ago

@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 commented 2 months ago

/ocabot merge patch

OCA-git-bot commented 2 months ago

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 commented 2 months ago

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 commented 2 months ago

@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 commented 2 months ago

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