-
-
Notifications
You must be signed in to change notification settings - Fork 366
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
[15.0][FIX] delivery_multi_destination: Several fixes + revert #653
Merged
OCA-git-bot
merged 4 commits into
OCA:15.0
from
Tecnativa:15.0-fix-delivery_multi_destination-rule_price
Jun 1, 2023
Merged
[15.0][FIX] delivery_multi_destination: Several fixes + revert #653
OCA-git-bot
merged 4 commits into
OCA:15.0
from
Tecnativa:15.0-fix-delivery_multi_destination-rule_price
Jun 1, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pedrobaeza
changed the title
[14.0][FIX] delivery_multi_destination: Several fixes + revert
[15.0][FIX] delivery_multi_destination: Several fixes + revert
May 30, 2023
This reverts commit 0e28544. This ismixing in the same commit other things for a non related problem that has been fixed in a better way in the previous version, so we are reverting it and applying the rest of the patches.
…sed on rules If the destination carrier line is based on rules, the price is not correctly fetched, as it's hardcoded to call `_get_price_available` using picking's carrier, no matter the recordset from which you call it (the self argument). Thus, the only solution to get the proper value is to temporarily replace the carrier on the picking on the calls chain, to restore it before returning. TT42862
… other companies In the context where `carrier.child_ids` is being examined, all existing subdestinations, no matter the company they have, are shown as being in a sudo environment, so we need to filter them out those from other companies. TT43596
pedrobaeza
force-pushed
the
15.0-fix-delivery_multi_destination-rule_price
branch
from
May 30, 2023 22:59
d4d35ee
to
f7430fa
Compare
chienandalu
approved these changes
May 31, 2023
chienandalu
approved these changes
May 31, 2023
victoralmau
approved these changes
May 31, 2023
/ocabot merge patch |
What a great day to merge this nice PR. Let's do it! |
Congratulations, your PR was merged at 8ffbe98. 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forward-port of #652
This PR is bringing parity with 13.0 and 14.0 versions and handling correctly the multi destination scenarios.
There's in this branch a patch that fixes a missing gap with no carrier, but mixing in the same one other things for a non related problem that has been fixed in a better way in the previous version, so we are reverting it and applying the rest of the patches.
@Tecnativa