=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2014-06-21 09:02:27 +0000
@@ -46,7 +46,7 @@
 /**
  * @author Chau Thu Tran
  */
-@JacksonXmlRootElement(localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 )
 public class ProgramTrackedEntityAttribute
     implements Serializable
 {
@@ -62,8 +62,8 @@
 
     private Boolean mandatory;
 
-    private Boolean allowDateInFuture;
-    
+    private Boolean allowFutureDate;
+
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -87,15 +87,15 @@
         this.displayInList = displayInList;
         this.mandatory = mandatory;
     }
-    
+
     public ProgramTrackedEntityAttribute( TrackedEntityAttribute attribute, Integer sortOrder, boolean displayInList,
-        Boolean mandatory, Boolean allowDateInFuture )
+        Boolean mandatory, Boolean allowFutureDate )
     {
         this.attribute = attribute;
         this.sortOrder = sortOrder;
         this.displayInList = displayInList;
         this.mandatory = mandatory;
-        this.allowDateInFuture = allowDateInFuture;
+        this.allowFutureDate = allowFutureDate;
     }
 
     // -------------------------------------------------------------------------
@@ -113,8 +113,8 @@
     }
 
     @JsonProperty
-    @JsonView({ DetailedView.class, ExportView.class })
-    @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+    @JsonView( { DetailedView.class, ExportView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public Boolean isMandatory()
     {
         return mandatory;
@@ -126,9 +126,9 @@
     }
 
     @JsonProperty
-    @JsonSerialize(as = BaseIdentifiableObject.class)
-    @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
-    @JacksonXmlProperty(localName = "personAttribute", namespace = DxfNamespaces.DXF_2_0)
+    @JsonSerialize( as = BaseIdentifiableObject.class )
+    @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
+    @JacksonXmlProperty( localName = "personAttribute", namespace = DxfNamespaces.DXF_2_0 )
     public TrackedEntityAttribute getAttribute()
     {
         return attribute;
@@ -150,14 +150,13 @@
     }
 
     @JsonProperty
-    @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
-    @JacksonXmlProperty(localName = "displayInList", namespace = DxfNamespaces.DXF_2_0)
+    @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
+    @JacksonXmlProperty( localName = "displayInList", namespace = DxfNamespaces.DXF_2_0 )
     public boolean isDisplayInList()
     {
         return displayInList;
     }
 
-
     public void setDisplayInList( boolean displayInList )
     {
         this.displayInList = displayInList;
@@ -167,13 +166,14 @@
     @JsonSerialize( as = BaseIdentifiableObject.class )
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public Boolean getAllowDateInFuture()
-    {
-        return allowDateInFuture;
-    }
-
-    public void setAllowDateInFuture( Boolean allowDateInFuture )
-    {
-        this.allowDateInFuture = allowDateInFuture;
-    }
+    public Boolean getAllowFutureDate()
+    {
+        return allowFutureDate;
+    }
+
+    public void setAllowFutureDate( Boolean allowFutureDate )
+    {
+        this.allowFutureDate = allowFutureDate;
+    }
+
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2014-06-19 13:44:22 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2014-06-21 09:02:27 +0000
@@ -283,7 +283,7 @@
         {
             ProgramTrackedEntityAttribute programAttribute = program.getAttribute( attribute );
             mandatory = programAttribute.isMandatory();
-            allowDateInFuture = programAttribute.getAllowDateInFuture();
+            allowDateInFuture = programAttribute.getAllowFutureDate();
         }
 
         inputHtml = TAG_OPEN + "input id=\"attr" + attribute.getId() + "\" name=\"attr" + attribute.getId()

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml	2014-06-21 09:02:27 +0000
@@ -21,7 +21,7 @@
 
 		<property name="mandatory" column="mandatory" />
 		
-		<property name="allowDateInFuture" column="allowDateInFuture" />
+		<property name="allowFutureDate" column="allowFutureDate" />
 
 	</class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java	2014-06-21 09:02:27 +0000
@@ -350,7 +350,7 @@
                 for ( ProgramTrackedEntityAttribute programAttribute : program.getAttributes() )
                 {
                     mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.isMandatory() );
-                    allowDateInFutureMap.put( programAttribute.getAttribute().getId(), programAttribute.getAllowDateInFuture() );
+                    allowDateInFutureMap.put( programAttribute.getAttribute().getId(), programAttribute.getAllowFutureDate() );
                 }
             }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java	2014-06-21 09:02:27 +0000
@@ -372,7 +372,7 @@
                 for ( ProgramTrackedEntityAttribute programAttribute : program.getAttributes() )
                 {
                     mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.isMandatory() );
-                    allowDateInFutureMap.put( programAttribute.getAttribute().getId(), programAttribute.getAllowDateInFuture() );
+                    allowDateInFutureMap.put( programAttribute.getAttribute().getId(), programAttribute.getAllowFutureDate() );
                 }
             }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2014-06-21 09:02:27 +0000
