Index: WAeUP_SRP/trunk/profiles/default/accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 502)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="portal_catalog" meta_type="CMF Catalog">
+<object name="portal_accommodation" meta_type="CMF Catalog">
  <column value="bed"/>
  <column value="student"/>
Index: WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 502)
@@ -3,5 +3,4 @@
  <property name="title"></property>
  <object name="accommodation" meta_type="CPS Layout"/>
- <object name="accopay" meta_type="CPS Layout"/>
  <object name="certificate" meta_type="CPS Layout"/>
  <object name="certificate_course" meta_type="CPS Layout"/>
Index: WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml	(revision 502)
@@ -33,19 +33,16 @@
   <property name="max_value">100000</property>
  </widget>
- <widget name="prefix" meta_type="String Widget">
-  <property name="title">Prefix</property>
-  <property name="fields">
-   <element value="prefix"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Prefix</property>
-  <property name="label_edit">Prefix</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">3</property>
-  <property name="size_max">3</property>
- </widget>
- <widget name="sold_by" meta_type="String Widget">
+<widget name="prefix" meta_type="Select Widget">
+ <property name="title">Prefix</property>
+ <property name="fields">
+  <element value="prefix"/>
+ </property>
+ <property name="label">Prefix</property>
+ <property name="label_edit">Prefix</property>
+ <property name="readonly_layout_modes"/>
+ <property name="hidden_layout_modes"/>
+ <property name="hidden_readonly_layout_modes"/>
+ <property name="vocabulary">pin_prefixes</property>
+</widget> <widget name="sold_by" meta_type="String Widget">
   <property name="title">Sold by</property>
   <property name="fields">
Index: WAeUP_SRP/trunk/profiles/default/pins.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/pins.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/pins.xml	(revision 502)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="portal_catalog" meta_type="CMF Catalog">
+<object name="portal_pins" meta_type="CMF Catalog">
  <column value="pin"/>
  <column value="student"/>
Index: WAeUP_SRP/trunk/profiles/default/rolemap.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 502)
@@ -2,4 +2,5 @@
 <rolemap>
   <roles>
+    <role name="Student"/>
     <role name="SectionReader"/>
     <role name="SectionManager"/>
@@ -7,4 +8,5 @@
   <permissions>
     <permission name="List folder contents" acquire="True">
+      <role name="Owner"/>
       <role name="SectionManager"/>
       <role name="SectionReader"/>
@@ -26,8 +28,8 @@
     </permission>
     <permission name="List portal members" acquire="True">
-      <role name="Member"/>
       <role name="SectionManager"/>
     </permission>
     <permission name="Review portal content" acquire="True">
+      <role name="Owner"/>
       <role name="Reviewer"/>
       <role name="SectionManager"/>
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 502)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <object name="student_application" meta_type="CPS Schema">
- <field name="app_ac_batch_no" meta_type="CPS String Field"/>
  <field name="app_ac_date" meta_type="CPS DateTime Field"/>
  <field name="app_ac_pin" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
+  <property name="is_searchabletext">False</property>
  </field>
- <field name="app_ac_prefix" meta_type="CPS String Field"/>
  <field name="entry_mode" meta_type="CPS String Field"/>
  <field name="jamb_age" meta_type="CPS Int Field"/>
Index: WAeUP_SRP/trunk/profiles/default/skins.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 501)
+++ WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 502)
@@ -9,4 +9,6 @@
  <object name="waeup_academics" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_academics"/>
+ <object name="waeup_pins" meta_type="Filesystem Directory View"
+    directory="WAeUP_SRP/skins/waeup_pins"/>
  <object name="waeup_student" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_student"/>
@@ -14,4 +16,5 @@
   <layer name="waeup_custom" insert-after="custom"/>
   <layer name="waeup_default" insert-after="waeup_custom"/>
+  <layer name="waeup_pins" insert-after="waeup_custom"/>
   <layer name="waeup_student" insert-after="waeup_custom"/>
   <layer name="waeup_academics" insert-after="waeup_custom"/>
@@ -20,4 +23,5 @@
   <layer name="waeup_custom" insert-after="custom"/>
   <layer name="waeup_default" insert-after="waeup_custom"/>
+  <layer name="waeup_pins" insert-after="waeup_custom"/>
   <layer name="waeup_student" insert-after="waeup_custom"/>
   <layer name="waeup_academics" insert-after="waeup_custom"/>
Index: WAeUP_SRP/trunk/profiles/default/skins/waeup_pins.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/skins/waeup_pins.xml	(revision 502)
+++ WAeUP_SRP/trunk/profiles/default/skins/waeup_pins.xml	(revision 502)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<object name="waeup_pins" meta_type="Folder">
+ <property name="title"></property>
+</object>
