Index: WAeUP_SRP/base/skins/waeup_accommodation/hall_allocation_list.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_accommodation/hall_allocation_list.py	(revision 2425)
+++ WAeUP_SRP/base/skins/waeup_accommodation/hall_allocation_list.py	(revision 2426)
@@ -38,6 +38,9 @@
 lines.append(','.join(fields))
 format = '"%(' + ')s","%('.join(fields) + ')s"'
-hall=context.getId()
-booked = pa(hall=hall)
+hallid=context.getId()
+booked = pa(hall=hallid)
+if not booked:
+    hallid = 'all_halls'
+    booked = pa()
 for bed in booked:
     if bed.student == '':
@@ -47,5 +50,5 @@
         continue
     d = context.getFormattedStudentEntry(erg[0])
-    hall_dummy,block,room,bed = bed.bed.split('_')
+    hall,block,room,bed = bed.bed.split('_')
     d['hall'] = hall
     d['block'] = block
@@ -56,5 +59,5 @@
 #setheader('Content-type','application/vnd.ms-excel')
 setheader('Content-type','text/semicolon-seperated-values')
-setheader('Content-Disposition:', 'attachment; filename="%s.csv"' % hall)
+setheader('Content-Disposition:', 'attachment; filename="%s.csv"' % hallid)
 setheader('Expires',  'Mon, 26 Jul 1997 05:00:00GMT') # Date in the past
 setheader('Cache-Control', 'no-store, no-cache,must-revalidate') # HTTP/1.1
