=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2012-05-02 06:41:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2013-02-01 16:28:45 +0000
@@ -28,11 +28,11 @@
 	<!-- Statement -->
 	
 	<select id="getDataElement" resultMap="dataElementResultMap">
-		SELECT * FROM DataElement WHERE DataElementID = #value# AND Calculated = 0
+		SELECT * FROM DataElement WHERE DataElementID = #value# AND ( Calculated = 0 OR SaveCalculated = 1 )
 	</select>
 	
 	<select id="getDataElements" resultMap="dataElementResultMap">
-		SELECT * FROM DataElement  WHERE Calculated = 0
+		SELECT * FROM DataElement WHERE Calculated = 0 OR SaveCalculated = 1
 	</select>
 	
 	<select id="getDataElementName" parameterClass="java.lang.Integer" resultClass="java.lang.String">