Index: CHUI/Flow/ConfiguratorHelper.cls.xml
===================================================================
diff -u -r2150 -r2151
--- CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 2150)
+++ CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 2151)
@@ -55,22 +55,25 @@
 
 <Method name="StartConfiguratorMet">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Parameters:APPS.VKP.Maatwerk.impl.ConfiguratorParameters</FormalSpec>
+<FormalSpec>Parameters:APPS.VKP.Maatwerk.impl.AdminSessieParameters</FormalSpec>
 <Implementation><![CDATA[
-	Do STORE^vhTERMINA()
-	Set FP=1801
-	Write @F,@F1
-	Set FP=2007
-	Write @F,"TOOLS\SHELLEXECUTE"
-	Set FP=2101
-	Write @F
-	Write "iexplore.exe" // nog te vervangen door de gui call
-	Set FP=2201
-	Write @F
-	Write Parameters.%Id()
-	Set FP=2001
-	Write @F,"VBA:\\"
-	Do REFRESH^vhTERMINA()
+	If ('Parameters.IsSessieGeannuleerd())
+	{
+		Do STORE^vhTERMINA()
+		Set FP=1801
+		Write @F,@F1
+		Set FP=2007
+		Write @F,"TOOLS\SHELLEXECUTE"
+		Set FP=2101
+		Write @F
+		Write "iexplore.exe" // nog te vervangen door de gui call
+		Set FP=2201
+		Write @F
+		Write Parameters.%Id()
+		Set FP=2001
+		Write @F,"VBA:\\"
+		Do REFRESH^vhTERMINA()
+	}
 ]]></Implementation>
 </Method>
 
@@ -83,8 +86,7 @@
 	Set Puntjes = ""
 	Do STORE^vhTERMINA()
 	Set ConfiguratorService = ##class(APPS.VKP.Maatwerk.ConfiguratorService).%New() 
-	Do DISPONLY^vhTXTPOP("Invoeren van product met configurator    ","Bezig met ...",1)
-	Set BesteldeProducten = ""
+	Set BesteldeProducten = ConfiguratorService.GeefBesteldeProducten(DocumentType,DocumentID)
 	While (BesteldeProducten = "")
 	{
 		r *Key:1