=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-26 04:34:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-26 04:51:33 +0000
@@ -1717,3 +1717,13 @@
 		showById('hideCommentBtn');
 	}
 }
+
+function backPreviousPage( patientId )
+{
+	if(isDashboard){
+		showPatientDashboardForm( patientId )
+	}
+	else{
+		loadPatientList();
+	}
+}
\ No newline at end of file

=== 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-10-02 06:59:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-10-26 04:51:33 +0000
@@ -18,6 +18,7 @@
 		<tr>
 			<td>
 				<input type="button" class='button' value="$i18n.getString('save')" onclick='registerPatientLocation( "$patientId" )'>
+				<input type='button' class="button" value="$i18n.getString( 'cancel' )" onclick="backPreviousPage( $patientId )" />
 			</td>
 			<td></td>
 			<td></td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-10-26 04:34:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-10-26 04:51:33 +0000
@@ -106,7 +106,7 @@
 				#if($value=="")
 					#set($value=$patient.getFullName())
 				#end
-				<td style="cursor:pointer;" onclick="javascript:showPatientDashboardForm( '$patient.id' )">
+				<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
 					<a>$value</a>
 				</td>
 				

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-10-26 04:51:33 +0000
@@ -79,7 +79,7 @@
 		<td></td>
 		<td>
 			<input type="submit" class='button' value="$i18n.getString( 'update' )" />
-			<input type='button' class="button" value="$i18n.getString( 'cancel' )" onclick="loadPatientList();" />
+			<input type='button' class="button" value="$i18n.getString( 'cancel' )" onclick="backPreviousPage( $patient.id )" />
 		</td>
 	</tr>
 </table>