Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -rcc7aae88f15228ff37b840946818692e444718bf -r0dfba44fb7172b9458d161b3ed5f54527f93b698
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 0dfba44fb7172b9458d161b3ed5f54527f93b698)
@@ -46,7 +46,6 @@
     // Standby / Disinfection
     DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
-    PreTreatmentCreateStack         { id: _preTreatmentCreateStack          }
     PreTreatmentStack               { id: _preTreatmentStack                }
     // In TreatmentStack
     TreatmentStack                  { id: _treatmentStack                   }
@@ -56,6 +55,7 @@
     EndTreatmentRecirculateStack    { id: _endTreatmentRecirculateStack     }
     EndTreatmentEndStack            { id: _endTreatmentEndStack             }
 
+
     // Post Treatment
     PostTreatmentStack              { id: _postTreatmentStack               }
 
@@ -134,12 +134,11 @@
         }
 
         function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
-        function onStandbyChanged               ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentCreateStack.clear(vValue)        }
+        function onStandbyChanged               ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentStack.clear(vValue)        }
         function onStandbyStartChanged          ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyWaitTreatmentChanged  ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel  = false             }
         function onStandbyWaitDisinfectChanged  ( vValue ) { page( _disinfectStack                  , vValue    )}
 
-        function onValidateParametersChanged    ( vValue ) { page( _preTreatmentCreateStack         , vValue    )}
         function onPreTreatmentChanged          ( vValue ) { page( _preTreatmentStack               , vValue    )}
         function onInTreatmentChanged           ( vValue ) { page( _treatmentStack                  , vValue    )}
         function onPostTreatmentChanged         ( vValue ) { page( _postTreatmentStack              , vValue    )}
@@ -159,7 +158,6 @@
 
         function onTxRinsebackChanged           ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
         function onTxRecirculateChanged         ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
-        function onTxEndChanged                 ( vValue ) { page( _endTreatmentEndStack            , vValue    )}
 
         // Treatment Stop
         function onTxStopChanged                ( vValue ) { page( _treatmentStack                  , vValue    )}
@@ -174,4 +172,11 @@
             _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText
         }
     }
+
+    Connections { target: _endTreatmentDialog
+        // End Treatment -> proceed to rinceback
+        function onAccepted () {
+            vTreatmentAdjustmentEnd.doAdjustment ()
+        }
+    }
 }