From d0ff0bedcb6237dc1f3ac07c4c64c8530885c55f Mon Sep 17 00:00:00 2001
From: David Harper <dave@libateq.org>
Date: Sat, 6 Jun 2020 10:23:14 +0100
Subject: [PATCH] Rename invoice state from cancel to cancelled

issue8927
review303661003
---
 commission.py | 9 +++------
 invoice.py    | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/commission.py b/commission.py
index cceaf1086d..113240906f 100644
--- a/commission.py
+++ b/commission.py
@@ -327,7 +327,7 @@ class Commission(ModelSQL, ModelView):
                 ('', ''),
                 ('invoiced', 'Invoiced'),
                 ('paid', 'Paid'),
-                ('cancel', 'Canceled'),
+                ('cancelled', 'Cancelled'),
                 ], "Invoice State",
             help="The current state of the invoice "
             "that the commission appears on."),
@@ -381,11 +381,8 @@ class Commission(ModelSQL, ModelView):
         if self.invoice_line:
             state = 'invoiced'
             invoice = self.invoice_line.invoice
-            if invoice:
-                if invoice.state == 'paid':
-                    state = 'paid'
-                elif invoice.state == 'cancel':
-                    state = 'cancel'
+            if invoice and invoice.state in {'paid', 'cancelled'}:
+                state = invoice.state
         return state
 
     @classmethod
diff --git a/invoice.py b/invoice.py
index c9175a3600..328f6b96ce 100644
--- a/invoice.py
+++ b/invoice.py
@@ -70,7 +70,7 @@ class Invoice(metaclass=PoolMeta):
 
     @classmethod
     @ModelView.button
-    @Workflow.transition('cancel')
+    @Workflow.transition('cancelled')
     def cancel(cls, invoices):
         pool = Pool()
         Commission = pool.get('commission')