=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-03-25 08:15:35 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-04-13 02:28:31 +0000
@@ -663,14 +663,7 @@
 	</bean>
 
 	<!-- PREVIEW REPORT BEANS -->
-	<bean
-		id="org.hisp.dhis.reportexcel.export.action.ValidateGenerateReportAction"
-		class="org.hisp.dhis.reportexcel.export.action.ValidateGenerateReportAction"
-		scope="prototype">
-		<property name="organisationUnitSelectionManager"
-			ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
-	</bean>
-
+	
 	<bean
 		id="org.hisp.dhis.reportexcel.preview.manager.InitializePOIStylesManager"
 		class="org.hisp.dhis.reportexcel.preview.manager.DefaultInitializePOIStylesManager" />
@@ -958,32 +951,10 @@
 		<property name="organisationUnitGroupService"
 			ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
 	</bean>
-
-	<bean
-		id="org.hisp.dhis.reportexcel.excelitemgroup.action.OpenUpdateRolesAssociationAction"
-		class="org.hisp.dhis.reportexcel.excelitemgroup.action.OpenUpdateRolesAssociationAction"
-		scope="prototype">
-		<property name="excelItemService"
-			ref="org.hisp.dhis.reportexcel.excelitem.ExcelItemService" />
-		<property name="userStore" ref="org.hisp.dhis.user.UserStore" />
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.reportexcel.excelitemgroup.action.UpdateRolesAssociationsAction"
-		class="org.hisp.dhis.reportexcel.excelitemgroup.action.UpdateRolesAssociationsAction"
-		scope="prototype">
-		<property name="excelItemService"
-			ref="org.hisp.dhis.reportexcel.excelitem.ExcelItemService" />
-		<property name="userStore" ref="org.hisp.dhis.user.UserStore" />
-	</bean>
-
-	<!--
-		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	-->
-	<!--  DATA ELEMENT GROUP ORDER FOR EXCEL ITEM 							 -->
-	<!--
-		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	-->
+	
+	<!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+	<!--  DATA ELEMENT GROUP ORDER FOR EXCEL ITEM 						 -->
+	<!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
 	<bean
 		id="org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action.DeleteDataElementGroupOrderForCategoryAction"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GetMinMaxValidationParamsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GetMinMaxValidationParamsAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GetMinMaxValidationParamsAction.java	2010-04-13 02:28:31 +0000
@@ -32,6 +32,8 @@
 
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
@@ -43,79 +45,86 @@
  * @version $Id$
  * 
  */
