-
-
Notifications
You must be signed in to change notification settings - Fork 364
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
[MIG] delivery_carrier_pricelist: Migration to 14.0 #334
[MIG] delivery_carrier_pricelist: Migration to 14.0 #334
Conversation
Delivery product at 10 and 66% off. Functional tests are ok ! 👍 Peek.12-04-2021.12-29.mp4 |
/ocabot merge nobump |
This PR looks fantastic, let's merge it! |
@simahawk your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-334-by-simahawk-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. |
@phuctranerp can you check what's wrong w/ the build? |
Thanks for your note. I am checking this. |
New module allowing to compute a delivery cost based on the sales order pricelist. Most of the code of the module is to update the many 'attrs' of the 'delivery' module which have domains based on the "delivery_type" field and cannot be extended in XML without breaking compatibility. When using an external provider (such as DHL, UPS), the "Pricelist" provider cannot be used. In this case, the invoice policy, which is by default "Estimate" or "Real" has a third option "Pricelist Cost". This option would not make sense with "Estimate" or "Real", which is why this field is used.
3db1e8a
to
e36a882
Compare
Good day @simahawk, I rebased the PR and it passed the test that was failed in merge build. Please help to merge again to see if the issue persist. Thank you in advance. |
/ocabot merge nobump |
Hey, thanks for contributing! Proceeding to merge this for you. |
@simahawk your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-334-by-simahawk-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. |
Hi @simahawk can you retry the merge? Not sure if there was some sort of race condition originally at play; now the build is failing because the branch created by the bot doesn't exist anymore |
/ocabot merge nobump |
What a great day to merge this nice PR. Let's do it! |
@simahawk your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-334-by-simahawk-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. |
@sbidoul could you check what's wrong here https://app.travis-ci.com/github/OCA/delivery-carrier/jobs/531179822#L1483 BTW I wonder if we should silent |
e36a882
to
9105d4d
Compare
Hi @simahawk the merge should be smooth now :) |
@nilshamerlinck one more little step 😅 |
9105d4d
to
02e916c
Compare
@simahawk, The pre-commit should be good now. |
/ocabot merge nobump |
Hey, thanks for contributing! Proceeding to merge this for you. |
Congratulations, your PR was merged at 36d9427. Thanks a lot for contributing to OCA. ❤️ |
Standard migration from #279