From f5f142d9389dd8a004d75b92c47f7cecc41c9c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Wed, 21 Sep 2022 09:39:05 +0200 Subject: [PATCH] [FIX] rma_sale: Filter done pickings and done moves TT39089 --- rma_sale/models/rma.py | 2 +- rma_sale/wizard/sale_order_rma_wizard.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rma_sale/models/rma.py b/rma_sale/models/rma.py index 4ffc5e5f..7446ca2c 100644 --- a/rma_sale/models/rma.py +++ b/rma_sale/models/rma.py @@ -53,7 +53,7 @@ class Rma(models.Model): if rec.order_id: order_move = rec.order_id.order_line.mapped("move_ids") rec.allowed_move_ids = order_move.filtered( - lambda r: r.picking_id == self.picking_id + lambda r: r.picking_id == self.picking_id and r.state == "done" ).ids else: rec.allowed_move_ids = self.picking_id.move_lines.ids diff --git a/rma_sale/wizard/sale_order_rma_wizard.py b/rma_sale/wizard/sale_order_rma_wizard.py index 04c30cdf..cc0d3ea1 100644 --- a/rma_sale/wizard/sale_order_rma_wizard.py +++ b/rma_sale/wizard/sale_order_rma_wizard.py @@ -167,6 +167,7 @@ class SaleOrderLineRmaWizard(models.TransientModel): r.sale_line_id == record.sale_line_id and r.sale_line_id.product_id == record.product_id and r.sale_line_id.order_id == record.order_id + and r.state == "done" ) ) record.move_id = move_id @@ -183,7 +184,9 @@ class SaleOrderLineRmaWizard(models.TransientModel): line = record.order_id.order_line.filtered( lambda r: r.product_id == record.product_id ) - record.allowed_picking_ids = line.mapped("move_ids.picking_id") + record.allowed_picking_ids = line.mapped("move_ids.picking_id").filtered( + lambda x: x.state == "done" + ) def _prepare_rma_values(self): self.ensure_one()