=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm	2015-05-12 08:49:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm	2015-05-24 15:56:22 +0000
@@ -132,9 +132,9 @@
 				<input type='button' class="small-button" onclick='insertVariable( this );' value="==" />
 				<input type='button' class="small-button" onclick='insertVariable( this );' value="!=" />
 				&nbsp;&nbsp;&nbsp;
-				<input type='button' class="small-button" onclick='insertOperator( "!" );' value="!" />
-				<input type='button' class="small-button" onclick='insertOperator( "&&" );' value="&&" />
-				<input type='button' class="small-button" onclick='insertOperator( "||" );' value="||" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="!" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="&&" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="||" />
 			</td>
 		</tr>
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js	2015-05-12 08:49:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js	2015-05-24 15:56:22 +0000
@@ -200,7 +200,7 @@
 {
 	var json_Data = '{ '
 		+ '"name": "' + variableName + '",'
-		+ '"sourceType": "' +  sourceType + '",'
+		+ '"programRuleVariableSourceType": "' +  sourceType + '",'
 		+ '"dataElement": { "id" : "' + dataElementId + '"},'
 		+ '"program": { "id" :"' + getFieldValue("programId") + '"},'
 		+ '"programStage": { "id" :  "' + programStageId + '"}'

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm	2015-05-12 08:49:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm	2015-05-24 15:56:22 +0000
@@ -133,9 +133,9 @@
 				<input type='button' class="small-button" onclick='insertVariable( this );' value="==" />
 				<input type='button' class="small-button" onclick='insertVariable( this );' value="!=" />
 				&nbsp;&nbsp;&nbsp;
-				<input type='button' class="small-button" onclick='insertOperator( "!" );' value="!" />
-				<input type='button' class="small-button" onclick='insertOperator( "&&" );' value="&&" />
-				<input type='button' class="small-button" onclick='insertOperator( "||" );' value="||" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="!" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="&&" />
+				<input type='button' class="small-button" onclick='insertVariable( this );' value="||" />
 			</td>
 		</tr>