=== 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	2013-09-11 15:26:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java	2013-09-12 05:49:31 +0000
@@ -101,6 +101,8 @@
 
     private Boolean generatedByEnrollmentDate;
 
+    private Boolean allowGenerateNextVisit = false;
+
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -145,7 +147,7 @@
     {
         this.blockEntryForm = blockEntryForm;
     }
-    
+
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -362,4 +364,17 @@
         this.captureCoordinates = captureCoordinates;
     }
 
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public Boolean getAllowGenerateNextVisit()
+    {
+        return allowGenerateNextVisit;
+    }
+
+    public void setAllowGenerateNextVisit( Boolean allowGenerateNextVisit )
+    {
+        this.allowGenerateNextVisit = allowGenerateNextVisit;
+    }
+
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-09-12 05:49:31 +0000
@@ -234,6 +234,7 @@
         executeSql( "ALTER TABLE program DROP COLUMN displayProvidedOtherFacility" );
         executeSql( "UPDATE programstage_dataelements SET displayAsRadioButton=false WHERE displayAsRadioButton is null" );
         executeSql( "UPDATE patientreminder SET messageType=1 WHERE messageType is null" );
+        executeSql( "UPDATE programstage SET allowGenerateNextVisit=false WHERE allowGenerateNextVisit is null" );
         
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2013-09-07 13:29:42 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2013-09-12 05:49:31 +0000
@@ -62,6 +62,8 @@
 		<property name="blockEntryForm" />
 
 		<property name="remindCompleted" />
+		
+		<property name="allowGenerateNextVisit" />
 
 	</class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-09-09 10:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-09-12 05:49:31 +0000
@@ -19,6 +19,7 @@
 <input type='hidden' name='blockEntryForm' id='blockEntryForm'>
 <input type='hidden' name='remindCompleted' id='remindCompleted'>
 <input type='hidden' name='displayOptionSetAsRadioButton' id='displayOptionSetAsRadioButton'>
+<input type='hidden' name='allowGenerateNextVisit' id='allowGenerateNextVisit'>
 
 <div id='entryForm' class='hidden'>
 	<table style="width:600px;margin-top:-30px" class="listTable">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-11 03:48:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-12 05:49:31 +0000
