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] shopfloor_batch_automatic_creation #292

Merged

Conversation

hailangvn
Copy link
Contributor

@hailangvn hailangvn commented Sep 22, 2021

No more pending dependency.

@hailangvn hailangvn mentioned this pull request Sep 22, 2021
14 tasks
@@ -110,7 +113,7 @@ def _search_pickings(self, picking_types, user=None, commercial_partner=None):
def _sort(self, pickings):
return pickings.sorted(
lambda picking: (
-(int(picking.priority) if picking.priority else 1),
-(int(picking.priority) if picking.priority else PRIORITY_NORMAL),
Copy link
Member

Choose a reason for hiding this comment

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

why this change ? PROCUREMENT_PRIORITIES[0][0] is "0"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @mmequignon for your comment. The value 1 used to be Normal. After below Odoo's change, the Normal is now 0.
odoo/odoo@e405537#diff-55c6314416a6a400da6acd5018d161a55eeeb0e3008fec8828121e3dd12be0ebL19-R19

@hailangvn hailangvn force-pushed the 14.0-mig-shopfloor_batch_automatic_creation branch 3 times, most recently from ce446b6 to 6dd288a Compare September 24, 2021 22:10
@hailangvn
Copy link
Contributor Author

This module has no more pending dependency now.

@sebalix
Copy link
Contributor

sebalix commented Sep 28, 2021

@hailangvn can you rebase to resolve the conflict? This one is ready to be merged

@hailangvn hailangvn force-pushed the 14.0-mig-shopfloor_batch_automatic_creation branch from 6dd288a to 00d5168 Compare September 28, 2021 09:11
@hailangvn
Copy link
Contributor Author

Thanks @mmequignon and @sebalix for your aproval. This PR has been rebased.

@sebalix
Copy link
Contributor

sebalix commented Oct 5, 2021

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-292-by-sebalix-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 5, 2021
Signed-off-by sebalix
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 14.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 14.0-ocabot-merge-pr-292-by-sebalix-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit ff7e3ba into OCA:14.0 Oct 5, 2021
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 55353ab. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants