=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-09-24 15:52:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-09-25 10:10:57 +0000
@@ -60,7 +60,7 @@
 <tr>
 	<td class='text-column'><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
 	<td class="input-column">
-		<input type="text" id="phoneNumber" name="phoneNumber" value="$!phoneNumberAreaCode$!patient.phoneNumber" class="{validate:{phone:true}}"/>
+		<input type="text" id="phoneNumber" name="phoneNumber" #if( $!patient.phoneNumber ) value="$!patient.phoneNumber" #else value="$!phoneNumberAreaCode" #end class="{validate:{phone:true}}"/>
 	</td>
 </tr>
 
@@ -78,7 +78,7 @@
 
 <!-- UNDERAGE -->
 
-<tr>
+<tr id="underAgeDiv" name="underAgeDiv">
 	<td class='text-column'>$i18n.getString("has_guardian")</td>
 	<td>
 		<input type="checkbox" name="underAge" id="underAge" onclick="toggleUnderAge(this);" value="true" #if($!patient.underAge == "true") checked="checked" #end/>
@@ -206,4 +206,15 @@
 		</tr>
 		#end
 	#end
-#end
\ No newline at end of file
+#end
+
+
+<script>
+	#if($!patient.dobType && $!patient.dobType=='A') 
+		showById('age');
+		hideById('birthDate');
+	#else
+		hideById('age');
+		showById('birthDate');
+	#end
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-08-02 02:48:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-09-25 10:10:57 +0000
@@ -3,6 +3,7 @@
 		
 		jQuery("#tabs").tabs();
 		hideById('addRepresentativeForm [id=underAgeDiv]');
+		hideById('addRepresentativeForm [id=age]');
 		addEventForPatientForm('addRepresentativeForm');
 		$('#addRepresentativeForm [id=dobType]').removeAttr('onchange');
 		$('#addRepresentativeForm [id=dobType]').attr('onchange', 'dobTypeOnChange( "addRepresentativeForm" );');