Fixed CorporateMember.is_invoiced returning a list instead of bool.

2 files changed, 4 insertions, 4 deletions

diff --git a/members/models.py b/members/models.py
index c8df9efb..1df52503 100644
--- a/members/models.py
+++ b/members/models.py
@@ -63,7 +63,7 @@ class CorporateMember(models.Model):
 
     def _is_invoiced(self):
         invoices = self.invoice_set.all()
-        return invoices and all(invoice.sent_date is not None for invoice in invoices)
+        return bool(invoices) and all(invoice.sent_date is not None for invoice in invoices)
     _is_invoiced.boolean = True
     is_invoiced = property(_is_invoiced)
 
diff --git a/members/test_models.py b/members/test_models.py
index 19f3d64b..f9489cd0 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -49,14 +49,14 @@ class CorporateMemberTests(TestCase):
 
     def test_is_invoiced(self):
         # No invoices == not invoiced.
-        self.assertFalse(self.member.is_invoiced)
+        self.assertEqual(self.member.is_invoiced, False)
         # Invoice but no sent_date == not invoiced.
         invoice = self.member.invoice_set.create(amount=500)
-        self.assertFalse(self.member.is_invoiced)
+        self.assertEqual(self.member.is_invoiced, False)
         # Invoice with an sent_date == invoiced.
         invoice.sent_date = date.today()
         invoice.save()
-        self.assertTrue(self.member.is_invoiced)
+        self.assertEqual(self.member.is_invoiced, True)
 
     def test_get_expiry_date(self):
         today = date.today()