=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2012-05-17 19:54:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2012-05-24 05:13:57 +0000
@@ -102,8 +102,6 @@
 
     private String phoneNumber;
 
-    private boolean hasPatients;
-
     private Set<OrganisationUnitGroup> groups = new HashSet<OrganisationUnitGroup>();
 
     private Set<DataSet> dataSets = new HashSet<DataSet>();
@@ -746,19 +744,6 @@
     @JsonProperty
     @JsonView( {DetailedView.class, ExportView.class} )
     @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
-    public boolean isHasPatients()
-    {
-        return hasPatients;
-    }
-
-    public void setHasPatients( boolean hasPatients )
-    {
-        this.hasPatients = hasPatients;
-    }
-
-    @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
-    @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
     public String getType()
     {
         return type;
@@ -903,7 +888,6 @@
             address = organisationUnit.getAddress() == null ? address : organisationUnit.getAddress();
             email = organisationUnit.getEmail() == null ? email : organisationUnit.getEmail();
             phoneNumber = organisationUnit.getPhoneNumber() == null ? phoneNumber : organisationUnit.getPhoneNumber();
-            hasPatients = organisationUnit.isHasPatients();
             parent = organisationUnit.getParent();
 
             groups.clear();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java	2012-05-14 20:24:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java	2012-05-24 05:13:57 +0000
@@ -332,10 +332,6 @@
 
     int getMaxOfOrganisationUnitLevels();
 
-    void updateOrganisationUnits( Collection<OrganisationUnit> units );
-
-    Collection<OrganisationUnit> getOrganisationUnits( Boolean hasPatients );
-
     // -------------------------------------------------------------------------
     // Version
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java	2012-04-23 09:49:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java	2012-05-24 05:13:57 +0000
@@ -97,7 +97,4 @@
      */
     void updateOrganisationUnitParent( int organisationUnitId, int parentId );
 
-    void update( Collection<OrganisationUnit> units );
-
-    Collection<OrganisationUnit> get( Boolean hasPatients );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2012-05-14 20:24:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2012-05-24 05:13:57 +0000
@@ -687,18 +687,6 @@
         return organisationUnitLevelStore.getMaxLevels();
     }
 
-    @Override
-    public void updateOrganisationUnits( Collection<OrganisationUnit> units )
-    {
-        organisationUnitStore.update( units );
-    }
-
-    @Override
-    public Collection<OrganisationUnit> getOrganisationUnits( Boolean hasPatients )
-    {
-        return organisationUnitStore.get( hasPatients );
-    }
-
     // -------------------------------------------------------------------------
     // Version
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java	2012-04-23 09:49:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java	2012-05-24 05:13:57 +0000
@@ -27,21 +27,29 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
-import org.hisp.dhis.organisationunit.*;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitHierarchy;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.organisationunit.OrganisationUnitStore;
 import org.hisp.dhis.system.objectmapper.OrganisationUnitRelationshipRowMapper;
 import org.springframework.jdbc.core.RowCallbackHandler;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.*;
-
 /**
  * @author Kristian Nordal
  */
@@ -192,46 +200,4 @@
 
         jdbcTemplate.execute( sql );
     }
