From 16b240c077084bae87c8a823f97ba4f8b00b5020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Tarroja=20Caubet?= <atarroja@kopen.es>
Date: Fri, 18 Feb 2022 09:34:30 +0100
Subject: [PATCH] Reuse planned shipping date when all moves are cancelled

issue11258
review366751002
---
 sale.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sale.py b/sale.py
index a3cb47ffd3..ff609eac8d 100644
--- a/sale.py
+++ b/sale.py
@@ -1437,10 +1437,10 @@ class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
 
     @fields.depends('moves', methods=['planned_shipping_date'])
     def on_change_with_shipping_date(self, name=None):
-        if self.moves:
+        moves = [m for m in self.moves if m.state != 'cancelled']
+        if moves:
             dates = filter(
-                None, (m.effective_date or m.planned_date for m in self.moves
-                    if m.state != 'cancelled'))
+                None, (m.effective_date or m.planned_date for m in moves))
             return min(dates, default=None)
         return self.planned_shipping_date