diff --git a/doc/index.rst b/doc/index.rst index 94f335eb73..8960bcc908 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -21,7 +21,7 @@ can be in one of these states: * Purchased A Purchased request is a request that is linked to a purchase which - is not in state Done or Cancel. + is not Done or Cancelled. * Done diff --git a/purchase.py b/purchase.py index aac5688a93..fbcc2f199f 100644 --- a/purchase.py +++ b/purchase.py @@ -70,7 +70,7 @@ class Purchase(metaclass=PoolMeta): @classmethod @ModelView.button - @Workflow.transition('cancel') + @Workflow.transition('cancelled') @process_request def cancel(cls, purchases): super(Purchase, cls).cancel(purchases) diff --git a/purchase_request.py b/purchase_request.py index bcb72a70b8..659bfb4d0d 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -224,10 +224,10 @@ class PurchaseRequest(ModelSQL, ModelView): def get_state(self): if self.purchase_line: - if (self.purchase_line.purchase.state == 'cancel' + if (self.purchase_line.purchase.state == 'cancelled' and not self.exception_ignored): return 'exception' - elif self.purchase_line.purchase.state == 'cancel': + elif self.purchase_line.purchase.state == 'cancelled': return 'cancelled' elif self.purchase_line.purchase.state == 'done': return 'done'