-
-    @Override
-    public void update( Collection<OrganisationUnit> units )
-    {
-        Timestamp now = new Timestamp( new Date().getTime() );
-
-        Collection<Integer> unitIds = new HashSet<Integer>();
-
-        for ( OrganisationUnit orgunit : units )
-        {
-            unitIds.add( orgunit.getId() );
-        }
-
-        if ( unitIds.size() > 0 )
-        {
-            String sql = "update OrganisationUnit set hasPatients=true,lastUpdated='" + now +
-                "' where organisationunitid in (:unitIds)";
-            Query query = sessionFactory.getCurrentSession().createQuery( sql );
-            query.setParameterList( "unitIds", unitIds );
-            query.executeUpdate();
-
-            sql = "UPDATE OrganisationUnit SET hasPatients=false,lastUpdated='" + now +
-                "' WHERE organisationunitid not in ( :unitIds )";
-            query = sessionFactory.getCurrentSession().createQuery( sql );
-            query.setParameterList( "unitIds", unitIds );
-            query.executeUpdate();
-        }
-        else
-        {
-            String sql = "update OrganisationUnit set hasPatients=false,,lastUpdated='" + now + "'";
-            Query query = sessionFactory.getCurrentSession().createQuery( sql );
-            query.executeUpdate();
-        }
-    }
-
-    @SuppressWarnings( "unchecked" )
-    public Collection<OrganisationUnit> get( Boolean hasPatients )
-    {
-        Criteria criteria = sessionFactory.getCurrentSession().createCriteria( OrganisationUnit.class );
-
-        return criteria.add( Restrictions.eq( "hasPatients", hasPatients ) ).list();
-    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-04-25 13:42:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-05-24 05:13:57 +0000
@@ -154,6 +154,8 @@
         executeSql( "ALTER TABLE indicator DROP COLUMN extendeddataelementid" );
         executeSql( "DROP TABLE extendeddataelement" );
         
+        executeSql( "ALTER TABLE organisationunit DROP COLUMN hasPatients" );
+        
         // ---------------------------------------------------------------------
         // Update tables for dimensional model
         // ---------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2012-05-08 17:24:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2012-05-24 05:13:57 +0000
@@ -44,8 +44,6 @@
 
     <property name="url" />
 
-    <property name="hasPatients" not-null="true" />
-
     <set name="dataSets" table="datasetsource" inverse="true">
       <cache usage="read-write" />
       <key column="sourceid" />

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2012-05-24 05:13:57 +0000
@@ -103,7 +103,6 @@
         statementBuilder.setColumn( "featuretype" );
         statementBuilder.setColumn( "coordinates" );
         statementBuilder.setColumn( "lastupdated" );
-        statementBuilder.setColumn( "haspatients" );
     }
     
     protected void setValues( OrganisationUnit unit )
@@ -121,6 +120,5 @@
         statementBuilder.setValue( unit.getFeatureType() );
         statementBuilder.setValue( unit.getCoordinates() );
         statementBuilder.setValue( unit.getLastUpdated() );
-        statementBuilder.setValue( unit.isHasPatients() );
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	2012-04-08 20:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	2012-05-24 05:13:57 +0000
@@ -37,10 +37,6 @@
           <td>Active</td>
           <td> <xsl:value-of select="d:active" /> </td>
         </tr>
-        <tr>
-          <td>Has Patients</td>
-          <td> <xsl:value-of select="d:hasPatients" /> </td>
-        </tr>
 
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SelectAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SelectAction.java	2011-09-27 08:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SelectAction.java	2012-05-24 05:13:57 +0000
@@ -115,15 +115,6 @@
 
         organisationUnit = selectionManager.getSelectedOrganisationUnit();
 
