=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-09-10 16:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-09-12 15:36:17 +0000
@@ -1549,6 +1549,21 @@
 	return Math.floor( 100000000 * Math.random() );
 }
 
+function getRandomCode()
+{
+	var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";	
+	var len = 11;	
+	var string = "";
+	
+	for ( var i=0; i < len; i++ ) 
+	{
+		var rnum = Math.floor( Math.random() * chars.length );
+		string += chars.substring( rnum, rnum+1 );
+	}
+	
+	return string;
+}
+
 function getDC()
 {
 	return "_dc=" + getRandomNumber();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-09-12 15:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2012-09-12 15:36:17 +0000
@@ -1,10 +1,10 @@
 available_for_mobile_reporting=Available for Mobile Reporting
-please_select_dataset=Please select a dataset
+please_select_dataset=Please select a data set
 greying_area=Greying area
 section_grey_field_managment=Section grey field management
 disable=Disable
 enable=Enable
-nr=Nr
+nr=No
 data_element=Data element
 data_elements=Data elements
 indicators=Indicators
@@ -12,20 +12,20 @@
 select_categorycombo=Select Category Combo
 title=Title
 category_combo=Category combinations
-add_dataset=Add dataset
-dataset_details=Dataset Details
+add_dataset=Add data set
+dataset_details=Data set details
 frequency=Frequency
 selected_data_elements=Selected data elements
 available_data_elements=Available data elements
 selected_indicators=Selected indicators
 available_indicators=Available indicators
-define_associations=Assign dataset to organisation units
+define_associations=Assign data set to organisation units
 id=Id
 number_of_data_elements=Number of data elements
 define_dataset_associations=Assign data set to organisation units
 assign=Assign
-edit_dataset=Edit dataset
-confirm_delete=Are you sure you want to delete this dataset?
+edit_dataset=Edit data set
+confirm_delete=Are you sure you want to delete this data set?
 duplicate_names=This name is already registered
 duplicate_short_names=This short name is already registered
 duplicate_codes=This code is already registered
@@ -38,9 +38,9 @@
 dataset=Data set
 dataentryform_confirm_delete=Are you sure you want to delete this data entry form?
 insert=Insert
-select_dataset=Select dataset
+select_dataset=Select data set
 sort_section=Sort section
-dataset_section=Dataset Section
+dataset_section=Data set Section
 label=Label
 group=Group
 add_section=Add section
@@ -49,13 +49,13 @@
 sort=Sort
 data_set_sort_order=Data set sort order
 design_data_entry_form=Design data entry form
-dataset_management=Dataset management
-section_management=Dataset Section management
+dataset_management=Data set management
+section_management=Data set Section management
 intro_dataset=Create, update, view and delete data sets and custom forms. A data set is a collection of data elements for which data is entered.
 intro_dataset_section=Create, update, view and delete data set sections. Sections can be inserted into data sets to make them more comprehensible.
-intro_dataset_assignment_editor=Assign data sets to organisation units in a grid based layot for faster operations when working with a high number of items.
+intro_dataset_assignment_editor=Assign data sets to organisation units in a grid based layout for faster operations when working with a high number of items.
 edit_compulsory_data_elements=Edit compulsory data elements
-dataset_assignment_editor=Dataset Assignment Editor
+dataset_assignment_editor=Data set Assignment Editor
 new=Add new
 delete_success=Delete successfully
 select=[Select]

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2012-09-12 15:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2012-09-12 15:36:17 +0000
@@ -12,6 +12,7 @@
     var selected = null;
     var autoSave = ${autoSave};
     var dataSetId = ${dataSet.id};
+    var currentDynamicElementCode = "";
 
 	#if( $dataEntryForm )
     stat = "EDIT";