@@ -63,7 +63,7 @@
 			#elseif( $programStageDataElement.dataElement.type == "date" )
 				<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()' }" id="$id" name="entryfield" value="$!encoder.htmlEncode( $dataValue.value )" onchange="saveVal( '$programStageDataElement.dataElement.uid' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" />
 				<script type="text/javascript">
-					#if($programStageDataElement.allowDateInFuture=='true')
+					#if($programStageDataElement.allowFutureDate=='true')
 						datePicker( '$programStageDataElement.programStage.uid'+ '-' + '$programStageDataElement.dataElement.uid' + '-val', false, false);
 					#else
 						datePickerValid( '$programStageDataElement.programStage.uid'+ '-' + '$programStageDataElement.dataElement.uid' + '-val', false, false);

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2014-06-21 09:02:27 +0000
@@ -74,7 +74,7 @@
 								#elseif( $programStageDataElement.dataElement.type == "date" )
 									<input name="entryfield" type="text" data="{compulsory: $programStageDataElement.compulsory, deType:'$programStageDataElement.dataElement.getType()'}" id="$id" name="entryfield" value="$!encoder.htmlEncode( $dataValue.value )" onchange="saveVal( '$programStageDataElement.dataElement.uid' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="date-field datefield" >
 									<script type="text/javascript">
-										#if($programStageDataElement.allowDateInFuture=='true')
+										#if($programStageDataElement.allowFutureDate=='true')
 											datePicker( '$programStageDataElement.programStage.uid'+ '-' + '$programStageDataElement.dataElement.uid' + '-val', false, false);
 										#else
 											datePickerValid( '$programStageDataElement.programStage.uid'+ '-' + '$programStageDataElement.dataElement.uid' + '-val', false, false);

=== 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-19 13:44:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm	2014-06-21 09:02:27 +0000
@@ -46,7 +46,7 @@
 						 #set($value = "")
 						 #set($value = $attributeValueMap.get($attribute.id))
 						 #set($mandatory = $mandatoryMap.get($attribute.id))
-						 #set($allowDateInFuture = $allowDateInFutureMap.get($attribute.id))
+						 #set($allowFutureDate = $allowDateInFutureMap.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>
@@ -62,7 +62,7 @@
 							 #elseif( $attribute.valueType == "date" )
 								 <input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value='$value' class="{validate:{required:$mandatory }}" />
 								 <script type="text/javascript">
-									#if($allowDateInFuture=='true')
+									#if($allowFutureDate=='true')
 										datePicker( 'attr$attribute.id', false, false );
 									#else
 										 datePickerValid( 'attr$attribute.id', false, false );
@@ -114,7 +114,7 @@
 			#set( $attributeValue = $!attributeValueMap.get( $attribute.id ) )
 			#set($mandatory = $mandatoryMap.get($attribute.id))
 			#if( $mandatory ) #else  #set($mandatory=false) #end
-			#set($allowDateInFuture = $allowDateInFutureMap.get($attribute.id))
+			#set($allowFutureDate = $allowDateInFutureMap.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">
@@ -129,7 +129,7 @@
 					#elseif( $attribute.valueType == "date" )
 						<input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value="$!attributeValue" class=' #validate( "default"  $mandatory  )'>
 						<script type="text/javascript">
-							#if($allowDateInFuture=='true')
+							#if($allowFutureDate=='true')
 								datePicker( 'attr$attribute.id', false, false );
 							#else
 								datePickerValid( 'attr$attribute.id', false, false );

=== 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	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java	2014-06-21 09:02:27 +0000
@@ -163,11 +163,11 @@
         this.personDisplayNames = personDisplayNames;
     }
 
-    private List<Boolean> allowDateInFuture = new ArrayList<Boolean>();
+    private List<Boolean> allowFutureDate = new ArrayList<Boolean>();
 
-    public void setAllowDateInFuture( List<Boolean> allowDateInFuture )
+    public void setAllowFutureDate( List<Boolean> allowFutureDate )
     {
-        this.allowDateInFuture = allowDateInFuture;
+        this.allowFutureDate = allowFutureDate;
     }
 
     private List<Boolean> mandatory = new ArrayList<Boolean>();
@@ -325,7 +325,7 @@
                     .parseInt( ids[1] ) );
 
                 ProgramTrackedEntityAttribute programAttribute = new ProgramTrackedEntityAttribute( attribute,
-                    index + 1, personDisplayNames.get( index ), mandatory.get( index ), allowDateInFuture.get( index ) );
+                    index + 1, personDisplayNames.get( index ), mandatory.get( index ), allowFutureDate.get( index ) );
 
                 program.getAttributes().add( programAttribute );
             }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java	2014-06-21 09:02:27 +0000
@@ -271,11 +271,11 @@
         this.trackedEntityId = trackedEntityId;
     }
 
-    private List<Boolean> allowDateInFuture = new ArrayList<Boolean>();
+    private List<Boolean> allowFutureDate = new ArrayList<Boolean>();
 
-    public void setAllowDateInFuture( List<Boolean> allowDateInFuture )
+    public void setAllowFutureDate( List<Boolean> allowFutureDate )
     {
-        this.allowDateInFuture = allowDateInFuture;
+        this.allowFutureDate = allowFutureDate;
     }
 
     // -------------------------------------------------------------------------