-        if ( organisationUnit == null )
-        {
-            status = 1;
-        }
-        else if ( !organisationUnit.isHasPatients() )
-        {
-            status = 2;
-        }
-
         return SUCCESS;
     }
 }

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrganisationUnitHasParentAction.java	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.caseentry.action.patient;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- */
-public class VerifyOrganisationUnitHasParentAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer orgunitId;
-
-    public void setOrgunitId( Integer orgunitId )
-    {
-        this.orgunitId = orgunitId;
-    }
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    private String message;
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgunitId );
-
-        message = organisationUnit.getName();
-
-        if ( !organisationUnit.isHasPatients() )
-        {
-            return INPUT;
-        }
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrgunitRegistrationAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrgunitRegistrationAction.java	2012-03-27 14:19:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/VerifyOrgunitRegistrationAction.java	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.caseentry.action.patient;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.oust.manager.SelectionTreeManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * 
- * @version $VerifyOrgunitRegistrationAction.java Mar 27, 2012 04:58:27 PM$
- */
-public class VerifyOrgunitRegistrationAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private SelectionTreeManager selectionTreeManager;
-
-    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
-    {
-        this.selectionTreeManager = selectionTreeManager;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        OrganisationUnit orgunit = selectionTreeManager.getReloadedSelectedOrganisationUnit();
-
-        if ( orgunit == null || !orgunit.isHasPatients() )
-        {
-            return INPUT;
-        }
-
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-05-23 19:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-05-24 05:13:57 +0000
@@ -400,14 +400,6 @@
 		<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
 	</bean>
 
-	<bean
-		id="org.hisp.dhis.caseentry.action.patient.VerifyOrganisationUnitHasParentAction"
-		class="org.hisp.dhis.caseentry.action.patient.VerifyOrganisationUnitHasParentAction"
-		scope="prototype">
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-	</bean>
-
 	<bean id="org.hisp.dhis.caseentry.action.patient.SearchPatientAction"
 		class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction"
 		scope="prototype">
@@ -559,14 +551,6 @@
 	</bean>
 
 	<bean
-		id="org.hisp.dhis.caseentry.action.patient.VerifyOrgunitRegistrationAction"
-		class="org.hisp.dhis.caseentry.action.patient.VerifyOrgunitRegistrationAction"
-		scope="prototype">
-		<property name="selectionTreeManager"
-			ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-	</bean>
-
-	<bean
 		id="org.hisp.dhis.caseentry.action.patient.RegisterPatientLocationAction"
 		class="org.hisp.dhis.caseentry.action.patient.RegisterPatientLocationAction"
 		scope="prototype">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-05-09 08:30:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-05-24 05:13:57 +0000
@@ -351,14 +351,6 @@
 			<param name="requiredAuthorities">F_PATIENT_MANAGEMENT</param>
 		</action>
 
-		<action name="organisationUnitHasPatients"
-			class="org.hisp.dhis.caseentry.action.patient.VerifyOrganisationUnitHasParentAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm</result>
-		</action>
-
 		<action name="searchRegistrationPatient"
 			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
 			<result name="success" type="velocity">/content.vm</result>
@@ -462,14 +454,6 @@
 			<param name="requiredAuthorities">F_PATIENT_UPDATE</param>
 		</action>
 		
-		<action name="verifyOrgunitRegistration"
-			class="org.hisp.dhis.caseentry.action.patient.VerifyOrgunitRegistrationAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-			<result name="input" type="velocity-json">
-				/dhis-web-commons/ajax/jsonResponseInput.vm</result>
-		</action>
-		
 		<action name="registerPatientLocation"
 			class="org.hisp.dhis.caseentry.action.patient.RegisterPatientLocationAction">
 			<result name="success" type="velocity-json">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-05-23 15:02:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-05-24 05:13:57 +0000
@@ -5,38 +5,17 @@
 var COLOR_RED = '#ff8a8a';
 var COLOR_GREY = '#cccccc';
 
-function organisationUnitSelected( orgUnits )
+function organisationUnitSelected( orgUnits, orgUnitNames )
 {	
 	showById('selectDiv');
-	disable('listPatientBtn');
-	
-	hideById('searchPatientDiv');
+	showById('searchPatientDiv');
 	hideById('listPatientDiv');
 	hideById('editPatientDiv');
 	hideById('enrollmentDiv');
 	hideById('listRelationshipDiv');
 	hideById('addRelationshipDiv');
 	hideById('migrationPatientDiv');
-	
-	$.getJSON( 'organisationUnitHasPatients.action', {orgunitId:orgUnits[0]}
-		, function( json ) 
-		{
-			var type = json.response;
-			setFieldValue('selectedOrgunitText', json.message );
-				
-			if( type == 'success' )
-			{
-				showById('searchPatientDiv');
-				enable('listPatientBtn');
-				setInnerHTML('warnmessage','');
-				setFieldValue('selectedOrgunitText', json.message );
-			}
-			else if( type == 'input' )
-			{
-				setInnerHTML('warnmessage', i18n_can_not_register_patient_for_orgunit);
-				disable('listPatientBtn');
-			}
-		} );
+	setFieldValue("selectedOrgunitText", orgUnitNames[0]);
 }
 
 selection.setListenerFunction( organisationUnitSelected );
@@ -875,23 +854,6 @@
 		});
 }
 
