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

[MIG] delivery_carrier_pricelist: Migration to 14.0 #334

Merged

Conversation

phuctranfxvn
Copy link
Contributor

Standard migration from #279

@phuctranfxvn phuctranfxvn mentioned this pull request Feb 7, 2021
21 tasks
@tarbib
Copy link

tarbib commented Apr 12, 2021

Delivery product at 10 and 66% off. Functional tests are ok ! 👍

Peek.12-04-2021.12-29.mp4

@simahawk
Copy link
Contributor

simahawk commented Aug 3, 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-334-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Aug 3, 2021
Signed-off-by simahawk
@OCA-git-bot
Copy link
Contributor

@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.

@simahawk
Copy link
Contributor

simahawk commented Aug 3, 2021

@phuctranerp can you check what's wrong w/ the build?

@hailangvn
Copy link
Contributor

Thanks for your note. I am checking this.

guewen and others added 2 commits August 12, 2021 14:33
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.
@hailangvn hailangvn force-pushed the 14.0-mig-delivery_carrier_pricelist branch from 3db1e8a to e36a882 Compare August 12, 2021 07:50
@hailangvn
Copy link
Contributor

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.

@simahawk
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-334-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Aug 12, 2021
Signed-off-by simahawk
@OCA-git-bot
Copy link
Contributor

@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.

@nilshamerlinck
Copy link
Contributor

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

@simahawk
Copy link
Contributor

/ocabot merge nobump

@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-334-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Aug 13, 2021
Signed-off-by simahawk
@OCA-git-bot
Copy link
Contributor

@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.

nilshamerlinck added a commit to nilshamerlinck/delivery-carrier that referenced this pull request Aug 13, 2021
@simahawk
Copy link
Contributor

simahawk commented Aug 13, 2021

@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 vcr.cassette logging in tests 🤔

@nilshamerlinck
Copy link
Contributor

@simahawk sounds like a good workaround indeed, at least for the case that creates the issue. Pushed PR to do so here: #404

@hailangvn hailangvn force-pushed the 14.0-mig-delivery_carrier_pricelist branch from e36a882 to 9105d4d Compare August 14, 2021 09:52
@nilshamerlinck
Copy link
Contributor

Hi @simahawk the merge should be smooth now :)

@simahawk
Copy link
Contributor

@nilshamerlinck one more little step 😅

@hailangvn hailangvn force-pushed the 14.0-mig-delivery_carrier_pricelist branch from 9105d4d to 02e916c Compare August 17, 2021 10:03
@hailangvn
Copy link
Contributor

@simahawk, The pre-commit should be good now.

@simahawk
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-334-by-simahawk-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit eb2332d into OCA:14.0 Aug 17, 2021
@OCA-git-bot
Copy link
Contributor

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

@hailangvn hailangvn deleted the 14.0-mig-delivery_carrier_pricelist branch August 17, 2021 13:42
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.

9 participants