Allow cancel of shipment in every states except done

review316003
This commit is contained in:
Cédric Krier committed 2012-04-02 11:39:56 +02:00
1 parent e3ed31b119
commit 3e0366f2b2
1 file changed
+3 -3
+3 -3
View File
@@ -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',