=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java	2015-09-17 05:52:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java	2015-10-01 18:17:35 +0000
@@ -87,7 +87,7 @@
 
     private Integer standardInterval;
 
-    private String reportDateDescription;
+    private String excecutionDateLabel;
 
     private Set<TrackedEntityInstanceReminder> reminders = new HashSet<>();
 
@@ -348,14 +348,14 @@
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     @PropertyRange( min = 2 )
-    public String getReportDateDescription()
+    public String getExcecutionDateLabel()
     {
-        return reportDateDescription;
+        return excecutionDateLabel;
     }
 
-    public void setReportDateDescription( String reportDateDescription )
+    public void setExcecutionDateLabel( String excecutionDateLabel )
     {
-        this.reportDateDescription = reportDateDescription;
+        this.excecutionDateLabel = excecutionDateLabel;
     }
 
     @JsonProperty
@@ -531,7 +531,7 @@
                 program = programStage.getProgram();
                 dataEntryForm = programStage.getDataEntryForm();
                 standardInterval = programStage.getStandardInterval();
-                reportDateDescription = programStage.getReportDateDescription();
+                excecutionDateLabel = programStage.getExcecutionDateLabel();
                 validCompleteOnly = programStage.getValidCompleteOnly();
                 displayGenerateEventBox = programStage.getDisplayGenerateEventBox();
                 captureCoordinates = programStage.getCaptureCoordinates();
@@ -552,8 +552,8 @@
                     .getDataEntryForm();
                 standardInterval = programStage.getStandardInterval() == null ? standardInterval : programStage
                     .getStandardInterval();
-                reportDateDescription = programStage.getReportDateDescription() == null ? reportDateDescription
-                    : programStage.getReportDateDescription();
+                excecutionDateLabel = programStage.getExcecutionDateLabel() == null ? excecutionDateLabel
+                    : programStage.getExcecutionDateLabel();
                 validCompleteOnly = programStage.getValidCompleteOnly() == null ? validCompleteOnly : programStage
                     .getValidCompleteOnly();
                 displayGenerateEventBox = programStage.getDisplayGenerateEventBox() == null ? displayGenerateEventBox

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-09-24 15:09:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-10-01 18:17:35 +0000
@@ -851,14 +851,18 @@
         executeSql( "update eventreport set completedonly = false where completedonly is null" );
         executeSql( "update eventchart set completedonly = false where completedonly is null" );
 
-        executeSql( "update program set enrollmentdatelabel = dateofenrollmentdescription where enrollmentdatelabel is null" );
-        executeSql( "update program set incidentdatelabel = dateofincidentdescription where incidentdatelabel is null" );
-        executeSql( "update programinstance set incidentdate = dateofincident where incidentdate is null" );
+        executeSql( "update program set enrollmentdatelabel = dateofenrollmentdescription where enrollmentdatelabel is not null" );
+        executeSql( "update program set incidentdatelabel = dateofincidentdescription where incidentdatelabel is not null" );
+        executeSql( "update programinstance set incidentdate = dateofincident where incidentdate is not null" );
         executeSql( "alter table programinstance alter column incidentdate set not null" );
         executeSql( "alter table program drop column dateofenrollmentdescription" );
         executeSql( "alter table program drop column dateofincidentdescription" );
         executeSql( "alter table programinstance drop column dateofincident" );
         
+        executeSql( "update programstage set excecutiondatelabel = reportdatedescription where excecutiondatelabel is not null" );
+        executeSql( "alter table programstage drop column reportdatedescription" );
+        executeSql( "update programstage set reportdatetouse = 'indicentDate' where reportdatetouse='dateOfIncident'" );
+        
         // Remove data mart
         executeSql( "drop table aggregateddatasetcompleteness" );
         executeSql( "drop table aggregateddatasetcompleteness_temp" );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2015-10-01 18:17:35 +0000
@@ -43,7 +43,7 @@
       <one-to-many class="org.hisp.dhis.program.ProgramStageSection" />
     </set>
 
-    <property name="reportDateDescription" />
+    <property name="excecutionDateLabel" />
 
     <set name="reminders" order-by="daysAllowedSendMessage"
       cascade="all">

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2015-09-30 05:00:31 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2015-10-01 18:17:35 +0000
@@ -955,13 +955,13 @@
                     mobileProgramStage.setReportDate( "" );
                 }
 
-                if ( programStage.getReportDateDescription() == null )
+                if ( programStage.getExcecutionDateLabel() == null )
                 {
                     mobileProgramStage.setReportDateDescription( "Report Date" );
                 }
                 else
                 {
-                    mobileProgramStage.setReportDateDescription( programStage.getReportDateDescription() );
+                    mobileProgramStage.setReportDateDescription( programStage.getExcecutionDateLabel() );
                 }
 
                 // get due date
@@ -1287,13 +1287,13 @@
             // get report date
             mobileProgramStage.setReportDate( PeriodUtil.dateToString( new Date() ) );
 
-            if ( programStage.getReportDateDescription() == null )
+            if ( programStage.getExcecutionDateLabel() == null )
             {
                 mobileProgramStage.setReportDateDescription( "Report Date" );
             }
             else
             {
-                mobileProgramStage.setReportDateDescription( programStage.getReportDateDescription() );
+                mobileProgramStage.setReportDateDescription( programStage.getExcecutionDateLabel() );
             }
 
             for ( ProgramStageDataElement programStageDataElement : programStageDataElements )

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2015-09-21 09:24:27 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2015-10-01 18:17:35 +0000
@@ -219,7 +219,7 @@
 
             prStg.setReportDate( "" );
 
-            prStg.setReportDateDescription( programStage.getReportDateDescription() );
+            prStg.setReportDateDescription( programStage.getExcecutionDateLabel() );
 
             prStg.setDueDate( "" );
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2014-08-18 14:21:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2015-10-01 18:17:35 +0000
@@ -7,7 +7,7 @@
 	"minDaysFromStart": "${programStage.minDaysFromStart}",
 	"dataElementCount": "${programStageDataElements.size()}",
 	"standardInterval": "$!programStage.standardInterval",
-	"reportDateDescription": "$!encoder.jsonEncode( ${programStage.reportDateDescription} )",
+	"excecutionDateLabel": "$!encoder.jsonEncode( ${programStage.excecutionDateLabel} )",
 	"blockEntryForm": "$!programStage.blockEntryForm",
 	"remindCompleted": "$!programStage.remindCompleted",
 	"allowGenerateNextVisit": "$!programStage.allowGenerateNextVisit",

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java	2015-09-24 08:32:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java	2015-10-01 18:17:35 +0000
@@ -354,7 +354,7 @@
             programStage.setProgram( program );
             programStage.setMinDaysFromStart( 0 );
             programStage.setAutoGenerateEvent( true );
-            programStage.setReportDateDescription( REPORT_DATE_DESCRIPTION );
+            programStage.setExcecutionDateLabel( REPORT_DATE_DESCRIPTION );
 
             programStageService.saveProgramStage( programStage );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java	2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java	2015-10-01 18:17:35 +0000
@@ -181,11 +181,11 @@
         this.standardInterval = standardInterval;
     }
 
-    private String reportDateDescription;
+    private String excecutionDateLabel;
 
-    public void setReportDateDescription( String reportDateDescription )
+    public void setExcecutionDateLabel( String excecutionDateLabel )
     {
-        this.reportDateDescription = reportDateDescription;
+        this.excecutionDateLabel = excecutionDateLabel;
     }
 
     private List<Integer> daysAllowedSendMessages = new ArrayList<>();
@@ -371,7 +371,7 @@
         programStage.setDescription( StringUtils.trimToNull( description ) );
         programStage.setProgram( program );
         programStage.setStandardInterval( standardInterval );
-        programStage.setReportDateDescription( StringUtils.trimToNull( reportDateDescription ) );
+        programStage.setExcecutionDateLabel( StringUtils.trimToNull( excecutionDateLabel ) );
         programStage.setIrregular( irregular );
         programStage.setMinDaysFromStart( minDaysFromStart );
         programStage.setDisplayGenerateEventBox( displayGenerateEventBox );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java	2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java	2015-10-01 18:17:35 +0000
@@ -172,11 +172,11 @@
         this.standardInterval = standardInterval;
     }
 
-    private String reportDateDescription;
+    private String excecutionDateLabel;
 
-    public void setReportDateDescription( String reportDateDescription )
+    public void setExcecutionDateLabel( String excecutionDateLabel )
     {
-        this.reportDateDescription = reportDateDescription;
+        this.excecutionDateLabel = excecutionDateLabel;
     }
 
     private List<Integer> daysAllowedSendMessages = new ArrayList<>();
@@ -360,7 +360,7 @@
         programStage.setName( StringUtils.trimToNull( name ) );
         programStage.setDescription( StringUtils.trimToNull( description ) );
         programStage.setStandardInterval( standardInterval );
-        programStage.setReportDateDescription( StringUtils.trimToNull( reportDateDescription ) );
+        programStage.setExcecutionDateLabel( StringUtils.trimToNull( excecutionDateLabel ) );
         programStage.setMinDaysFromStart( minDaysFromStart );
         programStage.setIrregular( irregular );
         programStage.setMinDaysFromStart( minDaysFromStart );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm	2015-09-11 11:54:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm	2015-10-01 18:17:35 +0000
@@ -239,8 +239,8 @@
 	</tr>
 	
 	<tr>
