=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-10-16 16:27:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-10-21 07:40:21 +0000
@@ -692,4 +692,5 @@
 selected_items = Selected items
 dimension = Dimension
 events = Events
-add_filter=Add filter
\ No newline at end of file
+add_filter=Add filter
+relationship_description = Relationship description
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2013-10-16 06:40:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2013-10-21 07:40:21 +0000
@@ -80,12 +80,23 @@
 					#set($allowGenerateNextVisit='false')
 					#set($prevStageId='')
 					#foreach( $programStage in $programInstance.program.programStages )
+					
+						#set($reportDateToUse = "")
+						#if($programStageInstance.programStage.reportDateToUse=='registrationDate' )
+							#set($reportDateToUse = "$format.formatDate( $programInstance.patient.registrationDate)")
+						#elseif($programStageInstance.programStage.reportDateToUse=='dateOfIncident' )
+							#set($reportDateToUse = "$format.formatDate( $programInstance.dateOfIncident)")
+						#elseif($programStageInstance.programStage.reportDateToUse=='enrollmentDate' )
+							#set($reportDateToUse = "$format.formatDate( $programInstance.enrollmentDate)")
+						#end
+					
 						#if( $programStage.irregular=='true')
 							#if($!programStage.standardInterval)
 								#set($standardInterval=$!programStage.standardInterval)
 							#else
 								#set($standardInterval=0)
 							#end
+							
 							<option 
 								value="$programStage.uid" 
 								localid='$programStage.id' 
@@ -94,10 +105,10 @@
 								selected repeatable="true"
 								allowGenerateNextVisit='$allowGenerateNextVisit' 
 								programType = '$programStage.program.type'
-								reportDateDes='$programStage.reportDateDescription'
+								reportDateDes='$!programStage.reportDateDescription'
 								repeatable="false"
-								openAfterEnrollment="$programStage.openAfterEnrollment"
-								reportDateToUse="$reportDateToUse"
+								openAfterEnrollment="$!programStage.openAfterEnrollment"
+								reportDateToUse="$!reportDateToUse"
 							>$!programStage.displayName</option>
 						#else
 							#set($hasEvent="false")
@@ -107,15 +118,7 @@
 								#end
 							#end
 							
-							#set($reportDateToUse = "")
-							#if($programStageInstance.programStage.reportDateToUse=='registrationDate' )
-								#set($reportDateToUse = "$format.formatDate( $programInstance.patient.registrationDate)")
-							#elseif($programStageInstance.programStage.reportDateToUse=='dateOfIncident' )
-								#set($reportDateToUse = "$format.formatDate( $programInstance.dateOfIncident)")
-							#elseif($programStageInstance.programStage.reportDateToUse=='enrollmentDate' )
-								#set($reportDateToUse = "$format.formatDate( $programInstance.enrollmentDate)")
-							#end
-							<option 
+								<option 
 								#if($hasEvent=="true") style="display:none;" #else selected #end 
 								value="$programStage.uid" localid='$programStage.id' 
 								prevStageId='$prevStageId'

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2013-10-15 17:20:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2013-10-21 07:40:21 +0000
@@ -23,7 +23,7 @@
 		showById('followupTR');
 		setFieldValue('listPatientBtn','$encoder.jsEscape( $i18n.getString( "show_activity_list" ) , "'")');
 		
-		jQuery('#searchByIdTR').remove();
+		showById('advancedSearchBtn');
 		jQuery('#listPatientBtnTD').attr('rowspan',2);
 		jQuery('#listPatientBtnTD').attr('valign','bottom');
 		

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-10-15 17:20:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-10-21 07:40:21 +0000
@@ -37,6 +37,7 @@
 		</td>
 		<td id='listPatientBtnTD'>
 			<input type="button" id='listPatientBtn' value="$i18n.getString( 'list_all_patients' )" onclick="listAllPatient();">
+			<input type="button" id='advancedSearchBtn' class='hidden' value='$i18n.getString( "advanced_search" )' onclick="advancedSearchOnclick();">
 		</td>
 	</tr>
 	<tr id='scheduleVisitTR' class='hidden'>

=== 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	2013-10-16 14:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-10-21 07:40:21 +0000
@@ -386,7 +386,7 @@
 combine = Combine
 completed = Completed
 events = Events
-used_by_all_orgunits = Used by all organisation units
+allow_enrollment_at_all_orgunits = Allow enrollment at all orgunits
 other_program_stages = Other program stages
 minus = Minus
 minus_with_dateOfIncident = Incident Date Diff
@@ -480,4 +480,4 @@
 shortcut_link_label_eg_add_child = Shortcut link label (e.g. Add Child)
 relationship = Relationship
 select_at_least_one_scope=Select at least one scope for local id
-scheduling_of_events = Scheduling of events
+scheduling_of_events = Scheduling of events
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-10-16 14:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-10-21 07:40:21 +0000
@@ -190,7 +190,7 @@
 		</tr>
 			
         <tr>
-            <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
+            <td><label>$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
             <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true'></td>
             <td></td>
         </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2013-10-11 09:24:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2013-10-21 07:40:21 +0000
@@ -93,7 +93,7 @@
 				<p><label class="bold">$i18n.getString( "allow_select_incident_date_in_future" ):</label><br><span id="selectIncidentDatesInFutureField"></span></p>
 				<p><label class="bold">$i18n.getString( "skip_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
 				<p><label class="bold">$i18n.getString( "only_enroll_once" ):</label><br><span id="onlyEnrollOnceField"></span></p>
-				<p><label class="bold">$i18n.getString( "used_by_all_orgunits" ):</label><br><span id="displayOnAllOrgunitField"></span></p>
+				<p><label class="bold">$i18n.getString( "allow_enrollment_at_all_orgunits" ):</label><br><span id="displayOnAllOrgunitField"></span></p>
 				<p><label class="bold">$i18n.getString( "use_birth_date_as_incident_date" ):</label><br><span id="useBirthDateAsIncidentDate"></span></p>                              
 				<p><label class="bold">$i18n.getString( "show_incident_date" ):</label><br><span id="displayIncidentDate"></span></p>                              
 				<p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>                              

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-10-16 14:41:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-10-21 07:40:21 +0000
@@ -197,7 +197,7 @@
 		</tr>
 		
         <tr>
-            <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
+            <td><label>$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
             <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
             <td></td>
         </tr>