pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] stock_picking_batch: forward package

Browse Source 
For multi steps batch pickings, the package is not forwarded
like it is for 'simple' pickings.

closes odoo/odoo#141822

Related: odoo/enterprise#50532
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
This commit is contained in:
JF Aubert
2023-11-15 11:26:00 +00:00
parent 14b2f0f0f7
commit 13cb47d4f2
2 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/stock_picking.py
+38 -41
View File
@@ -1000,43 +1000,43 @@ class Picking(models.Model):
def _check_entire_pack(self):
""" This function check if entire packs are moved in the picking"""
for picking in self:
origin_packages = picking.move_line_ids.mapped("package_id")
for pack in origin_packages:
if picking._check_move_lines_map_quant_package(pack):
package_level_ids = picking.package_level_ids.filtered(lambda pl: pl.package_id == pack)
move_lines_to_pack = picking.move_line_ids.filtered(lambda ml: ml.package_id == pack and not ml.result_package_id and ml.state not in ('done', 'cancel'))
if not package_level_ids:
package_location = self._get_entire_pack_location_dest(move_lines_to_pack) or picking.location_dest_id.id
for package in self.move_line_ids.package_id:
pickings = self.move_line_ids.filtered(lambda ml: ml.package_id == package).picking_id
if pickings._check_move_lines_map_quant_package(package):
package_level_ids = pickings.package_level_ids.filtered(lambda pl: pl.package_id == package)
move_lines_to_pack = pickings.move_line_ids.filtered(lambda ml: ml.package_id == package and not ml.result_package_id and ml.state not in ('done', 'cancel'))
if not package_level_ids:
if len(pickings) == 1:
package_location = pickings._get_entire_pack_location_dest(move_lines_to_pack) or pickings.location_dest_id.id
self.env['stock.package_level'].create({
'picking_id': picking.id,
'package_id': pack.id,
'location_id': pack.location_id.id,
'picking_id': pickings.id,
'package_id': package.id,
'location_id': package.location_id.id,
'location_dest_id': package_location,
'move_line_ids': [(6, 0, move_lines_to_pack.ids)],
'company_id': picking.company_id.id,
'company_id': pickings.company_id.id,
})
# Propagate the result package in the next move for disposable packages only.
if pack.package_use == 'disposable':
move_lines_to_pack.write({'result_package_id': pack.id})
else:
move_lines_in_package_level = move_lines_to_pack.filtered(lambda ml: ml.move_id.package_level_id)
move_lines_without_package_level = move_lines_to_pack - move_lines_in_package_level
for ml in move_lines_in_package_level:
ml.write({
'result_package_id': pack.id,
'package_level_id': ml.move_id.package_level_id.id,
})
move_lines_without_package_level.write({
'result_package_id': pack.id,
'package_level_id': package_level_ids[0].id,
# Propagate the result package in the next move for disposable packages only.
if package.package_use == 'disposable':
move_lines_to_pack.write({'result_package_id': package.id})
else:
move_lines_in_package_level = move_lines_to_pack.filtered(lambda ml: ml.move_id.package_level_id)
move_lines_without_package_level = move_lines_to_pack - move_lines_in_package_level
for ml in move_lines_in_package_level:
ml.write({
'result_package_id': package.id,
'package_level_id': ml.move_id.package_level_id.id,
})
for pl in package_level_ids:
pl.location_dest_id = self._get_entire_pack_location_dest(pl.move_line_ids) or picking.location_dest_id.id
for move in move_lines_to_pack.move_id:
if all(line.package_level_id for line in move.move_line_ids) \
and len(move.move_line_ids.package_level_id) == 1:
move.package_level_id = move.move_line_ids.package_level_id
move_lines_without_package_level.write({
'result_package_id': package.id,
'package_level_id': package_level_ids[0].id,
})
for pl in package_level_ids:
pl.location_dest_id = pickings._get_entire_pack_location_dest(pl.move_line_ids) or pickings.location_dest_id.id
for move in move_lines_to_pack.move_id:
if all(line.package_level_id for line in move.move_line_ids) \
and len(move.move_line_ids.package_level_id) == 1:
move.package_level_id = move.move_line_ids.package_level_id
def _get_lot_move_lines_for_sanity_check(self, none_done_picking_ids, separate_pickings=True):
""" Get all move_lines with tracked products that need to be checked over in the sanity check.
@@ -1453,14 +1453,11 @@ class Picking(models.Model):
else:
return {}
def _put_in_pack(self, move_line_ids, create_package_level=True):
self.ensure_one()
def _put_in_pack(self, move_line_ids):
package = self.env['stock.quant.package'].create({})
if not package.package_type_id:
package_type = move_line_ids.move_id.product_packaging_id.package_type_id
if len(package_type) == 1:
package.package_type_id = package_type
package_type = move_line_ids.move_id.product_packaging_id.package_type_id
if len(package_type) == 1:
package.package_type_id = package_type
if len(move_line_ids) == 1:
default_dest_location = move_line_ids._get_default_dest_location()
move_line_ids.location_dest_id = default_dest_location._get_putaway_strategy(
@@ -1470,12 +1467,12 @@ class Picking(models.Model):
move_line_ids.write({
'result_package_id': package.id,
})
if create_package_level:
if len(self) == 1:
self.env['stock.package_level'].create({
'package_id': package.id,
'picking_id': self.id,
'location_id': False,
'location_dest_id': move_line_ids.mapped('location_dest_id').id,
'location_dest_id': move_line_ids.location_dest_id.id,
'move_line_ids': [(6, 0, move_line_ids.ids)],
'company_id': self.company_id.id,
})
addons/stock_picking_batch/models/stock_picking_batch.py
+4 -4
View File
@@ -233,10 +233,10 @@ class StockPickingBatch(models.Model):
move_line_ids = self.picking_ids[0]._package_move_lines()
if move_line_ids:
res = move_line_ids.picking_id[0]._pre_put_in_pack_hook(move_line_ids)
if not res:
package = move_line_ids.picking_id[0]._put_in_pack(move_line_ids, False)
return move_line_ids.picking_id[0]._post_put_in_pack_hook(package)
return res
if res:
return res
package = move_line_ids.picking_id._put_in_pack(move_line_ids)
return move_line_ids.picking_id[0]._post_put_in_pack_hook(package)
raise UserError(_("Please add 'Done' quantities to the batch picking to create a new pack."))
def action_view_reception_report(self):