Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.17 -r1.17.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	29 Nov 2006 22:49:07 -0000	1.17
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	20 Apr 2007 06:05:16 -0000	1.17.2.1
@@ -152,6 +152,36 @@
             not-null="true"
         </meta>    
     </property>
+    
+    <property
+        name="canJoinJointLessons"
+        type="java.lang.Boolean"
+        column="can_join_joint_lessons"
+        not-null="false"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="can_join_joint_lessons"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    
+    <property
+        name="canOfferJointLessons"
+        type="java.lang.Boolean"
+        column="can_offer_joint_lessons"
+        not-null="false"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="can_offer_joint_lessons"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
 
     <!-- Associations -->
   
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.86.2.1 -r1.86.2.2
--- lams_common/db/sql/create_lams_11_tables.sql	12 Mar 2007 01:31:53 -0000	1.86.2.1
+++ lams_common/db/sql/create_lams_11_tables.sql	20 Apr 2007 06:05:16 -0000	1.86.2.2
@@ -229,6 +229,8 @@
      , admin_create_guest TINYINT(1) NOT NULL DEFAULT 0
      , locale_id INTEGER
      , archived_date DATETIME
+     , can_join_joint_lessons TINYINT(1) NOT NULL DEFAULT 0
+     , can_offer_joint_lessons TINYINT(1) NOT NULL DEFAULT 0
      , PRIMARY KEY (organisation_id)
      , INDEX (organisation_type_id)
      , CONSTRAINT FK_lams_organisation_1 FOREIGN KEY (organisation_type_id)
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v
diff -u -r1.16 -r1.16.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	29 Nov 2006 22:49:07 -0000	1.16
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	20 Apr 2007 06:05:16 -0000	1.16.2.1
@@ -95,13 +95,20 @@
     
     /** persistent field */
     private Date archivedDate;
+    
+    /** persistent field */
+    private Boolean canJoinJointLessons;
+    
+    /** persistent field */
+    private Boolean canOfferJointLessons;
 
     /** full constructor */
     public Organisation(String name, String description, Organisation parentOrganisation, 
     			Date createDate, User createdBy, Workspace workspace, 
     			OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons,
     			Boolean courseAdminCanAddNewUsers, Boolean courseAdminCanBrowseAllUsers, Boolean courseAdminCanChangeStatusOfCourse, 
-    			Boolean courseAdminCanCreateGuestAccounts) {
+    			Boolean courseAdminCanCreateGuestAccounts, Date archivedDate, Boolean canJoinJointLessons,
+    			Boolean canOfferJointLessons) {
         this.name = name;
         this.description = description;
         this.parentOrganisation = parentOrganisation;
@@ -116,6 +123,8 @@
         this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
         this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
         this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
+        this.canJoinJointLessons = canJoinJointLessons;
+        this.canOfferJointLessons = canOfferJointLessons;
     }
 
     /** default constructor */
@@ -124,7 +133,8 @@
         this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
         this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
         this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
-
+        this.canJoinJointLessons = Boolean.FALSE;
+        this.canOfferJointLessons = Boolean.FALSE;
     }
 
     /** minimal constructor */
@@ -141,6 +151,8 @@
         this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
         this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
         this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
+        this.canJoinJointLessons = Boolean.FALSE;
+        this.canOfferJointLessons = Boolean.FALSE;
     }
     public Organisation(String name, 
     					String description,						
@@ -412,8 +424,38 @@
     public void setCourseAdminCanCreateGuestAccounts(Boolean courseAdminCanCreateGuestAccounts) {
         this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
     }
+    
+    /** 
+     *            @hibernate.property
+     *              column="can_join_joint_lessons"
+     *              length="1"
+     *              not-null="true"
+     *         
+     */
+    public Boolean getCanJoinJointLessons() {
+        return this.canJoinJointLessons;
+    }
 
+    public void setCanJoinJointLessons(Boolean canJoinJointLessons) {
+        this.canJoinJointLessons = canJoinJointLessons;
+    }
     
+    /** 
+     *            @hibernate.property
+     *              column="can_offer_joint_lessons"
+     *              length="1"
+     *              not-null="true"
+     *         
+     */
+    public Boolean getCanOfferJointLessons() {
+        return this.canOfferJointLessons;
+    }
+
+    public void setCanOfferJointLessons(Boolean canOfferJointLessons) {
+        this.canOfferJointLessons = canOfferJointLessons;
+    }
+
+    
    
 	public String toString() {
         return new ToStringBuilder(this)