cancelled workshops should not show up as not invoiced in dashboard
Title says it all.
This probably relates to #1064 

diff --git a/workshops/models.py b/workshops/models.py
index f6b60888..49ec56d0 100644
--- a/workshops/models.py
+++ b/workshops/models.py
@@ -838,8 +838,9 @@ class EventQuerySet(models.query.QuerySet):
         These are marked as uninvoiced, and have occurred.
         Events are sorted oldest first.'''
 
-        return self.past_events().filter(invoice_status='not-invoiced') \\
-                                 .order_by('start')
+        return self.not_cancelled().past_events() \\
+                   .filter(invoice_status='not-invoiced') \\
+                   .order_by('start')
 
     def metadata_changed(self):
         """Return events for which remote metatags have been updated."""
['workshops/models.py']