=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm 2015-09-07 03:01:40 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm 2015-12-17 14:12:16 +0000 @@ -37,7 +37,7 @@ #foreach( $dataElement in $section.dataElements ) - $dataElement.displayName + $dataElement.getFormNameFallback() #end @@ -154,7 +154,7 @@ #set( $count = $count + 1 ) #if( $isDefaultCategory ) - ${encoder.htmlEncode( $dataElement.displayName )} + ${encoder.htmlEncode( $dataElement.getFormNameFallback() )} #foreach( $organisationUnit in $organisationUnits ) @@ -195,7 +195,7 @@ #set( $categoryOptions2 = $optionsMap.get( $category2.id ) ) #if( $velocityCount == 1 ) - ${encoder.htmlEncode( $dataElement.displayName )} + ${encoder.htmlEncode( $dataElement.getFormNameFallback() )} #end #set( $catRowSpan = $colCount / 2)