Rename purchase state from cancel to cancelled
issue8927 review305681002
This commit is contained in:
1 parent
b898068519
commit
9892d85f29
3 files changed
+4
-4
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
+2
-2
@@ -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'
|
||||
|
||||
Reference in new issue
Block a user