Index: APPS/TBXWeb/KlantVoorkeuren/impl/EconExporter.cls.xml
===================================================================
diff -u -r834 -r838
--- APPS/TBXWeb/KlantVoorkeuren/impl/EconExporter.cls.xml	(.../EconExporter.cls.xml)	(revision 834)
+++ APPS/TBXWeb/KlantVoorkeuren/impl/EconExporter.cls.xml	(.../EconExporter.cls.xml)	(revision 838)
@@ -8,79 +8,101 @@
 
 <Method name="ExportKlantDefaults">
 <Implementation><![CDATA[
+	Set TBXHandel = "VHEPN"
+	Set KlantNr = ""
+	For {	Set KlantNr = $O($$$GlobalKLData("DFL",TBXHandel,KlantNr)) Quit:(KlantNr="")
+       set SqlStatement = ..GenerateSqlStatement(KlantNr)
+       if $length(SqlStatement) w !,SqlStatement
+    }
+]]></Implementation>
+</Method>
+
+<Method name="GenerateSqlStatement">
+<FormalSpec>KlantNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
 	Set DCM = "A"
 	Set DC = "A"
 	Set TBXHandel = "VHEPN"
 	
-	Set KlantNummer = ""
-	For {	Set KlantNummer = $O($$$GlobalKLData("DFL",TBXHandel,KlantNummer)) Quit:(KlantNummer="")
-       if $data($$$GlobalKLData("DFL",TBXHandel,KlantNummer,"MTN","*",DC,"*")) {
-       		Set pdlMaten=$$$GlobalKLData("DFL",TBXHandel,KlantNummer,"MTN","*",DC,"*")
+	set SqlStatement = ""
+	if $data($$$GlobalKLData("DFL",TBXHandel,KlantNr,"MTN","*",DC,"*")) {
+    	Set pdlMaten=$$$GlobalKLData("DFL",TBXHandel,KlantNr,"MTN","*",DC,"*")
        
-       		Set tmpAr("FrontBevestiging") = $P(pdlMaten,"\",3) ; indien waarde = "NM", dan betekent dit "NietMeeleveren-FrontBevestiging", dus omzetten naar een default "NietMee"-item (=piece 7 hieronder) 
-       		Set tmpAr("GeleiderTechnologie") = $P(pdlMaten,"\",4)
-       		Set tmpAr("Wanddikte") = $P(pdlMaten,"\",5) ; indien > 0 dan IsBinnenbreedte = false defaulten! 
-       		Set tmpAr("Verpakking") = $P(pdlMaten,"\",6) ; bvb. Procom met/zonder onderdelen 
-       		Set tmpAr("NietMeeleveren") = $P(pdlMaten,"\",7) ; Contains NMCP;NMAK;NMRL;NMBS; ... 
-      	 	Set tmpAr("AntislipmatKleur") = $P(pdlMaten,"\",8) ; indien "AF.xx" dan Materiaal = AgoFiber, anders "AGO" 
+    	Set tmpAr("FrontBevestiging") = $P(pdlMaten,"\",3) ; indien waarde = "NM", dan betekent dit "NietMeeleveren-FrontBevestiging", dus omzetten naar een default "NietMee"-item (=piece 7 hieronder) 
+    	Set tmpAr("GeleiderTechnologie") = $P(pdlMaten,"\",4)
+      	Set tmpAr("Wanddikte") = $P(pdlMaten,"\",5) ; indien > 0 dan IsBinnenbreedte = false defaulten! 
+       	Set tmpAr("Verpakking") = $P(pdlMaten,"\",6) ; bvb. Procom met/zonder onderdelen 
+       	Set tmpAr("NietMeeleveren") = $P(pdlMaten,"\",7) ; Contains NMCP;NMAK;NMRL;NMBS; ... 
+      	Set tmpAr("AntislipmatKleur") = $P(pdlMaten,"\",8) ; indien "AF.xx" dan Materiaal = AgoFiber, anders "AGO" 
 	       	
-	       	Do ..GenerateSql(KlantNummer,.tmpAr)
+	    set SqlStatement = ..GenerateSql(KlantNr,.tmpAr)
        }
-    }
+       
+   quit SqlStatement
 ]]></Implementation>
 </Method>
 
 <Method name="GenerateSql">
 <FormalSpec><![CDATA[KlantNr:%String,&md:%String]]></FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	write !,"BEGIN TRANSACTION"
-    write !," DECLARE @id uniqueidentifier = NEWID();"
-    write !," DECLARE @type int = 3;"
-    write !," DECLARE @version nvarchar(50) = '';"
-    write !," DECLARE @modelname nvarchar(50) = 'TBX/TBX Configurator';"
-    write !," DECLARE @modelversion nvarchar = '1.0.0';"
-    write !," DECLARE @created datetime = GETDATE();"
+	set Sql = "BEGIN TRANSACTION" _ $$$CRLF
+	
+    _" DECLARE @id uniqueidentifier = NEWID();" _ $$$CRLF
+    _" DECLARE @type int = 3;" _ $$$CRLF
+    _" DECLARE @version nvarchar(50) = '';" _ $$$CRLF
+    _" DECLARE @modelname nvarchar(50) = 'TBX/TBX Configurator';" _ $$$CRLF 
+    _" DECLARE @modelversion nvarchar = '1.0.0';" _ $$$CRLF
+    _" DECLARE @created datetime = GETDATE();" _ $$$CRLF
 
-    write !," INSERT INTO [econsql].[eCon].[Configurations] ([id], [type], [name], [version], [modelname], [modelversion], [created]) VALUES (@id, @type, '"_KlantNr_"', @version, @modelname, @modelversion, @created);"
+    _" INSERT INTO [econsql].[eCon].[Configurations] ([id], [type], [name], [version], [modelname], [modelversion], [created]) VALUES (@id, @type, 'TBX_"_KlantNr_"', @version, @modelname, @modelversion, @created);" _ $$$CRLF
     
-    do:$data(md("GeleiderTechnologie"))&&$length(md("GeleiderTechnologie")) ..WriteInsert("Geleidertechnologie",$Select(md("GeleiderTechnologie") = "I" : "B", 1:md("GeleiderTechnologie")))
-	do:$data(md("Wanddikte"))&&$length(md("Wanddikte")) ..ConvertWanddikte(.md)
-	do:$data(md("Verpakking"))&&$length(md("Verpakking")) ..WriteInsert("Verpakking",$Case(md("Verpakking"), "P":"Pallet",  "X":"Probox", "S":"V1","O":"Procom","C":"Procom","A":"VHoss","B":"VHoss", :"V1"))
-	do:$data(md("NietMeeleveren"))&&$length(md("NietMeeleveren")) ..ConvertNietMeeleveren(.md)
-	do:$data(md("AntislipmatKleur"))&&$length(md("AntislipmatKleur")) ..ConvertAntislipmatKleur(.md)
+    set:$data(md("GeleiderTechnologie"))&&$length(md("GeleiderTechnologie")) Sql = Sql _ ..WriteInsert("Geleidertechnologie",$Select(md("GeleiderTechnologie") = "I" : "B", 1:md("GeleiderTechnologie")))
+	set:$data(md("Wanddikte"))&&$length(md("Wanddikte")) Sql = Sql _ ..ConvertWanddikte(.md)
+	set:$data(md("Verpakking"))&&$length(md("Verpakking")) Sql = Sql _ ..WriteInsert("Verpakking",$Case(md("Verpakking"), "P":"Pallet",  "X":"Probox", "S":"V1","O":"Procom","C":"Procom","A":"VHoss","B":"VHoss", :"V1")) _ $$$CRLF
+	set:$data(md("NietMeeleveren"))&&$length(md("NietMeeleveren")) Sql = Sql _ ..ConvertNietMeeleveren(.md)
+	set:$data(md("AntislipmatKleur"))&&$length(md("AntislipmatKleur")) Sql = Sql _ ..ConvertAntislipmatKleur(.md)
 	
-	write !,"COMMIT"
-	write !
+	set Sql = Sql _"COMMIT"_$$$CRLF
+	
+	Quit Sql
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertAntislipmatKleur">
 <FormalSpec><![CDATA[&md:%String]]></FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	quit:md("AntislipmatKleur")=""
-	quit:md("AntislipmatKleur")="0"
+	set Sql = ""
 	
+	quit:md("AntislipmatKleur")="" ""
+	quit:md("AntislipmatKleur")="0" ""
+	
 	If md("AntislipmatKleur") = "Z" {
-		do ..WriteInsert("Matantislipkleur","S")
-		do ..WriteInsert("Matantislipmateriaal","AS")
+		set Sql = Sql _ ..WriteInsert("Matantislipkleur","S")
+		set Sql = Sql _ ..WriteInsert("Matantislipmateriaal","AS")
 	} ElseIf md("AntislipmatKleur") = "ZW.AF" {
-		do ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart()) 
-		do ..WriteInsert("Matantislipmateriaal","AF")
+		set Sql = Sql _ ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart()) 
+		set Sql = Sql _ ..WriteInsert("Matantislipmateriaal","AF")
 	} ElseIf md("AntislipmatKleur") = "WI.AF" {
-		do ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit()) 
-		do ..WriteInsert("Matantislipmateriaal","AF")
+		set Sql = Sql _ ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit()) 
+		set Sql = Sql _ ..WriteInsert("Matantislipmateriaal","AF")
 	} ElseIf md("AntislipmatKleur") = "AN.AF" {
-		do ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet())
-		do ..WriteInsert("Matantislipmateriaal","AF")
+		set Sql = Sql _ ..WriteInsert("Matantislipfiberkleur",##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet())
+		set Sql = Sql _ ..WriteInsert("Matantislipmateriaal","AF")
 	} ElseIf md("AntislipmatKleur") = "G" {
-		do ..WriteInsert("Matantislipkleur","ANTR") 
-		do ..WriteInsert("Matantislipmateriaal","AS")
+		set Sql = Sql _ ..WriteInsert("Matantislipkleur","ANTR") 
+		set Sql = Sql _ ..WriteInsert("Matantislipmateriaal","AS")
 	}
+	
+	Quit Sql
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertNietMeeleveren">
 <FormalSpec><![CDATA[&md:%String]]></FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set NietMeeleverenIterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).PiecesToList(##class(TECH.StringUtils).Sort(md("NietMeeleveren")),";"))
 
@@ -89,13 +111,15 @@
 		Do NietMeeleveren.Insert(NietMeeleverenIterator.Next())
 	}
 	
-	Do ..WriteNietMeeleveren(NietMeeleveren)
+	Quit ..WriteNietMeeleveren(NietMeeleveren)
 ]]></Implementation>
 </Method>
 
 <Method name="WriteNietMeeleveren">
 <FormalSpec>NietMeeleveren:%ListOfDataTypes</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	set Sql = ""
 	
 	#define If(%statement,%true,%false)		$select(%statement:%true,1:%false)
 
@@ -113,26 +137,32 @@
 	
 	set Id=""
 	for  { set Id=$order(ar(Id)) quit:Id=""
-		do ..WriteInsert("NietMeeleveren_NietMeeleveren."_Id,ar(Id))	
+		set Sql = Sql _ ..WriteInsert("NietMeeleveren_NietMeeleveren."_Id,ar(Id))_ $$$CRLF	
 	}
+	
+	quit Sql
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertWanddikte">
 <FormalSpec><![CDATA[&md:%String]]></FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	set Sql = ""
 	if md("Wanddikte")="B" {
-		do ..WriteInsert("Isbinnenmaat","true")
+		Set Sql = Sql _ ..WriteInsert("Isbinnenmaat","true")_ $$$CRLF
 	} else {
-		do ..WriteInsert("Wanddikte",md("Wanddikte"))
+		Set Sql = Sql _ ..WriteInsert("Wanddikte",md("Wanddikte"))_ $$$CRLF
 	}
+	quit Sql
 ]]></Implementation>
 </Method>
 
 <Method name="WriteInsert">
 <FormalSpec>Property:%String,Value:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	write !," INSERT INTO [econsql].[eCon].[ConfigAnalyseProperties] ([configid], [propertyname], [arrayname], [shortname], [value], [created]) VALUES (@id, 'Data."_Property_"', 'Data."_Property_"', '"_Property_"', '"_Value_"', @created);"
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit " INSERT INTO [econsql].[eCon].[ConfigAnalyseProperties] ([configid], [propertyname], [arrayname], [shortname], [value], [created]) VALUES (@id, 'Data."_Property_"', 'Data."_Property_"', '"_Property_"', '"_Value_"', @created);"
 ]]></Implementation>
 </Method>
 
@@ -144,11 +174,11 @@
     Set Design = $P(pdlMaten,"\",2)
     If $$$Not(##class(TECH.StringUtils).Equals(Design,"GA","WA","ZA","IA")) {
     	Set Design = ""
-    }	ElseIf $$$Not($Data($$$GlobalKLData("DFL",TBXHandel,KlantNummer,"KLR",DCM,"*",Design))) {
+    }	ElseIf $$$Not($Data($$$GlobalKLData("DFL",TBXHandel,KlantNr,"KLR",DCM,"*",Design))) {
         Set Design = ""
     }
     If Design = "" {
-        Set Design = $O($$$GlobalKLData("DFL",TBXHandel,KlantNummer,"KLR",DCM,"*",Design))
+        Set Design = $O($$$GlobalKLData("DFL",TBXHandel,KlantNr,"KLR",DCM,"*",Design))
     }
 
     Quit Design