=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2012-10-29 07:01:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2012-10-30 06:12:34 +0000
@@ -5879,7 +5879,7 @@
         </section>
       </section>
       <section id="patient_aggregation_query_builder">
-        <title>Aggregation query builder management</title>
+        <title>Aggregation query builder</title>
         <para>This is the core functionality for linking data between tracker module and aggregate management module by defining the linking/aggregating rules. The purpose  is to produce aggregated data / statistics based on the low-level case based data. It is based around flexible aggregation query definitions which maps the data elements used for case based data management to data elements used for aggregate data.</para>
         <para>This provides two functions - </para>
         <itemizedlist>
@@ -6551,7 +6551,7 @@
           </listitem>
           <listitem>
             <para>Click on the 
-<emphasis role="italic">Aggregate</emphasis> button to execute aggregate function. The <emphasis>Person aggregation result</emphasis>page is shown after running successfully.</para>
+				<emphasis role="italic">Aggregate</emphasis> button to execute aggregate function. The <emphasis>Person aggregation result</emphasis>page is shown after running successfully.</para>
           </listitem>
         </orderedlist>
         <screenshot>

=== 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	2012-10-30 03:46:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-10-30 06:12:34 +0000
@@ -156,7 +156,7 @@
 create_new_aggregation_query_builder=Create new aggregation query builder
 condition=Condition
 condition_detail=Condition details
-edit_aggregation_query_builder=Edit person aggregation
+edit_aggregation_query_builder=Edit aggregation query builder
 program_properties=Program properties
 orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
@@ -312,6 +312,5 @@
 add_single_rule = Add single rule
 add_multi_rule = Add multi rule
 no_aggregation = No aggregation
-never = Never
 age_at_visit_days_since_birth = Age at visit (days since birth)
 formula = Formula
\ 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/javascript/scheduling.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2012-10-25 13:31:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2012-10-30 06:12:34 +0000
@@ -17,9 +17,11 @@
 		setInnerHTML('info', i18n_scheduling_is + " " + status);
 		if( json.scheduleTasks.running=="true" ){
 			setFieldValue('scheduledBtn', i18n_stop);
+			enable('executeButton');
 		}
 		else{
 			setFieldValue('scheduledBtn', i18n_start);
+			disable('executeButton');
 		}
 	});
 }
@@ -38,7 +40,7 @@
 }
 
 // -----------------------------------------------------------------------
-// Schedule Aggregate Query Builder
+// Schedule Automated Aggregate
 // -----------------------------------------------------------------------
 
 function schedulingAggCondTasks()
@@ -55,9 +57,11 @@
 		setInnerHTML('info', i18n_scheduling_is + " " + status);
 		if( json.scheduleTasks.running=="true" ){
 			setFieldValue('scheduledBtn', i18n_stop);
+			enable('executeButton');
 		}
 		else{
 			setFieldValue('scheduledBtn', i18n_start);
+			disable('executeButton');
 		}
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-26 13:10:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-30 06:12:34 +0000
@@ -18,7 +18,7 @@
 					value="$i18n.getString( 'start' )"
 				#end
 				onclick="scheduleTasks();"/>
-				<input type="button" style="width:150px;" value="$i18n.getString( 'execute' )" onclick="executeTasks();"/>
+				<input type="button" id="executeButton" name="executeButton" style="width:150px;" value="$i18n.getString( 'execute' )" onclick="executeTasks();" #if ( $running=='false' ) disabled #end/>
 			</td>
 		</tr>
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-26 13:10:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-30 06:12:34 +0000
@@ -42,7 +42,6 @@
 <tr>
 	<td>
 		<select id="aggQueryBuilderStrategy" name="aggQueryBuilderStrategy" class="scheduling" style="width:100%">
-		<option value="never">$i18n.getString( "never" )</option>
 		<option value="last12Daily"#if( $aggQueryBuilderStrategy && $aggQueryBuilderStrategy == "last12Daily" ) selected="selected"#end>$i18n.getString( "last_12_months_daily" )</option>
 		<option value="last6Daily6To12Weekly"#if( $aggQueryBuilderStrategy && $aggQueryBuilderStrategy == "last6Daily6To12Weekly" ) selected="selected"#end>$i18n.getString( "last_6_months_daily_6_to_12_months_weekly" )</option>		
 		</select>
@@ -60,7 +59,7 @@
 		value="$i18n.getString( 'start' )"
 		#end
 		/>
-		<input type="button" id="executeButton" style="width:140px" onclick="executeAggCondTasks();" value="$i18n.getString( 'execute' )" />
+		<input type="button" id="executeButton" name="executeButton" style="width:140px" onclick="executeAggCondTasks();" value="$i18n.getString( 'execute' )" #if ( $running=='false' ) disabled #end />
 	</td>
 </tr>
 </table>