[REF] delivery: put_in_pack cleaning #30324
Closed
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
arbaes
force-pushed
the
master-putinpack-arb
branch
from
81b6996
to
e636280
Compare
arbaes
force-pushed
the
master-putinpack-arb
branch
from
e636280
to
ce0512e
Compare
arbaes
force-pushed
the
master-putinpack-arb
branch
2 times, most recently
from
87050e8
to
8ec94d0
Compare
arbaes
force-pushed
the
master-putinpack-arb
branch
from
8ec94d0
to
f8d8461
Compare
robodoo
added
CI 🤖
arbaes
force-pushed
the
master-putinpack-arb
branch
from
f8d8461
to
bc50035
Compare
arbaes
force-pushed
the
master-putinpack-arb
branch
from
bc50035
to
6a6100f
Compare
amoyaux
reviewed
Jan 24, 2019
| @@ -7,7 +7,7 @@ | |||
| <form string="Package"> | |||
| <group> | |||
| <field name="delivery_packaging_id" domain="[('package_carrier_type', '=', context.get('current_package_carrier_type', False))]" | |||
| context="{'form_view_ref':'delivery.product_packaging_delivery_form'}"/> | |||
| context="{'form_view_ref':'delivery.product_packaging_delivery_form'}" required="True"/> | |||
robodoo
added
CI 🤖
arbaes
force-pushed
the
master-putinpack-arb
branch
from
2e0b69c
to
c14c71a
Compare
robodoo
added
CI 🤖
arbaes
force-pushed
the
master-putinpack-arb
branch
from
c14c71a
to
bcbf277
Compare
robodoo
added
CI 🤖
amoyaux
reviewed
Jan 28, 2019
| else: | ||
| return res | ||
|
|
||
| def _choose_package(self): |
There was a problem hiding this comment.
@arbaes I would rather name it _set_delivery_packaging or something like that
amoyaux
reviewed
Jan 28, 2019
amoyaux
reviewed
Jan 28, 2019
arbaes
force-pushed
the
master-putinpack-arb
branch
from
bcbf277
to
db583c8
Compare
amoyaux
reviewed
Mar 1, 2019
| self.env.context, | ||
| current_package_carrier_type=self.carrier_id.delivery_type, | ||
| default_picking_id=self.id, | ||
| default_move_line_ids=move_line_ids.ids |
There was a problem hiding this comment.
remove context_move_line_ids
amoyaux
reviewed
Mar 1, 2019
| else: | ||
| return res | ||
|
|
||
| def _set_delivery_packaging(self, move_line_ids): |
There was a problem hiding this comment.
move_line_ids not needed as arg anymore
arbaes
force-pushed
the
master-putinpack-arb
branch
from
f8a3fba
to
2e09fc5
Compare
robodoo
added
CI 🤖
|
robodoo r+ |
|
Because this PR has multiple commits, I need to know how to merge it:
|
amoyaux
force-pushed
the
master-putinpack-arb
branch
from
2e09fc5
to
d904990
Compare
|
robodoo retry |
|
Merge method set to rebase and fast-forward |
|
robodoo r+ |
|
I'm sorry, @amoyaux. Retry makes no sense when the PR is not in error. |
…in_pack` The package creation was done even before the call of the 'choose.delivery.package' wizard, so the 'Discard' button of the wizard was useless. This commit fix this behaviour by creating the package only when the "put_in_pack" action is called from the wizard. The default weight is thus no more based on the default package but on the picking related to the package. The method 'manage_package', 'default_stock_quant_package_id', 'self._default_delivery_packaging_id' were removed since they are no more relevant. The method 'check_destinations' was refactored to '_pre_put_in_pack_hook' to avoid confusion related to its misleading name TaskID: 1924875
amoyaux
force-pushed
the
master-putinpack-arb
branch
from
d904990
to
c67425a
Compare
|
robodoo r+ |
robodoo
pushed a commit
that referenced
this pull request
Mar 5, 2019
…in_pack` The package creation was done even before the call of the 'choose.delivery.package' wizard, so the 'Discard' button of the wizard was useless. This commit fix this behaviour by creating the package only when the "put_in_pack" action is called from the wizard. The default weight is thus no more based on the default package but on the picking related to the package. The method 'manage_package', 'default_stock_quant_package_id', 'self._default_delivery_packaging_id' were removed since they are no more relevant. The method 'check_destinations' was refactored to '_pre_put_in_pack_hook' to avoid confusion related to its misleading name TaskID: 1924875 closes #30324 Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
|
Merged, thanks! |
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.
This PR fix the issues with the default shipping weight and the creation of a packaging regardless of the 'discard button'. Obsolete code was removed in the process.
TaskID: 1924875