From 552368f76827779a80b82b504d849c8269bd5276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 6 Apr 2022 18:52:08 +0200 Subject: [PATCH] Delete stock moves from components when applying amendment issue11355 review386301002 (grafted from 36bc7330032ba9cd2199d280e924d207e22a0a35) --HG-- branch : 6.0 --- purchase.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/purchase.py b/purchase.py index 4890243c29..08d1c67917 100644 --- a/purchase.py +++ b/purchase.py @@ -142,9 +142,7 @@ class Amendment(Workflow, ModelSQL, ModelView): for invoice_line in line.invoice_lines: if invoice_line.invoice_state == 'draft': invoice_lines.add(invoice_line) - for move in line.moves: - if move.state == 'draft': - moves.add(move) + moves.update(cls._stock_moves(line)) InvoiceLine.delete(invoice_lines) Move.delete(moves) @@ -152,6 +150,12 @@ class Amendment(Workflow, ModelSQL, ModelView): Invoice.update_taxes([i for i in invoices if i.lines]) Invoice.delete([i for i in invoices if not i.lines]) + @classmethod + def _stock_moves(cls, line): + for move in line.moves: + if move.state == 'draft': + yield move + class AmendmentLine(ModelSQL, ModelView): "Purchase Amendment Line"