=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-11-17 02:57:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-12-13 07:46:57 +0000
@@ -35,7 +35,7 @@
                 </td>            
                 
                 <td style="text-align:center">
-                  <a href="javascript:showCaseAggregationDetails( $aggregationCondition.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+                  <a href="javascript:showCaseAggregationDetails( $aggregationCondition.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
                 </td>
                 
               </tr>
@@ -49,7 +49,7 @@
 
 			<div id="detailsArea" style="display:none">
 				<div style="float:right">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
 				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateDataElementGroupOrderStore.java	2011-12-13 07:46:57 +0000
@@ -68,7 +68,7 @@
     {
         Session session = sessionFactory.getCurrentSession();
 
-        String sql = "SELECT * FROM reportexcel_dataelementgrouporders WHERE lower(name) LIKE :name";
+        String sql = "SELECT * FROM reportexcel_dataelementgrouporders WHERE lower(name) = :name";
 
         if ( clazzName.equals( ExportReport.class.getSimpleName() ) )
         {
@@ -82,7 +82,7 @@
         SQLQuery query = session.createSQLQuery( sql );
 
         query.addEntity( DataElementGroupOrder.class );
-        query.setString( "name", "%" + name.toLowerCase() + "%" ).setInteger( "reportId", reportId );
+        query.setString( "name", name.toLowerCase() ).setInteger( "reportId", reportId );
 
         return (DataElementGroupOrder) query.uniqueResult();
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/degroup/action/ValidateDataElementGroupOrderAction.java	2011-12-13 07:46:57 +0000
@@ -88,10 +88,9 @@
     public String execute()
         throws Exception
     {
-        DataElementGroupOrder groupOrder = dataElementGroupOrderService.getDataElementGroupOrder( name, clazzName,
-            reportId );
-        
-        if ( groupOrder != null && (this.id == null || groupOrder.getId() != this.id) )
+        DataElementGroupOrder match = dataElementGroupOrderService.getDataElementGroupOrder( name, clazzName, reportId );
+
+        if ( match != null && (id == null || match.getId() != id) )
         {
             message = i18n.getString( "name_ready_exist" );
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/NumberUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/NumberUtils.java	2011-11-03 04:26:28 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/NumberUtils.java	2011-12-13 07:46:57 +0000
@@ -41,10 +41,10 @@
     private static DecimalFormat df = null;
 
     // This pattern used for VN
-    public static final String PATTERN_DECIMAL_FORMAT1 = "#,##0.############";
+    public static final String PATTERN_DECIMAL_FORMAT1 = "#,##0.######";
     
     // This pattern is default in DHIS2    
-    public static final String PATTERN_DECIMAL_FORMAT2 = "#0.############";
+    public static final String PATTERN_DECIMAL_FORMAT2 = "#0.######";
 
     // -------------------------------------------------------------------------
     //

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2011-11-09 07:34:53 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2011-12-13 07:46:57 +0000
@@ -259,8 +259,8 @@
 		
 		<action name="getDataElementGroupOrder"
 			class="org.hisp.dhis.reportsheet.degroup.action.GetDataElementGroupOrderAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-spreadsheet-reporting/responseDataElementGroupOrder.vm</result>
+			<result name="success" type="velocity-json">
+				/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm</result>
 		</action>
 		
 		<action name="openSortDataElement"

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/configuration.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/configuration.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/configuration.vm	2011-12-13 07:46:57 +0000
@@ -39,7 +39,7 @@
 			},
 			function( json )
 			{
-				if( json.response == "success" ) {form.submit();}
+				if( json.response == "success" ) { form.submit(); }
 				else
 				{
 					if ( window.confirm( json.message ) ) backUpTemplateFiles( form );

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2011-12-02 05:48:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2011-12-13 07:46:57 +0000
@@ -53,14 +53,6 @@
 			currentOrgunitName = '$organisationUnit.name';
 			getExportReportsByGroup( currentOrgunitName );
 		});
-	#else
-		disable("group");
-		disable("exportReport");
-		disable("period");
-		disable("generateExportReport");
-		disable("previewButton");
-		disable("nextPeriod");
-		disable("lastPeriod");	
 	#end
 	
 </script>
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/dataElementGroupOrder.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/dataElementGroupOrder.js	2011-12-07 06:50:10 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/dataElementGroupOrder.js	2011-12-13 07:46:57 +0000
@@ -12,19 +12,14 @@
 
 function showDataElementGroupOrderDetails( id )
 {
-	var request = new Request();
-    request.setResponseTypeXML( 'dataElementGroupOrder' );
-    request.setCallbackSuccess( showDataElementGroupOrderReceived );
-    request.send( 'getDataElementGroupOrder.action?id=' + id );
-}
-
-function showDataElementGroupOrderReceived( dataElementGroupOrderElement )
-{
-    setInnerHTML( 'nameField', getElementValue( dataElementGroupOrderElement, 'name' ) );
-    setInnerHTML( 'codeField', getElementValue( dataElementGroupOrderElement, 'code' ) );
-    setInnerHTML( 'memberCountField', getElementValue( dataElementGroupOrderElement, 'memberCount' ) );
-
-    showDetails();
+	jQuery.post( 'getDataElementGroupOrder.action',  { id: id }, function( json ) {
+		
+		setInnerHTML( 'nameField', json.dataElementGroupOrder.name );
+		setInnerHTML( 'codeField', json.dataElementGroupOrder.code );
+		setInnerHTML( 'memberCountField', json.dataElementGroupOrder.memberCount );
+
+		showDetails();
+	});
 }
 
 /*
@@ -32,12 +27,15 @@
 */
 function openAddDataElementGroupOrder()
 {
+	validator.resetForm();
+	setFieldValue( "dataElementGroupOrderId", "" );
+
 	dataDictionary.loadDataElementGroups( "#availableDataElementGroups" );
-	dataDictionary.loadDataElementsByGroup( "" , "#availableDataElements" );	
+	dataDictionary.loadDataElementsByGroup( "" , "#availableDataElements" );
 	
 	dialog.dialog("open");
 	
-	jQuery( "#dataElementGroupsForm" ).attr( "action", "addDataElementGroupOrderFor"+clazzName+".action?clazzName="+clazzName );
+	jQuery( "#dataElementGroupsForm" ).attr( "action", "addDataElementGroupOrderFor" + clazzName + ".action?clazzName=" + clazzName );
 }
 
 /*
@@ -46,37 +44,47 @@
 
 function openUpdateDataElementGroupOrder( id )
 {
+	validator.resetForm();
 	setFieldValue("dataElementGroupOrderId", id );
 	
-	var request = new Request();
-	request.setResponseTypeXML( 'xmlObject' );
-	request.setCallbackSuccess( openUpdateDataElementGroupOrderReceived );
-	var url = "getDataElementGroupOrder.action?id=" + id;
-	request.send(url);
+	jQuery.post( 'getDataElementGroupOrder.action', { id: id }, function( json )
+	{
+		var listDataElement = jQuery('#dataElementIds');
+		listDataElement.empty();
+		setFieldValue( "name", json.dataElementGroupOrder.name );
+		setFieldValue( "code", json.dataElementGroupOrder.code );
+		
+		var dataElements = json.dataElementGroupOrder.dataElements;
+		
+		for ( var i = 0 ; i < dataElements.length ; i++ )
+		{
+			listDataElement.append( '<option value="' + dataElements[ i ].id + '">' + dataElements[ i ].name + '</option>' );
+		}
+		
+		dataDictionary.loadDataElementGroups( "#availableDataElementGroups" );
+		dataDictionary.loadDataElementsByGroup( "" , "#availableDataElements" );	
+			
+		dialog.dialog( "open" );
+		
+		jQuery( "#dataElementGroupsForm" ).attr( "action", "updateDataElementGroupOrderFor" + clazzName + ".action" );
+	});
 }
 
-function openUpdateDataElementGroupOrderReceived(xmlObject)
+function validateDataElementGroupOrder( _form )
 {
-	var listDataElement = jQuery('#dataElementIds');
-	listDataElement.empty();
-	setFieldValue( "name", getElementValue(xmlObject, 'name') );
-	setFieldValue( "code", getElementValue(xmlObject, 'code') );
-	var dataElements = xmlObject.getElementsByTagName('dataElements')[0].getElementsByTagName('dataElement');
-	
-	for ( var i=0 ; i < dataElements.length ; i++ )
-	{
-		var name = getElementValue(dataElements[i], 'name');
-		var id = getElementValue(dataElements[i], 'id');
-		listDataElement.append('<option value="' + id + '">' + name + '</option>');
-	}
-	
-	dataDictionary.loadDataElementGroups( "#availableDataElementGroups" );
-	dataDictionary.loadDataElementsByGroup( "" , "#availableDataElements" );	
-		
-	dialog.dialog("open");
-	
-	jQuery( "#dataElementGroupsForm" ).attr( "action","updateDataElementGroupOrderFor"+clazzName+".action");
-	
+	jQuery.post( "validateDataElementGroupOrder.action", {
+		name: getFieldValue( 'name' ),
+		id: getFieldValue( 'dataElementGroupOrderId' ),
+		reportId: reportId,
+		clazzName: clazzName
+	}, function( json ){
+		if ( json.response == "success" )
+		{
+			listValidator( 'dataElementIdsValidate', 'dataElementIds' );
+			_form.submit();
+		}
+		else { markInvalid( "name", json.message ); }
+	} );
 }
 
 /*
@@ -96,7 +104,7 @@
 	var url = "updateSortDataElementGroupOrder.action?reportId=" + reportId;
 	url += "&clazzName=" + clazzName;
 	
-	for ( var i=0 ; i < dataElements.length ; i++ )
+	for ( var i = 0 ; i < dataElements.length ; i++ )
 	{
 		url += "&dataElementGroupOrderId=" + dataElements.item(i).value;
 	}

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js	2011-12-07 06:50:10 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js	2011-12-13 07:46:57 +0000
@@ -140,7 +140,7 @@
 					{
 						_sHTML.push( " ui-preview-unselected' id='", keyId );
 					}
-					else if ( !isImport && isRealNumber(_sData) )
+					else if ( !isImport && isRealNumber( _sData.replace( /[.,]/g, "" ) ) )
 					{
 						_sHTML.push( " ui-preview-normal" );
 					}

=== added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm	1970-01-01 00:00:00 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm	2011-12-13 07:46:57 +0000
@@ -0,0 +1,18 @@
+{ "dataElementGroupOrder":
+  {
+    "name": "$!encoder.jsonEncode( ${dataElementGroupOrder.name} )",
+	"code": "$!encoder.jsonEncode( ${dataElementGroupOrder.code} )",
+	
+	#set( $size = ${dataElementGroupOrder.dataElements.size()} )
+	"memberCount": "${size}",
+	
+	"dataElements": [
+	#foreach( $de in $dataElementGroupOrder.dataElements )
+	{
+	  "id": "${de.id}",
+	  "name": "$!encoder.jsonEncode( ${de.name} )"
+	}#if( $velocityCount < $size ),#end
+	#end
+	]
+  }
+}
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm	2011-12-07 06:50:10 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm	2011-12-13 07:46:57 +0000
@@ -1,5 +1,5 @@
-<h3>$i18n.getString('dataelement_groups')</h3>
-<h4><font color="green">$!encoder.htmlEncode($!report.name)</font></h4>
+<h3>$i18n.getString( 'dataelement_groups' )</h3>
+<h4><font color="green">$!encoder.htmlEncode( $!report.name )</font></h4>
 
 <table width="800px">
 	<tr>
@@ -40,7 +40,7 @@
 </table>
 
 <ul id="sortable"> 
-#foreach($group in $!report.dataElementOrders)
+#foreach( $group in $!report.dataElementOrders )
 	<li class="ui-state-default" name="dataElementGroupOrder" value="$group.id" title="$i18n.getString( 'sort_order_help' )">		
 		<table cellspacing="0" cellpadding="0" width="100%">
 			<tr>
@@ -58,7 +58,7 @@
 </ul>
 
 <div id="dataElementGroups">
-	<form name="dataElementGroups" id="dataElementGroupsForm" method="POST">
+	<form name="dataElementGroupsForm" id="dataElementGroupsForm" method="POST">
 		<input type="hidden" name="id" value="$report.id"/>
 		<input type="hidden" name="dataElementGroupOrderId" id="dataElementGroupOrderId"/>
 		<table>
@@ -123,15 +123,8 @@
 		
 	});
 	
-	var dialog = jQuery("#dataElementGroups").dialog({modal:true,autoOpen:false,width:720,title:"$i18n.getString('dataelement_groups')"});
-	
-	validation( "dataElementGroupsForm", function(form) {
-		//validateDataElementGroupOrder( form );
-		form.submit();
-	}, function() {
-		listValidator( 'dataElementIdsValidate', 'dataElementIds' );
-	});
-	
-	checkValueIsExist( "name", "validateDataElementGroupOrder.action", {id: byId('dataElementGroupOrderId').value, reportId: reportId, clazzName: clazzName} );
+	var dialog = jQuery("#dataElementGroups").dialog( { modal:true,autoOpen:false,width:720,title:"$i18n.getString('dataelement_groups')" } );
+	
+	var validator = validation( "dataElementGroupsForm", function( form ) { validateDataElementGroupOrder( form ); });
 	
 </script>
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm	2011-12-13 07:46:57 +0000
@@ -103,7 +103,7 @@
 	function getDataElementCategoryOptionCombos()
 	{
 		jQuery.postJSON('getDataElementCategoryOptionCombos.action'
-		, {id:$exportReport.id}
+		, { id:$exportReport.id }
 		, function( json )
 		{
 			var select = jQuery("#dataelement select[id=elementSelect]");

=== removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroupOrder.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroupOrder.vm	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroupOrder.vm	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataElementGroupOrder>
-	<name>$dataElementGroupOrder.name</name>
-	<code>$dataElementGroupOrder.code</code>
-	<memberCount>$dataElementGroupOrder.dataElements.size()</memberCount>
-	<dataElements>
-	#foreach( $dataElement in $dataElementGroupOrder.dataElements )
-		<dataElement>
-			<id>$dataElement.id</id>
-			<name>$encoder.xmlEncode( $dataElement.name )</name>
-		</dataElement>
-	#end
-	</dataElements>
-</dataElementGroupOrder>
\ No newline at end of file

=== removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValues.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValues.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValues.vm	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<importItemValues>
-#foreach($importItemValue in $importItemValues)
-	<importItemValue>
-		<id>$!importItemValue.importItem.id</id>
-		<name>$encoder.xmlEncode($!importItemValue.importItem.name)</name>
-		<value>$importItemValue.value</value>
-	</importItemValue>
-#end
-</importItemValues>
\ No newline at end of file

=== removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByCategory.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByCategory.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByCategory.vm	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<importItemValuesByCategory>
-#foreach($importItemValue in $importItemValues)
-	<importItemValueByCategory>
-		<id>$!importItemValue.importItem.id</id>
-		<name>$encoder.xmlEncode($!importItemValue.importItem.name)</name>
-		<row>$importItemValue.importItem.row</row>
-		<expression>$!importItemValue.importItem.expression</expression>
-		<value>$importItemValue.value</value>
-	</importItemValueByCategory>
-#end
-</importItemValuesByCategory>
\ No newline at end of file

=== removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByOrgunits.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByOrgunits.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseImportItemValuesByOrgunits.vm	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<importItemValueByOrgUnits>
-#foreach($importItemValueByOrgUnit in $importItemValueByOrgUnits)
-	<importItemValueByOrgUnit>
-		<orgUnit>
-			<id>$importItemValueByOrgUnit.organisationUnit.id</id>
-			<name>$importItemValueByOrgUnit.organisationUnit.name</name>
-		</orgUnit>
-		<importItemValues>
-			#foreach($importItemValue in $importItemValueByOrgUnit.importItemValues)
-			<importItemValue>
-				<id>$importItemValue.importItem.id</id>
-				<name>$encoder.xmlEncode($importItemValue.importItem.name)</name>
-				<value>$importItemValue.value</value>
-			</importItemValue>
-			#end
-		</importItemValues>
-	</importItemValueByOrgUnit>
-#end
-</importItemValueByOrgUnits>
\ No newline at end of file