=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js	2010-01-08 05:43:53 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js	2010-08-18 10:18:39 +0000
@@ -123,7 +123,7 @@
 		var listDataElement = document.getElementById('dataElementIds');
 		listDataElement.options.length = 0;
 		byId("name").value = xmlObject.getElementsByTagName('name')[0].firstChild.nodeValue;
-		byId("code").value = xmlObject.getElementsByTagName('code')[0].firstChild.nodeValue;
+		byId("code").value = getElementValue(xmlObject,'code');
 		var dataElements = xmlObject.getElementsByTagName('dataElements')[0].getElementsByTagName('dataElement');
 		
 		for(var i=0;i<dataElements.length;i++){

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItem.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItem.vm	2009-10-27 06:05:22 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItem.vm	2010-08-18 10:18:39 +0000
@@ -5,5 +5,5 @@
 	<row>$excelItem.row</row>	
 	<column>$excelItem.column</column>
 	<expression>$encoder.xmlEncode( $excelItem.expression )</expression>
-	<sheetNo>$encoder.xmlEncode( $excelItem.sheetNo )</sheetNo>
+	<sheetNo>$excelItem.sheetNo</sheetNo>
 </excelitem>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItems.vm	2009-11-10 06:39:31 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExcelItems.vm	2010-08-18 10:18:39 +0000
@@ -7,7 +7,7 @@
 			<row>$excelItem.row</row>	
 			<column>$excelItem.column</column>
 			<expression>$encoder.xmlEncode( $excelItem.expression )</expression>
-			<sheetNo>$encoder.xmlEncode( $excelItem.sheetNo )</sheetNo>
+			<sheetNo>$excelItem.sheetNo</sheetNo>
 		</excelitem>
 	#end
 </excelItems>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseReportItem.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseReportItem.vm	2010-03-25 08:15:35 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseReportItem.vm	2010-08-18 10:18:39 +0000
@@ -7,6 +7,6 @@
 	<row>$reportItem.row</row>	
 	<column>$reportItem.column</column>
 	<expression>$encoder.xmlEncode( $reportItem.expression )</expression>
-	<sheetNo>$encoder.xmlEncode( $reportItem.sheetNo )</sheetNo>
+	<sheetNo>$reportItem.sheetNo</sheetNo>
 	<textualFormula>$encoder.xmlEncode( $textualFormula )</textualFormula>
 </reportItem>
\ No newline at end of file