From 82cfe7cb87605d7b8135e06a13b9072fa64ef63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 28 Aug 2017 18:19:06 +0200
Subject: [PATCH] Do not use cancel moves to compute shipping date

issue6701
review39611002
---
 sale.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sale.py b/sale.py
index 28f05512cf..007b0cbc74 100644
--- a/sale.py
+++ b/sale.py
@@ -1322,7 +1322,8 @@ class SaleLine(sequence_ordered(), ModelSQL, ModelView):
     def on_change_with_shipping_date(self, name=None):
         if self.moves:
             dates = filter(
-                None, (m.effective_date or m.planned_date for m in self.moves))
+                None, (m.effective_date or m.planned_date for m in self.moves
+                    if m.state != 'cancel'))
             if dates:
                 return min(dates)
             else: