=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2014-06-12 13:35:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2014-06-21 09:56:19 +0000
@@ -75,7 +75,7 @@
 
     private Boolean displayInReports = false;
 
-    private Boolean allowDateInFuture = false;
+    private Boolean allowFutureDate = false;
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -184,14 +184,14 @@
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public Boolean getAllowDateInFuture()
+    public Boolean getAllowFutureDate()
     {
-        return allowDateInFuture;
+        return allowFutureDate;
     }
 
-    public void setAllowDateInFuture( Boolean allowDateInFuture )
+    public void setAllowFutureDate( Boolean allowFutureDate )
     {
-        this.allowDateInFuture = allowDateInFuture;
+        this.allowFutureDate = allowFutureDate;
     }
 
     // -------------------------------------------------------------------------
@@ -230,7 +230,7 @@
             ", allowProvidedElsewhere=" + allowProvidedElsewhere +
             ", sortOrder=" + sortOrder +
             ", displayInReports=" + displayInReports +
-            ", allowDateInFuture=" + allowDateInFuture +
+            ", allowFutureDate=" + allowFutureDate +
             '}';
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java	2014-06-20 12:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java	2014-06-21 09:56:19 +0000
@@ -61,6 +61,7 @@
         executeSql( "alter table programstageinstance alter column  status  type varchar(25);" );
         executeSql( "UPDATE programstageinstance SET status='ACTIVE' WHERE status='0';" );
         executeSql( "UPDATE programstageinstance SET status='COMPLETED' WHERE status='1';" );
+        executeSql( "ALTER TABLE programstage_dataelements RENAME COLUMN allowDateInFuture to allowFutureDate;" );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2014-06-21 09:56:19 +0000
@@ -174,7 +174,7 @@
 
                     compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
                     allowProvidedElsewhere = psde.getAllowProvidedElsewhere();
-                    if ( psde.getAllowDateInFuture() )
+                    if ( psde.getAllowFutureDate() )
                     {
                         dateMethod = "datePicker";
                     }
@@ -391,7 +391,7 @@
 
                     compulsory = BooleanUtils.toStringTrueFalse( psde.isCompulsory() );
                     allowProvidedElsewhere = psde.getAllowProvidedElsewhere();
-                    if ( psde.getAllowDateInFuture() )
+                    if ( psde.getAllowFutureDate() )
                     {
                         dateMethod = "datePicker";
                     }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2014-06-12 09:53:18 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2014-06-21 09:56:19 +0000
@@ -21,7 +21,7 @@
 
     <property name="displayInReports" />
 
-    <property name="allowDateInFuture" />
+    <property name="allowFutureDate" />
 
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm	2014-06-21 09:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm	2014-06-21 09:56:19 +0000
@@ -46,7 +46,7 @@
 						 #set($value = "")
 						 #set($value = $attributeValueMap.get($attribute.id))
 						 #set($mandatory = $mandatoryMap.get($attribute.id))
-						 #set($allowFutureDate = $allowDateInFutureMap.get($attribute.id))
+						 #set($allowFutureDate = $allowFutureDateMap.get($attribute.id))
 						 #if( $mandatory ) #else  #set($mandatory=false) #end
 						 <tr name='attributesFields'>
 							 <td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($mandatory ) <em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
@@ -114,7 +114,7 @@
 			#set( $attributeValue = $!attributeValueMap.get( $attribute.id ) )
 			#set($mandatory = $mandatoryMap.get($attribute.id))
 			#if( $mandatory ) #else  #set($mandatory=false) #end
-			#set($allowFutureDate = $allowDateInFutureMap.get($attribute.id))
+			#set($allowFutureDate = $allowFutureDateMap.get($attribute.id))
 			<tr name='attributesFields'>
 				<td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($mandatory ) <em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 				<td class="input-column">

=== 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	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java	2014-06-21 09:56:19 +0000
@@ -243,11 +243,11 @@
         this.captureCoordinates = captureCoordinates;
     }
 
-    private List<Boolean> allowDateInFutures;
+    private List<Boolean> allowFutureDates;
 
-    public void setAllowDateInFutures( List<Boolean> allowDateInFutures )
+    public void setAllowFutureDates( List<Boolean> allowFutureDates )
     {
-        this.allowDateInFutures = allowDateInFutures;
+        this.allowFutureDates = allowFutureDates;
     }
 
     private List<Integer> userGroup = new ArrayList<Integer>();
@@ -384,13 +384,13 @@
             DataElement dataElement = dataElementService.getDataElement( selectedDataElementsValidator.get( i ) );
             Boolean allowed = allowProvidedElsewhere.get( i ) == null ? false : allowProvidedElsewhere.get( i );
             Boolean displayInReport = displayInReports.get( i ) == null ? false : displayInReports.get( i );
-            Boolean allowDate = allowDateInFutures.get( i ) == null ? false : allowDateInFutures.get( i );
+            Boolean allowDate = allowFutureDates.get( i ) == null ? false : allowFutureDates.get( i );
 
             ProgramStageDataElement programStageDataElement = new ProgramStageDataElement( programStage, dataElement,
                 this.compulsories.get( i ), new Integer( i ) );
             programStageDataElement.setAllowProvidedElsewhere( allowed );
             programStageDataElement.setDisplayInReports( displayInReport );
-            programStageDataElement.setAllowDateInFuture( allowDate );
+            programStageDataElement.setAllowFutureDate( allowDate );
             programStageDataElementService.addProgramStageDataElement( programStageDataElement );
         }
 

=== 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	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java	2014-06-21 09:56:19 +0000
@@ -222,11 +222,11 @@
         this.captureCoordinates = captureCoordinates;
     }
 
-    private List<Boolean> allowDateInFutures;
+    private List<Boolean> allowFutureDates;
 
-    public void setAllowDateInFutures( List<Boolean> allowDateInFutures )
+    public void setAllowFutureDates( List<Boolean> allowFutureDates )
     {
-        this.allowDateInFutures = allowDateInFutures;
+        this.allowFutureDates = allowFutureDates;
     }
 
     private List<Integer> whenToSend = new ArrayList<Integer>();
@@ -383,7 +383,7 @@
             DataElement dataElement = dataElementService.getDataElement( selectedDataElementsValidator.get( i ) );
             Boolean allowed = allowProvidedElsewhere.get( i ) == null ? false : allowProvidedElsewhere.get( i );
             Boolean displayInReport = displayInReports.get( i ) == null ? false : displayInReports.get( i );
-            Boolean allowDate = allowDateInFutures.get( i ) == null ? false : allowDateInFutures.get( i );
+            Boolean allowDate = allowFutureDates.get( i ) == null ? false : allowFutureDates.get( i );
 
             ProgramStageDataElement programStageDataElement = programStageDataElementService.get( programStage,
                 dataElement );
@@ -394,7 +394,7 @@
                     this.compulsories.get( i ), i );
                 programStageDataElement.setAllowProvidedElsewhere( allowed );
                 programStageDataElement.setDisplayInReports( displayInReport );
-                programStageDataElement.setAllowDateInFuture( allowDate );
+                programStageDataElement.setAllowFutureDate( allowDate );
                 programStageDataElementService.addProgramStageDataElement( programStageDataElement );
             }
             else
@@ -403,7 +403,7 @@
                 programStageDataElement.setSortOrder( i );
                 programStageDataElement.setAllowProvidedElsewhere( allowed );
                 programStageDataElement.setDisplayInReports( displayInReport );
-                programStageDataElement.setAllowDateInFuture( allowDate );
+                programStageDataElement.setAllowFutureDate( allowDate );
                 programStageDataElementService.updateProgramStageDataElement( programStageDataElement );
 
                 programStageDataElements.remove( programStageDataElement );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2014-06-21 09:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2014-06-21 09:56:19 +0000
@@ -17,8 +17,8 @@
 		compulsaryIdentifier.empty();
 		var mandatorySelector = jQuery( "#mandatory" );
 		mandatorySelector.empty();
