=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectedOrgunitError.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectedOrgunitError.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectedOrgunitError.vm	2010-09-15 04:42:49 +0000
@@ -0,0 +1,9 @@
+$encoder.htmlEncode( $i18n.getString( "error_occurred" ) )
+
+#if ( !$selectedUnit )
+	<br/>
+	<br/>
+	$encoder.htmlEncode( $i18n.getString( "select_organisationunit" ) ) 
+#end
+
+<a href="javascript: history.go(-1)">$encoder.htmlEncode( $i18n.getString( "back" ) )</a><br/>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-09-15 04:42:49 +0000
@@ -34,6 +34,8 @@
 specify_organisationunit = Please specify an organisation unit
 cannot_clear_selected_orgunits = Cannot clear the selected organisation units
 locate_organisation_unit_by_code = Locate organisation unit by code
+error_occurred = An error has occurred.
+select_organisationunit = You must select an OrganisationUnit from the tree.
 
 #-- Modules -------------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-09-15 04:42:49 +0000
@@ -33,6 +33,8 @@
 org_unit_tree 							= C\u00e2y \u0111\u01a1n v\u1ecb
 specify_organisationunit 				= Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb
 cannot_clear_selected_orgunits          = Kh\u00f4ng th\u1ec3 x\u00f3a c\u00e1c \u0111\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn tr\u01b0\u1edbc \u0111\u00f3
+error_occurred                          = L\u1ed7i trong qu\u00e1 tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u.
+select_organisationunit                 = Vui l\u00f2ng ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb trong c\u00e2y \u0111\u01a1n v\u1ecb.
 
 #-- Modules -------------------------------------------------------------------#
 

=== 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-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-09-15 04:42:49 +0000
@@ -300,6 +300,4 @@
 organisation_unit_groups                                            = Organisation unit groups
 users																= Users
 remove_values_success												= Remove values successfully
-no_hits                                                             = Hit(s)
-error_occurred                                                      = An error has occurred.
-select_organisationunit                                             = You must select an OrganisationUnit from the tree.
\ No newline at end of file
+no_hits                                                             = Hit(s)
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-09-15 04:42:49 +0000
@@ -276,6 +276,4 @@
 view_tables_created                                                 = C\u00e1c b\u1ea3ng View \u0111\u01b0\u1ee3c t\u1ea1o
 there_is_no_view_created                                            = Kh\u00f4ng c\u00f3 b\u1ea3ng View n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o
 organisation_unit_groups                                            = Nh\u00f3m c\u00e1c \u0111\u01a1n v\u1ecb
-no_hits                                                             = l\u1ea7n nh\u1eadp
-error_occurred                                                      = L\u1ed7i trong qu\u00e1 tr\u00ecnh tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u.
-select_organisationunit                                             = Vui l\u00f2ng ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb trong c\u00e2y \u0111\u01a1n v\u1ecb.
\ No newline at end of file
+no_hits                                                             = l\u1ea7n nh\u1eadp
\ No newline at end of file

=== 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-09-01 07:30:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-09-15 04:42:49 +0000
@@ -178,8 +178,7 @@
 		
 		<action name="error" class="org.hisp.dhis.dataadmin.action.NoAction">
 			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">
-				/dhis-web-maintenance-dataadmin/dataBrowserError.vm</param>
+			<param name="page">/dhis-web-commons/oust/selectedOrgunitError.vm</param>
 			<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
 		</action>
 		

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserError.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserError.vm	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserError.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-$encoder.htmlEncode( $i18n.getString( "error_occurred" ) )
-
-#if ( !$selectedUnit )
-	<br/>
-	<br/>
-	$encoder.htmlEncode( $i18n.getString( "select_organisationunit" ) )
-#end
-
-<a href="javascript: history.go(-1)">$encoder.htmlEncode( $i18n.getString( "back" ) )</a><br/>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessPDFAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessPDFAction.java	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessPDFAction.java	2010-09-15 04:42:49 +0000
@@ -82,7 +82,7 @@
     // Output
     // -------------------------------------------------------------------------
 
-    private OrganisationUnit unit;
+    private OrganisationUnit selectedUnit;
     
     private InputStream inputStream;
 
@@ -104,16 +104,16 @@
 
         DataSet dataSet = (DataSet) SessionUtils.getSessionVar( KEY_DATA_COMPLETENESS_DATASET );
 
-        unit = selectionTreeManager.getSelectedOrganisationUnit();
+        selectedUnit = selectionTreeManager.getSelectedOrganisationUnit();
 
-        if ( unit == null )
+        if ( selectedUnit == null )
         {
             return ERROR;
         }
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-        pdfService.writeDataSetCompletenessResult( results, out, i18n, unit, dataSet );
+        pdfService.writeDataSetCompletenessResult( results, out, i18n, selectedUnit, dataSet );
 
         inputStream = new ByteArrayInputStream( out.toByteArray() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-09-15 04:42:49 +0000
@@ -317,6 +317,4 @@
 numerator_aggregation_operator = Numerator aggregation type
 denominator_aggregation_operator = Denomirator aggregation type
 numerator_formula = Numerator formula
-denominator_formula = Denominator formula
-error_occurred = An error has occurred.
-select_organisationunit = You must select an OrganisationUnit from the tree.
\ No newline at end of file
+denominator_formula = Denominator formula
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties	2010-09-15 04:42:49 +0000
@@ -163,6 +163,4 @@
 numerator_aggregation_operator              = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho t\u1eed s\u1ed1
 denominator_aggregation_operator            = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho m\u1eabu s\u1ed1
 numerator_formula                           = C\u00f4ng th\u1ee9c t\u1eed s\u1ed1
-denominator_formula                         = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
-error_occurred                              = L\u1ed7i trong qu\u00e1 tr\u00ecnh tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u.
-select_organisationunit                     = Vui l\u00f2ng ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb trong c\u00e2y \u0111\u01a1n v\u1ecb.
\ No newline at end of file
+denominator_formula                         = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2010-09-15 04:42:49 +0000
@@ -338,10 +338,9 @@
     
 	<action name="dataCompletenessPDFError" class="org.hisp.dhis.reporting.action.NoAction">
 		<result name="success" type="velocity">/main.vm</result>
-		<param name="page">/dhis-web-reporting/dataCompletenessPDFError.vm</param>
+		<param name="page">/dhis-web-commons/oust/selectedOrgunitError.vm</param>
 		<param name="menu">/dhis-web-reporting/menu.vm</param>
 	</action>
-
 	
     <action name="getDataCompletenessWorkbook" class="org.hisp.dhis.reporting.completeness.action.GetDataCompletenessWorkbookAction">
       <result name="success" type="stream">

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataCompletenessPDFError.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataCompletenessPDFError.vm	2010-09-15 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataCompletenessPDFError.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-$encoder.htmlEncode( $i18n.getString( "error_occurred" ) )
-
-#if ( !$unit )
-	<br/>
-	<br/>
-	$encoder.htmlEncode( $i18n.getString( "select_organisationunit" ) ) 
-#end
-
-<a href="javascript: history.go(-1)">$encoder.htmlEncode( $i18n.getString( "back" ) )</a><br/>
\ No newline at end of file