Index: /WAeUP_SRP/trunk/WAeUPTables.py
===================================================================
--- /WAeUP_SRP/trunk/WAeUPTables.py	(revision 672)
+++ /WAeUP_SRP/trunk/WAeUPTables.py	(revision 673)
@@ -85,5 +85,5 @@
             return -1,"Student with Id %s already booked bed %s" % (student_id,records[0].bed)
             
-        records = [r for r in self.searchResults({'bed_type' : bed_type}) if not r]
+        records = [r for r in self.searchResults({'bed_type' : bed_type}) if not r.student]
         if len(records) == 0:
             return -1,"no bed of this type available"
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml	(revision 672)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation.xml	(revision 673)
@@ -2,5 +2,5 @@
 <object name="student_accommodation" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
- <property name="layout_edit_method">layout_waeup_edit</property>
+ <property name="layout_edit_method">layout_waeup_</property>
  <property name="layout_view_method"></property>
  <property name="style_prefix">layout_accommodation_</property>
@@ -8,10 +8,10 @@
  <property name="validate_values_expr"></property>
  <widget name="acco_maint_date" meta_type="DateTime Widget">
-  <property name="title">Accommodation Maintainance Date</property>
+  <property name="title">Maintainance Fee Date</property>
   <property name="fields">
    <element value="acco_maint_date"/>
   </property>
-  <property name="label">Accommodation Maintainance Date</property>
-  <property name="label_edit">Accommodation Maintainance Date</property>
+  <property name="label">Maintainance Fee Date</property>
+  <property name="label_edit">Maintainance Fee Date</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -21,10 +21,10 @@
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="String Widget">
-  <property name="title">Accommodation Maintainance SC-Pin</property>
+  <property name="title">Maintainance Fee Access Code</property>
   <property name="fields">
    <element value="acco_maint_sc_pin"/>
   </property>
-  <property name="label">Accommodation Maintainance SC-Pin</property>
-  <property name="label_edit">Accommodation Maintainance SC-Pin</property>
+  <property name="label">Maintainance Fee Access Code</property>
+  <property name="label_edit">Maintainance Fee Access Code</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -33,10 +33,10 @@
  </widget>
  <widget name="acco_res_date" meta_type="DateTime Widget">
-  <property name="title">Accommodation Reservation Date</property>
+  <property name="title">Reservation Date</property>
   <property name="fields">
    <element value="acco_res_date"/>
   </property>
-  <property name="label">Accommodation Reservation Date</property>
-  <property name="label_edit">Accommodation Reservation Date</property>
+  <property name="label">Reservation Date</property>
+  <property name="label_edit">Reservation Date</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -45,10 +45,10 @@
  </widget>
  <widget name="acco_res_sc_pin" meta_type="String Widget">
-  <property name="title">Accommodation Reservation SC-Pin</property>
+  <property name="title">Reservation Access Code</property>
   <property name="fields">
    <element value="acco_res_sc_pin"/>
   </property>
-  <property name="label">Accommodation Reservation SC-Pin</property>
-  <property name="label_edit">Accommodation Reservation SC-Pin</property>
+  <property name="label">Reservation Access Code</property>
+  <property name="label_edit">Reservation Access Code</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
