Index: WAeUP_SRP/trunk/profiles/default/layouts/certificate.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/certificate.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/certificate.xml	(revision 370)
@@ -28,17 +28,4 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="code" meta_type="String Widget">
-  <property name="title">Code</property>
-  <property name="fields">
-   <element value="code"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Code</property>
-  <property name="label_edit">Code</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">20</property>
  </widget>
  <widget name="end_level" meta_type="Select Widget">
@@ -100,4 +87,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="original_code" meta_type="String Widget">
+  <property name="title">Original Code</property>
+  <property name="fields">
+   <element value="original_code"/>
+  </property>
+  <property name="label">Original Code</property>
+  <property name="label_edit">Original Code</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="probation_credits" meta_type="Int Widget">
   <property name="title">Probation  Credits</property>
@@ -136,5 +134,5 @@
  <table>
   <row>
-   <cell name="code"/>
+   <cell name="original_code"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/course.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/course.xml	(revision 370)
@@ -17,14 +17,4 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="code" meta_type="String Widget">
-  <property name="title">Code</property>
-  <property name="fields">
-   <element value="code"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Code</property>
-  <property name="label_edit">Code</property>
-  <property name="display_width">10</property>
  </widget>
  <widget name="credits" meta_type="Int Widget">
@@ -75,17 +65,5 @@
  <table>
   <row>
-   <cell name="code"/>
-  </row>
-  <row>
-   <cell name="org_code"/>
-  </row>
-  <row>
-   <cell name="category"/>
-  </row>
-  <row>
    <cell name="credits"/>
-  </row>
-  <row>
-   <cell name="semester"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/department.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/department.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/department.xml	(revision 370)
@@ -28,5 +28,22 @@
   <property name="size_max">200</property>
  </widget>
+ <widget name="code" meta_type="String Widget">
+  <property name="title">Object ID</property>
+  <property name="fields">
+   <element value="code"/>
+  </property>
+  <property name="label">Object ID</property>
+  <property name="label_edit">Object ID</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="edit"/>
+   <element value="view"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <table>
+  <row>
+   <cell name="code"/>
+  </row>
   <row>
    <cell name="Title"/>
Index: WAeUP_SRP/trunk/profiles/default/layouts/faculty.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/faculty.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/faculty.xml	(revision 370)
@@ -64,7 +64,4 @@
  <table>
   <row>
-   <cell name="Title"/>
-  </row>
-  <row>
    <cell name="institution_type"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 370)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 370)
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<object name="student_study_course" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_default_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+ <widget name="course_major" meta_type="String Widget">
+  <property name="title">Course Major</property>
+  <property name="fields">
+   <element value="course_major"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Course Major</property>
+  <property name="label_edit">Course Major</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="department" meta_type="Select Widget">
+  <property name="title">Department</property>
+  <property name="fields">
+   <element value="department"/>
+  </property>
+  <property name="label">Department</property>
+  <property name="label_edit">Department</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">get_departments_voc</property>
+ </widget>
+ <widget name="entry_reg_no" meta_type="String Widget">
+  <property name="title">Entry Registration No</property>
+  <property name="fields">
+   <element value="entry_reg_no"/>
+  </property>
+  <property name="label">Entry Registration No</property>
+  <property name="label_edit">Entry Registration No</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="entry_session" meta_type="String Widget">
+  <property name="title">Entry Session</property>
+  <property name="fields">
+   <element value="entry_session"/>
+  </property>
+  <property name="label">Entry Session</property>
+  <property name="label_edit">Entry Session</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="faculty" meta_type="Select Widget">
+  <property name="title">Faculty</property>
+  <property name="fields">
+   <element value="faculty"/>
+  </property>
+  <property name="label">Faculty</property>
+  <property name="label_edit">Faculty</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">get_faculties_voc</property>
+ </widget>
+ <widget name="matricel_no" meta_type="String Widget">
+  <property name="title">Matricel No</property>
+  <property name="fields">
+   <element value="matricel_no"/>
+  </property>
+  <property name="label">Matricel No</property>
+  <property name="label_edit">Matricel No</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <table>
+  <row>
+   <cell name="entry_reg_no"/>
+  </row>
+  <row>
+   <cell name="matricel_no"/>
+  </row>
+  <row>
+   <cell name="faculty"/>
+  </row>
+  <row>
+   <cell name="department"/>
+  </row>
+  <row>
+   <cell name="course_major"/>
+  </row>
+  <row>
+   <cell name="entry_session"/>
+  </row>
+ </table>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/layouts/study_level.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/study_level.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/study_level.xml	(revision 370)
@@ -4,7 +4,19 @@
  <property name="layout_edit_method"></property>
  <property name="layout_view_method"></property>
- <property name="style_prefix">layout_slregister_</property>
+ <property name="style_prefix">layout_waeup_</property>
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
+ <widget name="Title" meta_type="String Widget">
+  <property name="title">Title</property>
+  <property name="fields">
+   <element value="Title"/>
+  </property>
+  <property name="label">Level Nr</property>
+  <property name="label_edit">Level Nr</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">40</property>
+ </widget>
  <widget name="sc_id" meta_type="String Widget">
   <property name="title">SC ID</property>
@@ -55,8 +67,5 @@
  <table>
   <row>
-   <cell name="sc_value"/>
-  </row>
-  <row>
-   <cell name="sc_pin"/>
+   <cell name="Title"/>
   </row>
  </table>
Index: WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml	(revision 369)
+++ WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml	(revision 370)
@@ -15,12 +15,28 @@
   <property name="label_edit">Title</property>
   <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-   <element value="view"/>
-  </property>
+  <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">40</property>
   <property name="size_max">200</property>
  </widget>
+ <widget name="code" meta_type="String Widget">
+  <property name="title">Object ID</property>
+  <property name="fields">
+   <element value="code"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Object ID</property>
+  <property name="label_edit">Object ID</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="edit"/>
+   <element value="view"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <table>
+  <row>
+   <cell name="code"/>
+  </row>
   <row>
    <cell name="Title"/>
