=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-09-08 10:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-09-16 02:32:55 +0000
@@ -475,11 +475,10 @@
 				style/ui.all.css</param>
 			<param name="javascripts">
 				../dhis-web-commons/ouwt/ouwt.js,
-				javascript/export.js,
-				javascript/commons.js,
+				javascript/export.js,				
 				javascript/preview.js,
-				../dhis-web-commons/util/jquery-ui.js,
-				../dhis-web-commons/util/jquery.jqprint.0.3.js
+				../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.js,
+				../dhis-web-commons/javascripts/jQuery/jquery.jqprint.0.3.js
 			</param>
 		</action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportassociation.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportassociation.vm	2009-11-11 05:46:50 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportassociation.vm	2010-09-16 02:32:55 +0000
@@ -2,58 +2,9 @@
 <h4>$encoder.htmlEncode( $report.getName() )</h4>
 <form name="reportAssociation" action="updateDefineAssociations.action" method="POST">
 <input type="hidden" name="reportId" value="$report.id">
-<input type="button" value="$i18n.getString( 'remove_all' )" onclick="window.location='unselectAll.action?id=$report.id'" style="width:12em">
-<input type="button" value="$i18n.getString( 'select_all_at_level' )" onclick="selectAllAtLevel( $report.id )" style="width:12em">
-<select id="levelList" name="levelList" style="width:12em">
-	#foreach( $level in $levels )
-		<option value="$level.level" #if ( $selectLevel == $level.level )selected="selcted"#end>$encoder.htmlEncode( $level.name )</option>
-	#end
-</select>
-<input type="button" value="$i18n.getString( 'unselect_all_at_level' )" onclick="unselectAllAtLevel( $report.id )" style="width:12em">
-<div id="selectionTree" style="width:50em;height:30em;overflow:auto;border:1px solid #cccccc"></div>
-<span id="message"></span>
-<p> <input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em">
-		<input type="button" onclick="window.location.href='listReportExcel.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
-</form>
-<script type="text/javascript">
-
-	var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';
-
-
-	selectionTreeSelection.setMultipleSelectionAllowed( true );
-	selectionTreeSelection.setOnSelectFunction( treeClicked );
-	selectionTreeSelection.setListenerFunction( selectCompleted );
-	selectionTree.buildSelectionTree();
-
-	var numberOfSelects = 0;
-  
-	function treeClicked()
-	{
-		numberOfSelects++;
-
-		setMessage( i18n_loading );
-
-		document.getElementById( "submitButton" ).disabled = true;
-	}
-
-	function selectCompleted( selectedUnits )
-	{
-		numberOfSelects--;
-
-		if ( numberOfSelects <= 0 )
-		{
-			hideMessage();
-			
-			document.getElementById( "submitButton" ).disabled = false;
-		}
-	}
-	function unselectAllAtLevel( id ){
-		window.location = 'unselectLevel.action?level=' + getFieldValue('levelList') + '&id=' + id;
-	}
-	function selectAllAtLevel( id ){
-		window.location = 'selectLevel.action?level=' + getFieldValue('levelList') + '&id=' + id;
-	}	
-
-
-</script>
-<span id="info" style="display:none;top:70px;right:5px;position:fixed;" onclick="hideById(this.id)"></span>
\ No newline at end of file
+
+#organisationUnitSelectionTree( false, true, true )		
+
+<input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em">
+<input type="button" onclick="window.location.href='listReportExcel.action'" value="$i18n.getString( "cancel" )" style="width:10em"></p>
+</form>
\ No newline at end of file