-		<td><label for="reportDateDescription">$i18n.getString( "report_date_description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="reportDateDescription" name="reportDateDescription" value="$i18n.getString( 'report_date' )" /></td>
+		<td><label for="excecutionDateLabel">$i18n.getString( "report_date_description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="excecutionDateLabel" name="excecutionDateLabel" value="$i18n.getString( 'report_date' )" /></td>
 	</tr>
 	
 	<tr><td>&nbsp;</td><td>&nbsp;</td></tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js	2015-03-16 08:11:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js	2015-10-01 18:17:35 +0000
@@ -73,7 +73,7 @@
 		
 		setInnerHTML( 'standardIntervalField', json.programStage.standardInterval );  
 		setInnerHTML( 'dataElementCountField', json.programStage.dataElementCount );   
-		setInnerHTML( 'reportDateDescriptionField', json.programStage.reportDateDescription );
+		setInnerHTML( 'excecutionDateLabelField', json.programStage.excecutionDateLabel );
 		
 		var displayProvidedOtherFacility = ( json.programStage.displayProvidedOtherFacility == 'true') ? i18n_yes : i18n_no;
 		setInnerHTML( 'displayProvidedOtherFacilityField', displayProvidedOtherFacility );   	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2015-10-01 18:17:35 +0000
@@ -70,7 +70,7 @@
 				<p><label class="bold">$i18n.getString( "generate_events_based_on_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
 				<p><label class="bold">$i18n.getString( "capture_coordinates" ):</label><br><span id="captureCoordinatesField"></span></p>
 				<p><label class="bold">$i18n.getString( "complete_allowed_only_if_validation_passes" ):</label><br><span id="validCompleteOnlyField"></span></p>
-				<p><label class="bold">$i18n.getString( "report_date_description" ):</label><br><span id="reportDateDescriptionField"></span></p>
+				<p><label class="bold">$i18n.getString( "report_date_description" ):</label><br><span id="excecutionDateLabelField"></span></p>
 				<p><label class="bold">$i18n.getString( "pre_generate_event_uid" ):</label><br><span id="preGenerateUIDField"></span></p>				
 				<p><label class="bold">$i18n.getString( "open_data_entry_form_after_enrolment" ):</label><br><span id="openAfterEnrollmentField"></span></p>
 				<p><label class="bold">$i18n.getString( "report_date_to_use" ):</label><br><span id="reportDateToUseField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2015-09-11 11:54:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2015-10-01 18:17:35 +0000
@@ -268,8 +268,8 @@
 			</tr>
 			
 			<tr>
-				<td><label for="reportDateDescription">$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-				<td><input type="text" id="reportDateDescription" name="reportDateDescription" value='$!programStage.reportDateDescription' class="{validate:{required:true}}" /></td>
+				<td><label for="excecutionDateLabel">$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+				<td><input type="text" id="excecutionDateLabel" name="excecutionDateLabel" value='$!programStage.excecutionDateLabel' class="{validate:{required:true}}" /></td>
 			</tr>
 			
 		</tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2015-07-02 07:05:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2015-10-01 18:17:35 +0000
@@ -145,9 +145,9 @@
 				<select id="dataElementIds" name="dataElementIds" style="height:200px; width:100%;"  multiple="multiple" size="10" ondblclick="insertDataElement( '#dataElementSelection', '$programStage.uid')">
 				
 					#if( $programStage.program.programType.value=="WITHOUT_REGISTRATION" )
-						#set($name = "$encoder.htmlEncode($programStage.reportDateDescription)")
+						#set($name = "$encoder.htmlEncode($programStage.excecutionDateLabel)")
 						#set($deJSON = '{"uid":"executionDate","name":"executionDate","executionDate":"executionDate","type":"date"}' )
-						<option value='$deJSON' decode="executionDate" dename="executionDate" title="$name">$encoder.htmlEncode($programStage.reportDateDescription)</option>
+						<option value='$deJSON' decode="executionDate" dename="executionDate" title="$name">$encoder.htmlEncode($programStage.excecutionDateLabel)</option>
 					#end
 					
 					#foreach( $de in $dataElements)
@@ -157,8 +157,8 @@
 				</select>
 				<select id="dataElementIdsStore" multiple="multiple" style="display:none">
 					#if( $programStage.program.programType.value=="WITHOUT_REGISTRATION" )
-						#set($name = "$encoder.htmlEncode($programStage.reportDateDescription)")#set($deJSON = '{"uid":"executionDate","name":"executionDate","executionDate":"executionDate","type":"date"}' )
-						<option value='$deJSON' decode="executionDate" dename="executionDate" title="$name">$encoder.htmlEncode($programStage.reportDateDescription)</option>
+						#set($name = "$encoder.htmlEncode($programStage.excecutionDateLabel)")#set($deJSON = '{"uid":"executionDate","name":"executionDate","executionDate":"executionDate","type":"date"}' )
+						<option value='$deJSON' decode="executionDate" dename="executionDate" title="$name">$encoder.htmlEncode($programStage.excecutionDateLabel)</option>
 					#end
 					
 					#foreach( $de in $dataElements)