@@ -360,7 +360,7 @@
                 TrackedEntityAttribute attribute = attributeService.getTrackedEntityAttribute( Integer
                     .parseInt( ids[1] ) );
                 ProgramTrackedEntityAttribute programAttribute = new ProgramTrackedEntityAttribute( attribute,
-                    index + 1, personDisplayNames.get( index ), mandatory.get( index ), allowDateInFuture.get( index ) );
+                    index + 1, personDisplayNames.get( index ), mandatory.get( index ), allowFutureDate.get( index ) );
                 program.getAttributes().add( programAttribute );
             }
 

=== 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-17 12:21:26 +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:02:27 +0000
@@ -17,7 +17,7 @@
 		compulsaryIdentifier.empty();
 		var mandatorySelector = jQuery( "#mandatory" );
 		mandatorySelector.empty();
-		var allowDateInFutureSelector = jQuery( "#allowDateInFuture" );
+		var allowDateInFutureSelector = jQuery( "#allowFutureDate" );
 		allowDateInFutureSelector.empty();
 		
         if( getFieldValue('type') != 3 ){
@@ -37,9 +37,9 @@
 				checked = mandatory.attr('checked') ? true : false;
 				mandatorySelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 				
-				// allowDateInFuture
-				var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
-				checked = allowDateInFuture.attr('checked') ? true : false;
+				// 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>" );
 			});
 			if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){
@@ -238,7 +238,7 @@
 			<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
 			<select style='display:none;' multiple id="personDisplayNames" name="personDisplayNames" ></select>
 			<select style='display:none;' multiple id="mandatory" name="mandatory" ></select>
-			<select style='display:none;' multiple id="allowDateInFuture" name="allowDateInFuture" ></select>
+			<select style='display:none;' multiple id="allowFutureDate" name="allowFutureDate" ></select>
 			<select id='compulsaryIdentifier' name="compulsaryIdentifier" multiple="multiple" class="hidden {validate:{required:true}}" title="$i18n.getString('please_select_at_least_attribute_for_displaying_in_list')"></select>
 		</th>
 	  </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2014-06-21 09:02:27 +0000
@@ -177,10 +177,10 @@
       html += "<td align='center'><input type='checkbox' name='displayed' value='" + item.value + "'></td>"
 	  html += "<td align='center'><input type='checkbox' name='mandatory'></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>";
 		
@@ -202,10 +202,10 @@
     html += "<td align='center'><input type='checkbox' name='displayed' value='" + item.value + "'></td>";
     html += "<td align='center'><input type='checkbox' name='mandatory'></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/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-06-17 12:21:26 +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:02:27 +0000
@@ -14,7 +14,7 @@
 			compulsaryIdentifier.empty();
 			var mandatorySelector = jQuery( "#mandatory" );
 			mandatorySelector.empty();		
-			var allowDateInFutureSelector = jQuery( "#allowDateInFuture" );
+			var allowDateInFutureSelector = jQuery( "#allowFutureDate" );
 			allowDateInFutureSelector.empty();
 			
 			if( getFieldValue('type') != 3 ){
@@ -33,9 +33,9 @@
 					checked = mandatory.attr('checked') ? true : false;
 					mandatorySelector.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 					
-					// allowDateInFuture
-					var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
-					checked = allowDateInFuture.attr('checked') ? true : false;
+					// 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>" );
 				});
 				if( jQuery("#selectedList").find("tr").length > 0 && isDisplayed ){
@@ -248,7 +248,7 @@
 				<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
 				<select style='display:none;' multiple id="personDisplayNames" name="personDisplayNames" ></select>
 				<select style='display:none;' multiple id="mandatory" name="mandatory" ></select>
-				<select style='display:none;' multiple id="allowDateInFuture" name="allowDateInFuture" ></select>
+				<select style='display:none;' multiple id="allowFutureDate" name="allowFutureDate" ></select>
 				<select id='compulsaryIdentifier' name="compulsaryIdentifier" multiple="multiple" class="hidden {validate:{required:true}}" title="$i18n.getString('please_select_at_least_attribute_for_displaying_in_list')"></select>
 			</th>
 		  </tr>
@@ -292,9 +292,9 @@
 									<td align="center"><input type="checkbox" name="mandatory" #if($programAttribute.mandatory == "true" ) checked #end #if($program.type==3) disabled #end  /></td>
 									<td align="center">
 										#if($attribute.valueType=='date')
-											<input type="checkbox" name="allowDateInFuture" #if($programAttribute.allowDateInFuture == "true" ) checked #end #if($program.type==3) disabled #end />
+											<input type="checkbox" name="allowFutureDate" #if($programAttribute.allowFutureDate == "true" ) checked #end #if($program.type==3) disabled #end />
 										#else
-											<input type="hidden" name="allowDateInFuture" />
+											<input type="hidden" name="allowFutureDate" />
 										#end
 									</td>
 								</tr>