From 3e0366f2b274f5a08624947d3feeeaef6f51c4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 2 Apr 2012 11:39:56 +0200
Subject: [PATCH] Allow cancel of shipment in every states except done

review316003
---
 shipment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shipment.py b/shipment.py
index 9d138d4cc2..1ce100538c 100644
--- a/shipment.py
+++ b/shipment.py
@@ -126,7 +126,7 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
                 ))
         self._buttons.update({
                 'cancel': {
-                    'invisible': Eval('state') != 'draft',
+                    'invisible': Eval('state').in_(['cancel', 'done']),
                     },
                 'draft': {
                     'invisible': Eval('state') != 'cancel',
@@ -804,7 +804,7 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
                 ))
         self._buttons.update({
                 'cancel': {
-                    'invisible': Eval('state').in_(['cancel', 'packed', 'done']),
+                    'invisible': Eval('state').in_(['cancel', 'done']),
                     },
                 'draft': {
                     'invisible': ~Eval('state').in_(['waiting', 'cancel']),
@@ -1322,7 +1322,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
                 ))
         self._buttons.update({
                 'cancel': {
-                    'invisible': Eval('state') != 'draft',
+                    'invisible': Eval('state').in_(['cancel', 'done']),
                     },
                 'draft': {
                     'invisible': Eval('state') != 'cancel',