=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-24 14:38:58 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-10-06 13:54:28 +0000 @@ -268,7 +268,7 @@ var eventStage = $scope.stagesById[dhis2Event.programStage]; if (angular.isObject(eventStage)) { dhis2Event.name = eventStage.name; - dhis2Event.reportDateDescription = eventStage.reportDateDescription; + dhis2Event.reportDateDescription = eventStage.reportDateDescription ? eventStage.reportDateDescription : $translate.instant('event_date'); dhis2Event.dueDate = DateUtils.formatFromApiToUser(dhis2Event.dueDate); dhis2Event.sortingDate = dhis2Event.dueDate;