=== 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	2013-03-19 03:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-03-19 08:08:50 +0000
@@ -247,7 +247,7 @@
 		showById('birthDate');
 	#end
 	
-	#if( $!patient.phoneNumber ) 
+	#if( $!patient.phoneNumber && $patient.phoneNumber!="") 
 		setFieldValue('phoneNumber',"$!patient.phoneNumber")
 	#else 
 		setFieldValue('phoneNumber',"$!phoneNumberAreaCode")

=== 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-03-11 07:46:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-03-19 08:08:50 +0000
@@ -103,9 +103,7 @@
 					<option value="fixedAttr_gender">$i18n.getString( "gender" )</option>
 					<option value="fixedAttr_phoneNumber">$i18n.getString( "phone_number" )</option>
 					#foreach( $attribute in $patientAttributes )
-						#if($attribute.valueType!='calculated')
 						<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.displayName )</option>
-						#end
 					#end
 				  </select>
 				  <em title="$i18n.getString( 'required' )" class="required">*</em></label>