audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] rma_sale: Filter done pickings and done moves

Browse Source 
TT39089
This commit is contained in:
Víctor Martínez
2022-09-21 09:39:05 +02:00
parent cf86ad83bf
commit 010743d706
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rma_sale/models/rma.py
View File

@@ -48,7 +48,7 @@ class Rma(models.Model):
if rec.order_id: if rec.order_id:
order_move = rec.order_id.order_line.mapped("move_ids") order_move = rec.order_id.order_line.mapped("move_ids")
rec.allowed_move_ids = order_move.filtered( 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 ).ids
else: else:
rec.allowed_move_ids = self.picking_id.move_lines.ids rec.allowed_move_ids = self.picking_id.move_lines.ids

5
rma_sale/wizard/sale_order_rma_wizard.py
View File

@@ -152,6 +152,7 @@ class SaleOrderLineRmaWizard(models.TransientModel):
r.sale_line_id == record.sale_line_id r.sale_line_id == record.sale_line_id
and r.sale_line_id.product_id == record.product_id and r.sale_line_id.product_id == record.product_id
and r.sale_line_id.order_id == record.order_id and r.sale_line_id.order_id == record.order_id
and r.state == "done"
) )
) )
else: else:
@@ -169,7 +170,9 @@ class SaleOrderLineRmaWizard(models.TransientModel):
line = record.order_id.order_line.filtered( line = record.order_id.order_line.filtered(
lambda r: r.product_id == record.product_id 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): def _prepare_rma_values(self):
self.ensure_one() self.ensure_one()