-function verifyOrgunitRegistration( patientId )
-{
-	$.getJSON( 'verifyOrgunitRegistration.action', {}
-		, function( json ) 
-		{
-			var type = json.response;
-			if( type == 'success' )
-			{
-				registerPatientLocation( patientId );
-			}
-			else if( type == 'input' )
-			{
-				showWarningMessage( i18n_can_not_register_patient_for_orgunit);
-			}
-		} );
-}
-
 function registerPatientLocation( patientId )
 {
 	$.getJSON( 'registerPatientLocation.action',{ patientId:patientId }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-03-27 14:19:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-05-24 05:13:57 +0000
@@ -10,7 +10,7 @@
 		</tr>
 		<tr>
 			<td>
-				<input type="button" class='button' value="$i18n.getString('save')" style="width:10em" onclick='verifyOrgunitRegistration( "$patientId" )'>
+				<input type="button" class='button' value="$i18n.getString('save')" style="width:10em" onclick='registerPatientLocation( "$patientId" )'>
 				<input type="button" class='button' value="$i18n.getString( 'back_to_registration' )" onclick="loadPatientList();" >
 			</td>
 			<td></td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-05-03 10:18:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-05-24 05:13:57 +0000
@@ -7,14 +7,16 @@
 		<tr>
 			<td><label>$i18n.getString( "registering_unit" )</label></td>
 			<td style="padding-right:5px"><input type="text" id='selectedOrgunitText' readonly style="min-width:16em"></td>
-			<td style="padding-right:5px"><input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'></td>
-			<td><span id='warnmessage' style='color:red'></span></td>
+			<td style="padding-right:5px">
+				<input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'>
+			</td>
+			<td><input type="button" value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();"></td>
 		</tr>
 	</table>
 
 </div>
 
-<div id='searchPatientDiv' style='display:none'>
+<div id='searchPatientDiv'>
 	<table id='advancedSearchTB'>	
 		<tbody>
 			<tr id='advSearchBox0'>	       
@@ -38,7 +40,6 @@
 					<input type="button" value='$i18n.getString( "search" )' onclick='searchAdvancedPatients();'>
 				</td>
 				<td>&nbsp;</td>
-				<td><input type="button" value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();"></td>
 			</tr>
 		</tbody>
 	</table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-05-24 05:13:57 +0000
@@ -51,14 +51,6 @@
       <result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>	
-
-	<action name="organisationUnitHasPatients"
-		class="org.hisp.dhis.caseentry.action.patient.VerifyOrganisationUnitHasParentAction">
-		<result name="success" type="velocity-json">
-			/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-		<result name="input" type="velocity-json">
-			/dhis-web-commons/ajax/jsonResponseInput.vm</result>
-	</action>
 	
 	<action name="searchRegistrationPatient"
 		class="org.hisp.dhis.mobile.action.SearchPatientAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/css/caseentry-patient.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/css/caseentry-patient.css	2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/css/caseentry-patient.css	2012-05-24 05:13:57 +0000
@@ -65,10 +65,6 @@
 .togglePanel.open {height:25px;padding-left:25px; background-image:  url(../images/open.gif) ; background-repeat: no-repeat; background-position: top left}
 .togglePanel.close {height:25px;padding-left:25px;  background-image:  url(../images/close.gif) ; background-repeat: no-repeat; background-position: top left}
 
-.warnmessage {
-	color: red;
-}
-
 #facilityCol
 {
 	width: 130px;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js	2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/caseentry-patient.js	2012-05-24 05:13:57 +0000
@@ -5,31 +5,12 @@
 var COLOR_RED = '#ff8a8a';
 var COLOR_GREY = '#cccccc';
 
-function organisationUnitSelected( orgUnits )
+function organisationUnitSelected( orgUnits, orgunitNames )
 {	
 	showById('selectDiv');
-	disable('listPatientBtn');
 	hideById('listPatientDiv');
-	
-	$.getJSON( 'organisationUnitHasPatients.action', {orgunitId:orgUnits[0]}
-		, function( json ) 
-		{
-			var type = json.response;
-			setFieldValue('selectedOrgunitText', json.message );
-				
-			if( type == 'success' )
-			{
-				showById('searchPatientDiv');
-				enable('listPatientBtn');
-				setInnerHTML('warnmessage','');
-				setFieldValue('selectedOrgunitText', json.message );
-			}
-			else if( type == 'input' )
-			{
-				setInnerHTML('warnmessage', i18n_can_not_register_patient_for_orgunit);
-				disable('listPatientBtn');
-			}
-		} );
+	showById('searchPatientDiv');
+	setFieldValue('selectedOrgunitText', orgunitNames[0] );
 }
 
 selection.setListenerFunction( organisationUnitSelected );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm	2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm	2012-05-24 05:13:57 +0000
@@ -74,7 +74,6 @@
 				<td><label>$i18n.getString( "registering_unit" )</label></td>
 				<td><input type="text" id='selectedOrgunitText' readonly style="min-width:16em"></td>
 				<td><input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick='loadAllPatients();'></td>
-				<td><span id='warnmessage' style='color:red'></span></td>
 			</tr>	
 		
 			<tr id='advSearchBox0'>	       

=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patient.action.orgunitregistration;
-
-import java.util.Collection;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.oust.manager.SelectionTreeManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $Id DefinePatientOrgnunitRegistrationAction.java Jan 7, 2011
- *          11:04:43 AM $
- */
-public class DefinePatientOrgnunitRegistrationAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private SelectionTreeManager selectionTreeManager;
-
-    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
-    {
-        this.selectionTreeManager = selectionTreeManager;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        Collection<OrganisationUnit> orgunits = selectionTreeManager.getReloadedSelectedOrganisationUnits();
-
-        organisationUnitService.updateOrganisationUnits( orgunits );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.patient.action.orgunitregistration;
-
-import java.util.Collection;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.oust.manager.SelectionTreeManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * @version $Id GetPatientOrgnunitRegistrationAction.java Jan 7, 2011 12:53:46
- *          PM $
- */
-public class GetPatientOrgnunitRegistrationAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private SelectionTreeManager selectionTreeManager;
-
-    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
-    {
-        this.selectionTreeManager = selectionTreeManager;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        Collection<OrganisationUnit> orgunits = organisationUnitService.getOrganisationUnits( true );
-        
-        selectionTreeManager.setSelectedOrganisationUnits( orgunits );
-
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-05-23 19:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-05-24 05:13:57 +0000
@@ -158,28 +158,6 @@
 			ref="org.hisp.dhis.program.ProgramService" />
 	</bean>
 	
-	<!-- Organisation Registration -->
-
-	<bean
-		id="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction"
-		class="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction"
-		scope="prototype">
-		<property name="selectionTreeManager"
-			ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.patient.action.orgunitregistration.DefinePatientOrgnunitRegistrationAction"
-		class="org.hisp.dhis.patient.action.orgunitregistration.DefinePatientOrgnunitRegistrationAction"
-		scope="prototype">
-		<property name="selectionTreeManager"
-			ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
-	</bean>
-
 	<!-- Program -->
 
 	<bean id="org.hisp.dhis.patient.action.program.AddProgramAction"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-05-23 16:19:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-05-24 05:13:57 +0000
@@ -115,7 +115,6 @@
 intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Beneficiary data.
 intro_program_attribute=Create, modify and view Program attributes. A program can have any number of attributes.
 intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database.
-intro_patient_organisation_unit_registration=Define the organisation units which should be allowed to register beneficiaries.
 intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data.
 inheritable=Inheritable
 patient_attribute_details=Beneficiary attribute details
@@ -168,7 +167,6 @@
 orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
 program_attribute_details=Program attribute details
-patient_organisation_unit_registration=Beneficiary Organisation Unit Registration
 select_program=Select program
 add_single_program_validation=Add Single Program Validation
 add_multi_program_validation=Add Multi Program Validation

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-05-24 03:10:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-05-24 05:13:57 +0000
@@ -176,22 +176,6 @@
 			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_DELETE</param>
 		</action>
 
-		<!-- Patient -->
-
-		<action name="defineOrgunitRegistrationForm"
-			class="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-maintenance-patient/orgunitRegistration.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
-		</action>
-
-		<action name="defineOrgunitRegistration"
-			class="org.hisp.dhis.patient.action.orgunitregistration.DefinePatientOrgnunitRegistrationAction">
-			<result name="success" type="redirect">index.action</result>
-			<param name="requiredAuthorities">F_ORGANISATION_REGISTRATION</param>
-		</action>
-
 		<!-- Program -->
 
 		<action name="program"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-05-23 19:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-05-24 05:13:57 +0000
@@ -12,7 +12,6 @@
     #introListImgItem( "patientAttributeGroup.action" "patient_attribute_group" "patient" )
     #introListImgItem( "patientIdentifierType.action" "patient_identifier_type" "patient" )
     #introListImgItem( "relationshipType.action" "relationship_type" "patient" )
-	#introListImgItem( "defineOrgunitRegistrationForm.action" "patient_organisation_unit_registration" "patient" )
     #introListImgItem( "program.action" "program" "program" )
     #introListImgItem( "caseAggregation.action" "beneficiary_aggregation_query_builder" "caseaggregationmapping" )
 	#introListImgItem( "validationCriteria.action" "validation_criteria" "validationcriteria" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-05-23 19:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-05-24 05:13:57 +0000
@@ -4,7 +4,6 @@
 	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
 	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
 	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
-	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_org_unit_registration" )</a></li>
 </ul>
 
 <h2>$i18n.getString( "programs" )</h2>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm	2012-01-13 07:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-
-<h3>$i18n.getString( "patient_organisation_unit_registration" ) #openHelp( "patient_organisation_unit_registration" )</h3>
-
-<form action='defineOrgunitRegistration.action' method='post'>
-<table>
-<tr>
-	<td>
-		#organisationUnitSelectionTree( false, true, false )
-	</td>
-</tr>
-<tr>
-    <td>
-		<input type="submit"value="$i18n.getString('save')" style="width:10em">
-        <input type="button" onClick="window.location.href = 'index.action';" value="$i18n.getString('cancel')" style="width:10em">
-	</td>
-	<td></td>
-	<td></td>
-</tr>
-</table>