 		protected function rejectButtonClickHandler(event:MouseEvent):void {
 			var messageResource:String;
 			var r:RecordProxy = Application.activeRecord;
-			if(r.step == RecordProxy$Step.CLEANSING) {
+			if(r.step == CollectRecord$Step.CLEANSING) {
 				messageResource = "edit.confirmRejectDataCleansing";
-			} else if(r.step == RecordProxy$Step.ANALYSIS) {
+			} else if(r.step == CollectRecord$Step.ANALYSIS) {
 				messageResource = "edit.confirmRejectDataAnalysis";
 			}
 			AlertUtil.showConfirm(messageResource, null, null, performReject);
 		}
 		
 		protected function performSubmit():void {
-			_dataClient.submitRecord(new AsyncResponder(promoteRecordResultHandler, faultHandler), 
-				Application.activeRecord.id);
+			var responder:AsyncResponder = new AsyncResponder(promoteRecordResultHandler, faultHandler);
+			_dataClient.submitRecord(responder, Application.activeRecord.id, Application.activeRecord.step);
 		}
 		
 		protected function performReject():void {
-			_dataClient.rejectRecord(new AsyncResponder(rejectRecordResultHandler, faultHandler), 
-				Application.activeRecord.id);
+			var responder:AsyncResponder = new AsyncResponder(rejectRecordResultHandler, faultHandler);
+			_dataClient.rejectRecord(responder, Application.activeRecord.id, Application.activeRecord.step);
 		}
 		
 		internal function clearActiveRecordHandler(event:ResultEvent, token:Object = null):void {

		protected function submitButtonClickHandler(event:MouseEvent):void {
			var messageResource:String;
			var r:RecordProxy = Application.activeRecord;
			if(r.step == RecordProxy$Step.ENTRY) {
				messageResource = "edit.confirmSubmitDataCleansing";
			} else if(r.step == RecordProxy$Step.CLEANSING) {
				messageResource = "edit.confirmSubmitDataAnalysis";
			}
			AlertUtil.showConfirm(messageResource, null, null, performSubmit);

	import org.openforis.collect.event.UIEvent;
	import org.openforis.collect.metamodel.proxy.EntityDefinitionProxy;
	import org.openforis.collect.metamodel.proxy.ModelVersionProxy;
	import org.openforis.collect.model.CollectRecord$Step;
	import org.openforis.collect.model.proxy.RecordProxy;
	import org.openforis.collect.ui.UIBuilder;
	import org.openforis.collect.ui.component.detail.FormContainer;
	import org.openforis.collect.ui.view.DetailView;
