summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiffany Chang (tic) <tic@odoo.com>2020-04-07 15:18:37 +0000
committerTiffany Chang (tic) <tic@odoo.com>2020-10-12 11:19:41 +0000
commit945b5f6791ae890498ef9a34828eaf91dc1457e2 (patch)
tree0e5289a988717a8fe888605c7f2bdca00fc52279
parentec50c426d7c2a17c7b72e64adab65eda6328e163 (diff)
[FIX] delivery: add barcode app check into package wizard
Because the barcode app bypasses the detailed operations for receipts (with default settings set), an error was being thrown when doing "put in pack" when a carrier is set (saving during the delivery package wizard) because the picking move lines are incorrectly selected. This commit adds in a check for when the wizard is accessed via the barcode app so that the error does not occur and the same behavior as when no carrier is assigned is followed. Related Enterprise PR: odoo/enterprise#9808 closes odoo/odoo#59737 Task: 2039720 Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
-rw-r--r--addons/delivery/wizard/choose_delivery_package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/delivery/wizard/choose_delivery_package.py b/addons/delivery/wizard/choose_delivery_package.py
index 83026e5e3d6..f5299832451 100644
--- a/addons/delivery/wizard/choose_delivery_package.py
+++ b/addons/delivery/wizard/choose_delivery_package.py
@@ -48,7 +48,7 @@ class ChooseDeliveryPackage(models.TransientModel):
def action_put_in_pack(self):
picking_move_lines = self.picking_id.move_line_ids
- if not self.picking_id.picking_type_id.show_reserved:
+ if not self.picking_id.picking_type_id.show_reserved and not self.env.context.get('barcode_view'):
picking_move_lines = self.picking_id.move_line_nosuggest_ids
move_line_ids = picking_move_lines.filtered(lambda ml: