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] base_delivery_carrier_label: add check when no carrier_id assigned #455

Merged
merged 6 commits into from
Apr 4, 2022

Conversation

sonhd91
Copy link

@sonhd91 sonhd91 commented Jan 13, 2022

Add check when no carrier assigned on picking
Fix import mock
Merge with PR#458 to improve and fix conflict

  • Fix _set_default_package from base_delivery_carrier_label
  • Fix delivery_carrier_pricelist module test
  • Fix delivery_package_fee module test
  • Add delivery_type check in delivery_postlogistics
  • Add delivery_type check in delivery_multi_destination

@sonhd91 sonhd91 marked this pull request as draft January 13, 2022 03:17
@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch from 93dedde to 45d1b4d Compare January 13, 2022 03:32
@sonhd91 sonhd91 marked this pull request as ready for review January 13, 2022 03:42
@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch from 45d1b4d to a5b356a Compare January 17, 2022 13:49
@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch from 1b36110 to a5b356a Compare January 19, 2022 04:51
@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch from a5b356a to 1300c81 Compare January 19, 2022 05:14
Copy link
Contributor

@santostelmo santostelmo left a comment

Choose a reason for hiding this comment

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

LG. just a minor comment

delivery_multi_destination/models/delivery_carrier.py Outdated Show resolved Hide resolved
@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch 3 times, most recently from 455cfcd to 7eb918d Compare March 30, 2022 02:54
When there is no carrier, destination_type is false and can cause error.
In the case, `one` destination_type should be used.
@sonhd91 sonhd91 force-pushed the 14.0-fix-base_delivery_carrier_label branch from 7eb918d to acfe58e Compare March 30, 2022 03:03
@sebalix sebalix added this to the 14.0 milestone Apr 4, 2022
@sebalix
Copy link
Contributor

sebalix commented Apr 4, 2022

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 14.0-ocabot-merge-pr-455-by-sebalix-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 2d69bbc into OCA:14.0 Apr 4, 2022
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 980edb3. 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.

6 participants