=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2012-09-13 07:24:01 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2012-09-13 07:55:48 +0000 @@ -34,7 +34,9 @@ + "_" + getFieldValue('startDueDate') + "_" + getFieldValue('endDueDate'); - if( getFieldValue("statusEvent") != '3' && getFieldValue("statusEvent") != '0' ) + if( getFieldValue("statusEvent") != '3' + && getFieldValue("statusEvent") != '4' + && getFieldValue("statusEvent") != '0' ) { searchTexts += "_" + getFieldValue('orgunitId'); } === 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-09-13 07:24:01 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-13 07:55:48 +0000 @@ -236,6 +236,10 @@ var endDueDate = getFieldValue('endDueDate'); params += '&searchTexts=stat_' + getFieldValue('programIdAddPatient') + '_' + statusEvent + '_' + startDueDate + '_' + endDueDate; + if( statusEvent != '3' && statusEvent != '4' && statusEvent != '0' ) + { + searchTexts += "_" + getFieldValue('orgunitId'); + } } var flag = false;