Index: WAeUP_SRP/fceokene/profiles/default/accommodation.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/accommodation.xml	(revision 2844)
+++ WAeUP_SRP/fceokene/profiles/default/accommodation.xml	(revision 2845)
@@ -3,4 +3,5 @@
 <object name="portal_accommodation" meta_type="WAeUP Table">
  <column value="bed"/>
+ <column value="sort_id"/>
  <column value="bed_type"/>
  <column value="hall"/>
@@ -12,4 +13,7 @@
   <indexed_attr value="bed_type"/>
  </index>
+ <index name="sort_id" meta_type="FieldIndex">
+  <indexed_attr value="sort_id"/>
+ </index>
  <index name="student" meta_type="FieldIndex">
   <indexed_attr value="student"/>
Index: WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml	(revision 2844)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml	(revision 2845)
@@ -9,10 +9,10 @@
  <property name="validate_values_expr"></property>
  <widget name="amount" meta_type="String Widget">
-  <property name="title">Fee Authorized</property>
+  <property name="title">Amount Authorized</property>
   <property name="fields">
    <element value="amount"/>
   </property>
-  <property name="label">Fee Authorized</property>
-  <property name="label_edit">Fee Authorized</property>
+  <property name="label">Amount Authorized</property>
+  <property name="label_edit">Amount Authorized</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -115,4 +115,68 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="status" meta_type="Select Widget">
+  <property name="title">Payment status</property>
+  <property name="fields">
+   <element value="status"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment Status</property>
+  <property name="label_edit">Payment Status</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">payment_status</property>
+ </widget>
+ <widget name="subject" meta_type="Select Widget">
+  <property name="title">Payment Subject</property>
+  <property name="fields">
+   <element value="subject"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment Subject</property>
+  <property name="label_edit">Payment Subject</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">payment_subjects</property>
+ </widget>
+ <widget name="target" meta_type="String Widget">
+  <property name="title">Payment Target</property>
+  <property name="fields">
+   <element value="target"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment for</property>
+  <property name="label_edit">Payment for</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="type" meta_type="Select Widget">
+  <property name="title">Payment Type</property>
+  <property name="fields">
+   <element value="type"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment Type</property>
+  <property name="label_edit">Payment Type</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">payment_types</property>
+ </widget>
+ <widget name="session_id" meta_type="Select Widget">
+  <property name="title">Session</property>
+  <property name="fields">
+   <element value="session_id"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Session</property>
+  <property name="label_edit">Session</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">sessions</property>
+ </widget>
  <widget name="type_description" meta_type="String Widget">
   <property name="title">Payment Description</property>
@@ -123,5 +187,5 @@
   <property name="label_edit">Payment Description</property>
   <property name="display_width">40</property>
-  <property name="size_max">40</property>
+  <property name="size_max">40</property>  
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -136,4 +200,19 @@
   </row>
   <row>
+   <cell name="status"/>
+  </row>
+  <row>
+   <cell name="type"/>
+  </row>
+  <row>
+   <cell name="subject"/>
+  </row>
+  <row>
+   <cell name="target"/>
+  </row>
+  <row>
+   <cell name="session_id"/>
+  </row>
+  <row>
    <cell name="date"/>
   </row>
Index: WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml	(revision 2844)
+++ WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml	(revision 2845)
@@ -2,17 +2,25 @@
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
 <object name="payment" meta_type="CPS Schema">
+  <field name="key" meta_type="CPS String Field"/>
   <field name="date" meta_type="CPS DateTime Field"/>
   <field name="type_code" meta_type="CPS String Field"/>
   <field name="type_description" meta_type="CPS String Field" >
-    <property name="is_searchabletext">True</property>
+    <property name="is_searchabletext">False</property>
   </field> 
   <field name="amount" meta_type="CPS String Field"/>
+  <field name="description" meta_type="CPS String Field"/>
+  <field name="subject" meta_type="CPS String Field"/>
+  <field name="type" meta_type="CPS String Field"/>
+  <field name="target" meta_type="CPS String Field"/>
+  <field name="status" meta_type="CPS String Field"/>
   <field name="resp_pay_reference" meta_type="CPS String Field"/>
   <field name="resp_desc" meta_type="CPS String Field">
-    <property name="is_searchabletext">True</property>
+    <property name="is_searchabletext">False</property>
   </field> 
   <field name="order_id" meta_type="CPS String Field"/>
+  <field name="session_id" meta_type="CPS String Field"/>
   <field name="resp_code" meta_type="CPS String Field"/>
   <field name="resp_card_num" meta_type="CPS String Field"/>
+  <field name="resp_date" meta_type="CPS DateTime Field"/>
   <field name="resp_approved_amount" meta_type="CPS String Field"/>
 </object>