-public class GetMinMaxValidationParamsAction
-    implements Action
-{
-
-    // -------------------------------------------------------------------------
-    // Dependencyies
-    // -------------------------------------------------------------------------
-
-    private DataSetService dataSetService;
-
-    public void setDataSetService( DataSetService dataSetService )
-    {
-        this.dataSetService = dataSetService;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    private SelectionTreeManager selectionTreeManager;
-
-    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
-    {
-        this.selectionTreeManager = selectionTreeManager;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private Collection<DataSet> dataSets;
-
-    public Collection<DataSet> getDataSets()
-    {
-        return dataSets;
-    }
-
-    private List<OrganisationUnitLevel> levels;
-
-    public List<OrganisationUnitLevel> getLevels()
-    {
-        return levels;
-    }
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public void setMessage( String message )
-    {
-        this.message = message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-
-        selectionTreeManager.clearSelectedOrganisationUnits();
-        
-        levels = organisationUnitService.getOrganisationUnitLevels();
-
-        dataSets = dataSetService.getAllDataSets();
-
-        return SUCCESS;
-    }
+public class GetMinMaxValidationParamsAction implements Action {
+
+	// -------------------------------------------------------------------------
+	// Dependencies
+	// -------------------------------------------------------------------------
+
+	private DataSetService dataSetService;
+
+	public void setDataSetService(DataSetService dataSetService) {
+		this.dataSetService = dataSetService;
+	}
+
+	private OrganisationUnitService organisationUnitService;
+
+	public void setOrganisationUnitService(
+			OrganisationUnitService organisationUnitService) {
+		this.organisationUnitService = organisationUnitService;
+	}
+
+	private SelectionTreeManager selectionTreeManager;
+
+	public void setSelectionTreeManager(
+			SelectionTreeManager selectionTreeManager) {
+		this.selectionTreeManager = selectionTreeManager;
+	}
+
+	private OrganisationUnitGroupService organisationUnitGroupService;
+
+	public void setOrganisationUnitGroupService(
+			OrganisationUnitGroupService organisationUnitGroupService) {
+		this.organisationUnitGroupService = organisationUnitGroupService;
+	}
+
+	// -------------------------------------------------------------------------
+	// Output
+	// -------------------------------------------------------------------------
+
+	private Collection<DataSet> dataSets;
+
+	public Collection<DataSet> getDataSets() {
+		return dataSets;
+	}
+
+	private List<OrganisationUnitLevel> levels;
+
+	public List<OrganisationUnitLevel> getLevels() {
+		return levels;
+	}
+
+	private String message;
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	private Collection<OrganisationUnitGroup> orgunitGroups;
+
+	public Collection<OrganisationUnitGroup> getOrgunitGroups() {
+		return orgunitGroups;
+	}
+
+	// -------------------------------------------------------------------------
+	// Action implementation
+	// -------------------------------------------------------------------------
+
+	public String execute() throws Exception {
+
+		selectionTreeManager.clearSelectedOrganisationUnits();
+
+		levels = organisationUnitService.getOrganisationUnitLevels();
+
+		dataSets = dataSetService.getAllDataSets();
+
+		orgunitGroups = organisationUnitGroupService
+				.getAllOrganisationUnitGroups();
+
+		return SUCCESS;
+	}
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-04-12 16:35:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml	2010-04-13 02:28:31 +0000
@@ -340,6 +340,8 @@
 			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
 		<property name="selectionTreeManager"
 			ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+		<property name="organisationUnitGroupService"
+			ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.dataadmin.action.minmaxvalidation.SetupTreeAction"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-04-12 16:35:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-04-13 02:28:31 +0000
@@ -188,7 +188,7 @@
 generate_min_max_value_success										= Generate min max value successfully.
 not_choose_dataset													= Please specify a dataset.
 not_choose_organisation												= Please specify a organisation.
-unselect_all														= Unselect All
+unselect_all_min_max												= Unselect All
 select_all_in_group													= Select all in group
 unselect_all_in_group												= Unselect all in group
 generate_min_max_values												= Generate Min/Max values
@@ -196,6 +196,9 @@
 set_factor															= Set Factor
 factor																= Factor
 save_factory_success												= Save factory successfully
+unselect_all_at_level_min_max 										= Unselect all at level
+select_all_at_level_min_max											= Select all at level
+save_factory_success												= Save factory successfully
 prune_organisation_unit												= Prune Organisation Unit
 prune																= Prune
 select_the_org_unit_to_be_kept										= Select the Organisation Unit to be kept

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-04-12 16:35:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-04-13 02:28:31 +0000
@@ -440,13 +440,13 @@
 
 		<!-- Min/Max validation - Organisation units -->
 
-		<action name="selectLevel"
+		<action name="selectLevelMinMax"
 			class="org.hisp.dhis.dataadmin.action.minmaxvalidation.SelectLevelAction">
 			<result name="success" type="velocity-xml">
 				/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>
 		</action>
 
-		<action name="unselectLevel"
+		<action name="unselectLevelMinMax"
 			class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectLevelAction">
 			<result name="success" type="velocity-xml">
 				/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>
@@ -464,7 +464,7 @@
 				/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>
 		</action>
 
-		<action name="unselectAll"
+		<action name="unselectAllMinMax"
 			class="org.hisp.dhis.dataadmin.action.minmaxvalidation.UnselectAllAction">
 			<result name="success" type="velocity-xml">
 				/dhis-web-maintenance-dataadmin/responseSuccess.vm</result>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js	2010-04-07 13:38:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js	2010-04-13 02:28:31 +0000
@@ -43,13 +43,13 @@
 function unselectAllAtLevel( id ){
 	var request = new Request();
     request.setCallbackSuccess( selectReceived );
-	request.send( 'unselectLevel.action?level=' + getFieldValue('levelList') + '&id=' + id);
+	request.send( 'unselectLevelMinMax.action?level=' + getFieldValue('levelList'));
 }
 
 function selectAllAtLevel( id ){
 	var request = new Request();
     request.setCallbackSuccess( selectReceived );
-    request.send( 'selectLevel.action?level=' + getFieldValue('levelList') + '&id=' + id );
+    request.send( 'selectLevelMinMax.action?level=' + getFieldValue('levelList'));
 }
 
 function unselectGroup()
@@ -70,7 +70,7 @@
 {
     var request = new Request();
     request.setCallbackSuccess( selectReceived );
-    request.send( 'unselectAll.action' );
+    request.send( 'unselectAllMinMax.action' );
 }
 
 function selectReceived()

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-04-07 13:38:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-04-13 02:28:31 +0000
@@ -45,14 +45,14 @@
   	</script>
 	</td>
     <td style="width:10px ">&nbsp;</td>
-    <td><input type="button" value="$i18n.getString( "select_all_at_level" )" onclick="selectAllAtLevel()" style="width:12em">
+    <td><input type="button" value="$i18n.getString( "select_all_at_level_min_max" )" onclick="selectAllAtLevel()" style="width:12em">
 		<select id="levelList" name="levelList" style="width:12em">
 			#foreach( $lev in $levels )
 				<option value="$lev.level" #if ( $level == $lev.level )selected="selected"#end>$encoder.htmlEncode( $lev.name )</option>
 			#end
 		</select>
-		<input type="button" value="$i18n.getString( "unselect_all_at_level" )" onclick="unselectAllAtLevel()" style="width:12em">
-		<input type="button" value="$i18n.getString( "unselect_all" )" onclick="unselectAll()" style="width:12em">        
+		<input type="button" value="$i18n.getString( "unselect_all_at_level_min_max" )" onclick="unselectAllAtLevel()" style="width:12em">
+		<input type="button" value="$i18n.getString( "unselect_all_min_max" )" onclick="unselectAll()" style="width:12em">        
 	  </td>
   </tr>
   <tr>
@@ -70,8 +70,8 @@
     <td style="width:10px ">&nbsp;</td>
     <td><input type="button" value="$i18n.getString( "select_all_in_group" )" onclick="selectGroup()" style="width:12em">
 	  	<select id="groupList" name="groupList" style="width:12em">
-	  		#foreach ( $group in $groups )
-	  			<option value="$group.id" #if ( $organisationUnitGroupId == $group.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
+	  		#foreach ( $group in $orgunitGroups )
+	  			<option value="$group.id">$encoder.htmlEncode( $group.name )</option>
 		  	#end
 	  	</select>
 	  	<input type="button" value="$i18n.getString( "unselect_all_in_group" )" onclick="unselectGroup()" style="width:12em">
@@ -96,7 +96,7 @@
     </tr>
 </table>
 </form>
-<span id='message' style='display: block'>$message</span>
+<span id='message' style='display: block'>$!message</span>
 <script type="text/javascript">
 
 	var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';