=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2011-09-29 05:59:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2011-11-15 08:44:02 +0000
@@ -199,53 +199,56 @@
 
         programStageDataElements = new ArrayList<ProgramStageDataElement>( programStage.getProgramStageDataElements() );
 
+        Collections.sort( programStageDataElements, new ProgramStageDataElementSortOrderComparator() );
+
         ProgramInstance programInstance = selectedStateManager.getSelectedProgramInstance();
 
-        Collections.sort( programStageDataElements, new ProgramStageDataElementSortOrderComparator() );
-
-        programStageInstance = programStageInstanceService.getProgramStageInstance( programInstance, programStage );
-
-        if ( programStageInstance != null )
+        if ( programInstance != null )
         {
-            selectedStateManager.setSelectedProgramStageInstance( programStageInstance );
-
-            // ---------------------------------------------------------------------
-            // Get CategoryOptions
-            // ---------------------------------------------------------------------
-
-            Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
-
-            for ( DataElement dataElement : dataElements )
-            {
-                optionMap.put( dataElement.getId(), dataElement.getCategoryCombo().getOptionCombos() );
-            }
-
-            // ---------------------------------------------------------------------
-            // Get data values
-            // ---------------------------------------------------------------------
-
-            Collection<PatientDataValue> patientDataValues = patientDataValueService
-                .getPatientDataValues( programStageInstance );
-
-            patientDataValueMap = new HashMap<Integer, PatientDataValue>( patientDataValues.size() );
-
-            for ( PatientDataValue patientDataValue : patientDataValues )
-            {
-                patientDataValueMap.put( patientDataValue.getDataElement().getId(), patientDataValue );
-            }
-
-            // ---------------------------------------------------------------------
-            // Get data-entry-form
-            // ---------------------------------------------------------------------
-
-            DataEntryForm dataEntryForm = programStage.getDataEntryForm();
-
-            if ( dataEntryForm != null )
-            {
-                customDataEntryFormCode = programDataEntryService.prepareDataEntryFormForEntry( dataEntryForm
-                    .getHtmlCode(), patientDataValues, "", i18n, programStage, programStageInstance, organisationUnit );
-            }
-
+            programStageInstance = programStageInstanceService.getProgramStageInstance( programInstance, programStage );
+
+            if ( programStageInstance != null )
+            {
+                selectedStateManager.setSelectedProgramStageInstance( programStageInstance );
+
+                // ---------------------------------------------------------------------
+                // Get CategoryOptions
+                // ---------------------------------------------------------------------
+
+                Collection<DataElement> dataElements = programStageDataElementService.getListDataElement( programStage );
+
+                for ( DataElement dataElement : dataElements )
+                {
+                    optionMap.put( dataElement.getId(), dataElement.getCategoryCombo().getOptionCombos() );
+                }
+
+                // ---------------------------------------------------------------------
+                // Get data values
+                // ---------------------------------------------------------------------
+
+                Collection<PatientDataValue> patientDataValues = patientDataValueService
+                    .getPatientDataValues( programStageInstance );
+
+                patientDataValueMap = new HashMap<Integer, PatientDataValue>( patientDataValues.size() );
+
+                for ( PatientDataValue patientDataValue : patientDataValues )
+                {
+                    patientDataValueMap.put( patientDataValue.getDataElement().getId(), patientDataValue );
+                }
+
+                // ---------------------------------------------------------------------
+                // Get data-entry-form
+                // ---------------------------------------------------------------------
+
+                DataEntryForm dataEntryForm = programStage.getDataEntryForm();
+
+                if ( dataEntryForm != null )
+                {
+                    customDataEntryFormCode = programDataEntryService.prepareDataEntryFormForEntry( dataEntryForm
+                        .getHtmlCode(), patientDataValues, "", i18n, programStage, programStageInstance,
+                        organisationUnit );
+                }
+            }
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-09-29 06:28:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-11-15 08:44:02 +0000
@@ -34,7 +34,7 @@
 						#if( $sortPatientAttribute )
 							<td>$!patientAttributeValueMap.get( $patient.id ).value</td>
 						#end
-                        <td><a href="javascript:showPatientDetails( '$programInstance.patient.id' )" title="$i18n.getString( 'show_details' )">$patient.getFullName()</a></td>                    
+                        <td><a href="javascript:showPatientDetails( '$patient.id' )" title="$i18n.getString( 'show_details' )">$patient.getFullName()</a></td>                    
                         #foreach( $programStageInstance in $programStageInstanceMap.get( $programInstance ) )
                             #if( $programStageInstance.executionDate )
                                 <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">