@@ -552,9 +552,18 @@
 function showCreateNewEvent( programInstanceId, programStageId )
 {
 	var flag = false;
+	
 	if(programStageId!=undefined)
 	{
 		jQuery('#repeatableProgramStage_' + programInstanceId + " option ").each(function(){
+			if( jQuery(this).css("display")!='none' && programStageId==jQuery(this).attr('prevStageId')){
+				jQuery(this).attr("selected","selected");
+				setSuggestedDueDate( programInstanceId );
+				flag = true;
+			}
+		});
+		
+		jQuery('#repeatableProgramStage_' + programInstanceId + " option ").each(function(){
 			if( jQuery(this).css("display")!='none' && programStageId==jQuery(this).val()){
 				jQuery(this).attr("selected","selected");
 				setSuggestedDueDate( programInstanceId );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-09-09 10:38:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2013-09-12 05:49:31 +0000
@@ -550,7 +550,7 @@
 		}
 		var compulsory = data['compulsory']; 
 		if( compulsory == 'true' && 
-			( !jQuery(this).val() || jQuery(this).val() == "undifined" ) ){
+			( !jQuery(this).val() || jQuery(this).val() == "undefined" ) ){
                 flag = true;
                 jQuery(this).parent().addClass("errorCell");
             }
@@ -578,7 +578,8 @@
                 var displayGenerateEventBox = jQuery('#entryFormContainer [name=displayGenerateEventBox]').val();
                 var programInstanceId = jQuery('#entryFormContainer [id=programInstanceId]').val();
 
-                if( irregular == 'true' && displayGenerateEventBox=="true" ) {
+                if( ( irregular == 'true' && displayGenerateEventBox=="true" ) 
+					|| getFieldValue('allowGenerateNextVisit')=='true') {
                     var programStageUid = getProgramStageUid();
                     showCreateNewEvent( programInstanceId, programStageUid );
                 }
@@ -607,7 +608,7 @@
 
                 hideLoader();
 
-                if ( isCreateEvent ) {
+                if ( isCreateEvent) {
                     showAddEventForm(isCreateEvent);
                 }
             } ).fail(function() {
@@ -808,6 +809,7 @@
             $( "#entryFormContainer input[id='blockEntryForm']" ).val( data.programStage.blockEntryForm );
             $( "#entryFormContainer input[id='remindCompleted']" ).val( data.programStage.remindCompleted );
 			$( "#entryFormContainer input[id='displayOptionSetAsRadioButton']" ).val( data.displayOptionSetAsRadioButton );
+			$( "#entryFormContainer input[id='allowGenerateNextVisit']" ).val( data.programStage.allowGenerateNextVisit );
 
             $( "input[id='dueDate']" ).val( data.dueDate );
             $( "input[id='executionDate']" ).val( data.executionDate );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-09-02 21:20:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-09-12 05:49:31 +0000
@@ -24,7 +24,8 @@
         "validCompleteOnly": "$!{ps.validCompleteOnly}",
         "captureCoordinates": "$!{ps.captureCoordinates}",
         "blockEntryForm": "$!ps.blockEntryForm",
-        "remindCompleted": "$!ps.remindCompleted"
+        "remindCompleted": "$!ps.remindCompleted",
+		"allowGenerateNextVisit": "$!ps.allowGenerateNextVisit"
     }#if( $velocityCount < $pssize ),#end
     #end],
     "programAssociations": $programAssociations.get( ${program.id} )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm	2013-09-12 05:49:31 +0000
@@ -36,7 +36,8 @@
         "validCompleteOnly": "$!programStageInstance.programStage.validCompleteOnly",
         "captureCoordinates": "$!programStageInstance.programStage.captureCoordinates",
         "blockEntryForm": "$!programStageInstance.programStage.blockEntryForm",
-        "remindCompleted": "$!programStageInstance.programStage.remindCompleted"
+        "remindCompleted": "$!programStageInstance.programStage.remindCompleted",
+		"allowGenerateNextVisit": "$!programStageInstance.programStage.allowGenerateNextVisit"
     },
 
     "programInstance": {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2013-09-06 05:27:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2013-09-12 05:49:31 +0000
@@ -97,9 +97,17 @@
 			<td>$i18n.getString( 'program_stage' )</td>
 			<td>
 				<select id='repeatableProgramStage_$!programInstance.id' name='repeatableProgramStageId_$!programInstance.id' onchange="setSuggestedDueDate('$programInstance.id')">
+					#set($allowGenerateNextVisit='false')
+					#set($prevStageId='')
 					#foreach( $programStage in $programInstance.program.programStages )
 						#if( $programStage.irregular=='true')
-							<option value="$programStage.uid" localid='$programStage.id' standardInterval='$programStage.standardInterval' selected repeatable="true">$!programStage.displayName</option>
+							#if($!programStage.standardInterval)
+								#set($standardInterval=$!programStage.standardInterval)
+							#else
+								#set($standardInterval=0)
+							#end
+							<option value="$programStage.uid" localid='$programStage.id' prevStageId='$prevStageId'
+								standardInterval='$standardInterval' selected repeatable="true">$!programStage.displayName</option>
 						#else
 							#set($hasEvent="false")
 							#foreach( $programStageInstance in $programInstance.programStageInstances )
@@ -107,8 +115,21 @@
 									#set($hasEvent="true")
 								#end
 							#end
+							<option 
+								#if($hasEvent=="true") style="display:none;" #else selected #end 
+								value="$programStage.uid" localid='$programStage.id' prevStageId='$prevStageId'
+								standardInterval='$programStage.minDaysFromStart' allowGenerateNextVisit='$allowGenerateNextVisit' repeatable="false">$!programStage.displayName</option>
 							
-							<option #if($hasEvent=="true") style="display:none;" #else selected #end value="$programStage.uid" localid='$programStage.id' standardInterval='$programStage.minDaysFromStart' repeatable="false">$!programStage.displayName</option>
+						#end
+						
+						#if($allowGenerateNextVisit=='true')
+							#set($allowGenerateNextVisit='false')
+							#set($prevStageId='')
+						#end
+						
+						#if($programStage.allowGenerateNextVisit=='true')
+							#set($allowGenerateNextVisit='true')
+							#set($prevStageId=$programStage.uid)
 						#end
 					#end
 				</select>

=== 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	2013-09-06 09:06:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2013-09-12 05:49:31 +0000
@@ -7,9 +7,10 @@
 	"dataElementCount": "${programStageDataElements.size()}",
 	"standardInterval": "$!programStage.standardInterval",
 	"reportDateDescription": "$!encoder.jsonEncode( ${programStage.reportDateDescription} )",
-	"blockEntryForm": "$!program.blockEntryForm",
-	"remindCompleted": "$!program.remindCompleted",
-	"generatedByEnrollmentDate": "$!program.generatedByEnrollmentDate",
+	"blockEntryForm": "$!programStage.blockEntryForm",
+	"remindCompleted": "$!programStage.remindCompleted",
+	"allowGenerateNextVisit": "$!programStage.allowGenerateNextVisit",
+	"generatedByEnrollmentDate": "$!programStage.generatedByEnrollmentDate",
 	"patientReminders":[
 	#foreach($patientReminder in $programStage.patientReminders)
 	  {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java	2013-09-12 05:49:31 +0000
@@ -292,6 +292,13 @@
         this.remindCompleted = remindCompleted;
     }
 
+    private Boolean allowGenerateNextVisit;
+
+    public void setAllowGenerateNextVisit( Boolean allowGenerateNextVisit )
+    {
+        this.allowGenerateNextVisit = allowGenerateNextVisit;
+    }
+    
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -309,6 +316,7 @@
         generatedByEnrollmentDate = (generatedByEnrollmentDate == null) ? false : generatedByEnrollmentDate;
         blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
         remindCompleted = (remindCompleted == null) ? false : remindCompleted;
+        allowGenerateNextVisit = (allowGenerateNextVisit == null) ? false : allowGenerateNextVisit;
 
         ProgramStage programStage = new ProgramStage();
         Program program = programService.getProgram( id );
@@ -327,6 +335,7 @@
         programStage.setBlockEntryForm( blockEntryForm );
         programStage.setRemindCompleted( remindCompleted );
         programStage.setGeneratedByEnrollmentDate( generatedByEnrollmentDate );
+        programStage.setAllowGenerateNextVisit( allowGenerateNextVisit );
 
         Set<PatientReminder> patientReminders = new HashSet<PatientReminder>();
         for ( int i = 0; i < daysAllowedSendMessages.size(); i++ )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2013-09-12 05:49:31 +0000
@@ -285,6 +285,13 @@
         this.displayAsRadioButtons = displayAsRadioButtons;
     }
 
+    private Boolean allowGenerateNextVisit;
+
+    public void setAllowGenerateNextVisit( Boolean allowGenerateNextVisit )
+    {
+        this.allowGenerateNextVisit = allowGenerateNextVisit;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -302,6 +309,7 @@
         generatedByEnrollmentDate = (generatedByEnrollmentDate == null) ? false : generatedByEnrollmentDate;
         blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
         remindCompleted = (remindCompleted == null) ? false : remindCompleted;
+        allowGenerateNextVisit = (allowGenerateNextVisit == null) ? false : allowGenerateNextVisit;
 
         ProgramStage programStage = programStageService.getProgramStage( id );
 
@@ -316,6 +324,7 @@
         programStage.setBlockEntryForm( blockEntryForm );
         programStage.setRemindCompleted( remindCompleted );
         programStage.setGeneratedByEnrollmentDate( generatedByEnrollmentDate );
+        programStage.setAllowGenerateNextVisit( allowGenerateNextVisit );
 
         if ( !programStage.getProgram().isSingleEvent() )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-09-12 05:49:31 +0000
@@ -470,4 +470,5 @@
 recipients = Recipients
 message_type = Message type
 both = Both
-direct_sms = Direct SMS
\ No newline at end of file
+direct_sms = Direct SMS
+remind_creating_next_event_on_this_event_completed = Remind creating next event on this event completed
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-09-12 05:49:31 +0000
@@ -79,6 +79,12 @@
 		<td></td>
 	</tr>
 	
+	<tr>
+		<td><label>$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+		<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' ></td>
+		<td></td>
+	</tr>
+	
 	#if($program.type==1)
 	<tr>
 		<td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2013-09-12 05:49:31 +0000
@@ -90,6 +90,9 @@
 		var remindCompleted = ( json.programStage.remindCompleted == 'true') ? i18n_yes : i18n_no;
 		setInnerHTML( 'remindCompletedField', remindCompleted );   	
 		
+		var allowGenerateNextVisit = ( json.programStage.allowGenerateNextVisit == 'true') ? i18n_yes : i18n_no;
+		setInnerHTML( 'allowGenerateNextVisitField', allowGenerateNextVisit );   	
+		
 		var templateMessage = "";
 		for(var i in json.programStage.patientReminders){
 			var index = eval(i) + 1;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2013-09-09 16:11:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2013-09-12 05:49:31 +0000
@@ -68,6 +68,7 @@
 				<p><label class="bold">$i18n.getString( "standard_interval_days" ):</label><br><span id="standardIntervalField"></span></p>
 				<p><label class="bold">$i18n.getString( "block_entry_form_after_completed" ):</label><br><span id="blockEntryFormField"></span></p>
 				<p><label class="bold">$i18n.getString( "remind_completing_program_after_program_stage_completed" ):</label><br><span id="remindCompletedField"></span></p>
+				<p><label class="bold">$i18n.getString( "remind_creating_next_event_on_this_event_completed" ):</label><br><span id="allowGenerateNextVisitField"></span></p>
 				<p><label class="bold">$i18n.getString( "generated_events_by_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>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-09-10 13:28:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-09-12 05:49:31 +0000
@@ -81,6 +81,12 @@
 				<td></td>
 			</tr>
 			
+			<tr>
+				<td><label>$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+				<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' #if( $programStage.allowGenerateNextVisit=='true' ) checked #end ></td>
+				<td></td>
+			</tr>
+			
 			#if($programStage.program.type==1)
 			<tr>
 				<td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>