Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 58d24875f4e9c0115a05cae01b4a4e0a26818396)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35)
@@ -114,10 +114,10 @@
                 _preTreatmentCreatePatientPrescription  .ready()
     }
 
-    function validate () {
-        vTreatmentCreate                    .patientID = _preTreatmentCreateTreatmentSettings.patientID
-        vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog
-
+    function validate (vFinalConfirmation) {
+        vTreatmentCreate                    .patientID = _preTreatmentCreatePatientPrescription.patientID
+        vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreatePatientPrescription.patientID // store for the TreatmentLog
+        vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
         vTreatmentCreate.doValidation       (        )
     }
 
@@ -215,10 +215,6 @@
         onActivated: {
             const selectedItem = model[currentIndex]
 
-            // only send  AdjustParametersConfirmRequestData::eCancel when validated
-            // Telling FW user is canceling confirm treatment parameters
-            if ( vTreatmentCreate.parametersValidated ) { vTreatmentCreate.doCancel() }
-
             if      ( selectedItem === _root.editRx     )   { /*All parameters set to edit if parameters are validated */   }
             else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager")      }
             else if ( selectedItem === _root.clearAll   )   { _root.clear()                                                 }