-		var allowDateInFutureSelector = jQuery( "#allowFutureDate" );
-		allowDateInFutureSelector.empty();
+		var allowFutureDateSelector = jQuery( "#allowFutureDate" );
+		allowFutureDateSelector.empty();
 		
         if( getFieldValue('type') != 3 ){
 			
@@ -40,7 +40,7 @@
 				// allowFutureDate
 				var allowFutureDate = jQuery( item ).find( "input[name='allowFutureDate']:first");
 				checked = allowFutureDate.attr('checked') ? true : false;
-				allowDateInFutureSelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
+				allowFutureDateSelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 			});
 			if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){
 				compulsaryIdentifier.append( "<option value='0' selected='true'></option>");

=== 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	2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm	2014-06-21 09:56:19 +0000
@@ -159,7 +159,7 @@
 			<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>     
 			<select id="allowProvidedElsewhere" name='allowProvidedElsewhere' multiple="multiple" class="hidden"></select>     
 			<select id="displayInReports" name='displayInReports' multiple="multiple" class="hidden"></select>     
-			<select id="allowDateInFutures" name='allowDateInFutures' multiple="multiple" class="hidden"></select>   
+			<select id="allowFutureDates" name='allowFutureDates' multiple="multiple" class="hidden"></select>   
 		</th>
       </tr>
     </thead>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js	2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js	2014-06-21 09:56:19 +0000
@@ -16,8 +16,8 @@
 		var daysAllowedSendMessages = jQuery( "#daysAllowedSendMessages" );
 		daysAllowedSendMessages.empty();
 		
-		var allowDateInFutures = jQuery( "#allowDateInFutures" );
-		allowDateInFutures.empty();
+		var allowFutureDates = jQuery( "#allowFutureDates" );
+		allowFutureDates.empty();
 		
 		var templateMessages = jQuery( "#templateMessages" );
 		templateMessages.empty();
@@ -53,9 +53,9 @@
 			checked = displayInReport.attr('checked') ? true : false;
 			displayInReports.append( "<option value='" + checked + "' selected='true'><" + checked + "/option>" );
 		
-			var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
-			checked = allowDateInFuture.attr('checked') ? true : false;
-			allowDateInFutures.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
+			var allowFutureDate = jQuery( item ).find( "input[name='allowFutureDate']:first");
+			checked = allowFutureDate.attr('checked') ? true : false;
+			allowFutureDates.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 		});
 		jQuery(".daysAllowedSendMessage").each( function( i, item ){ 
 			var days = (jQuery(item).attr('realvalue')==undefined) ? 0 : jQuery(item).attr('realvalue');

=== 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	2014-06-13 10:58:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js	2014-06-21 09:56:19 +0000
@@ -140,10 +140,10 @@
 			html += "<td align='center'><input type='checkbox' name='allowProvided'></td>";
 			html += "<td align='center'><input type='checkbox' name='displayInReport'></td>";
 			if( jQuery(item).attr('valuetype') =='date'){
-				html += "<td align='center'><input type='checkbox' name='allowDateInFuture'></td>";
+				html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
 			}
 			else{
-				html += "<td align='center'><input type='hidden' name='allowDateInFuture'></td>";
+				html += "<td align='center'><input type='hidden' name='allowFutureDate'></td>";
 			}
 			
 			html += "</tr>";
@@ -164,10 +164,10 @@
 		html += "<td align='center'><input type='checkbox' name='displayInReport'></td>";
 		
 		if( jQuery(item).attr('valuetype') =='date'){
-			html += "<td align='center'><input type='checkbox' name='allowDateInFuture'></td>";
+			html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
 		}
 		else{
-			html += "<td align='center'><input type='hidden' name='allowDateInFuture'></td>";
+			html += "<td align='center'><input type='hidden' name='allowFutureDate'></td>";
 		}
 		
 		html += "</tr>";

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js	2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js	2014-06-21 09:56:19 +0000
@@ -14,8 +14,8 @@
 		var displayInReports = jQuery( "#displayInReports" );
 		displayInReports.empty();
 		
-		var allowDateInFutures = jQuery( "#allowDateInFutures" );
-		allowDateInFutures.empty();
+		var allowFutureDates = jQuery( "#allowFutureDates" );
+		allowFutureDates.empty();
 		
 		var daysAllowedSendMessages = jQuery( "#daysAllowedSendMessages" );
 		daysAllowedSendMessages.empty();
@@ -54,9 +54,9 @@
 			checked = displayInReport.attr('checked') ? true : false;
 			displayInReports.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 		
-			var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
-			checked = allowDateInFuture.attr('checked') ? true : false;
-			allowDateInFutures.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
+			var allowFutureDate = jQuery( item ).find( "input[name='allowFutureDate']:first");
+			checked = allowFutureDate.attr('checked') ? true : false;
+			allowFutureDates.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 		});
 		jQuery(".daysAllowedSendMessage").each( function( i, item ){ 
 			var days = (jQuery(item).attr('realvalue')==undefined) ? 0 : jQuery(item).attr('realvalue');

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-06-21 09:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-06-21 09:56:19 +0000
@@ -14,8 +14,8 @@
 			compulsaryIdentifier.empty();
 			var mandatorySelector = jQuery( "#mandatory" );
 			mandatorySelector.empty();		
-			var allowDateInFutureSelector = jQuery( "#allowFutureDate" );
-			allowDateInFutureSelector.empty();
+			var allowFutureDateSelector = jQuery( "#allowFutureDate" );
+			allowFutureDateSelector.empty();
 			
 			if( getFieldValue('type') != 3 ){
 				var isDisplayed = false;
@@ -36,7 +36,7 @@
 					// allowFutureDate
 					var allowFutureDate = jQuery( item ).find( "input[name='allowFutureDate']:first");
 					checked = allowFutureDate.attr('checked') ? true : false;
-					allowDateInFutureSelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
+					allowFutureDateSelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 				});
 				if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){
 					compulsaryIdentifier.append( "<option value='0' selected='true'></option>");

=== 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	2014-06-02 02:07:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2014-06-21 09:56:19 +0000
@@ -167,7 +167,7 @@
 					<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>
 					<select id="allowProvidedElsewhere" name='allowProvidedElsewhere' multiple="multiple" class="hidden"></select>
 					<select id="displayInReports" name='displayInReports' multiple="multiple" class="hidden"></select>
-					<select id="allowDateInFutures" name='allowDateInFutures' multiple="multiple" class="hidden"></select>     
+					<select id="allowFutureDates" name='allowFutureDates' multiple="multiple" class="hidden"></select>     
 				</th>
 			</tr>
 		</thead>
@@ -213,9 +213,9 @@
 									<td align="center"><input type="checkbox" name="displayInReport" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.displayInReports == 'true' ) checked #end /></td>
 									<td align="center">
 										#if($programStageDataElement.dataElement.type=='date')
-										<input type="checkbox" name="allowDateInFuture" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.allowDateInFuture == 'true' ) checked #end />
+										<input type="checkbox" name="allowFutureDate" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.allowFutureDate == 'true' ) checked #end />
 										#else
-										<input type="hidden" name="allowDateInFuture" />
+										<input type="hidden" name="allowFutureDate" />
 										#end
 									</td>
 								</tr>