From 72d43fdf9fbded7447294fbc105ccef80dcecabe Mon Sep 17 00:00:00 2001 From: Arnold Moyaux Date: Wed, 6 Jan 2021 10:50:47 +0000 Subject: [PATCH] [FIX] stock: scrap wrong issuficient quantity wizard revert commit 72c36aaf9004392773845406b2dc248017bb2e0c due to commit 47219e96e19b6c5badf7d4e99043817dc68812ac First commit is now useless and on top of that it ignores the putaway strategies. opw-2412699 closes odoo/odoo#64200 X-original-commit: a8db48244f069f9f29ee1120862bdf2c03ec26dd Signed-off-by: Simon Goffin (sig) Signed-off-by: Arnold Moyaux --- addons/stock/models/stock_scrap.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/stock/models/stock_scrap.py b/addons/stock/models/stock_scrap.py index ea95ed5bcc7..6f8e303154b 100644 --- a/addons/stock/models/stock_scrap.py +++ b/addons/stock/models/stock_scrap.py @@ -103,9 +103,6 @@ class StockScrap(models.Model): def _prepare_move_values(self): self.ensure_one() - location_id = self.location_id.id - if self.picking_id and self.picking_id.picking_type_code == 'incoming': - location_id = self.picking_id.location_dest_id.id return { 'name': self.name, 'origin': self.origin or self.picking_id.name or self.name, @@ -114,13 +111,13 @@ class StockScrap(models.Model): 'product_uom': self.product_uom_id.id, 'state': 'draft', 'product_uom_qty': self.scrap_qty, - 'location_id': location_id, + 'location_id': self.location_id.id, 'scrapped': True, 'location_dest_id': self.scrap_location_id.id, 'move_line_ids': [(0, 0, {'product_id': self.product_id.id, 'product_uom_id': self.product_uom_id.id, 'qty_done': self.scrap_qty, - 'location_id': location_id, + 'location_id': self.location_id.id, 'location_dest_id': self.scrap_location_id.id, 'package_id': self.package_id.id, 'owner_id': self.owner_id.id, @@ -155,11 +152,8 @@ class StockScrap(models.Model): if self.product_id.type != 'product': return self.do_scrap() precision = self.env['decimal.precision'].precision_get('Product Unit of Measure') - location_id = self.location_id - if self.picking_id and self.picking_id.picking_type_code == 'incoming': - location_id = self.picking_id.location_dest_id available_qty = sum(self.env['stock.quant']._gather(self.product_id, - location_id, + self.location_id, self.lot_id, self.package_id, self.owner_id,