Index: AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml
===================================================================
diff -u -r43412 -r43420
--- AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43412)
+++ AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43420)
@@ -46,7 +46,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="KlantID">
+<Property name="KlantNummer">
 <Description>
 Property AssortimentGroep As %String;</Description>
 <Type>%String</Type>
@@ -93,9 +93,9 @@
 	Set ..RegelStream = ##class(%Library.GlobalCharacterStream).%New()
 	Do ..MaakHeaders()
 	
-	Set ..KlantID=0
+	Set ..KlantNummer=0
 	Set KlantCount=0
-	For  Set ..KlantID=$O(^KKAAP(..KlantID)) Quit:..KlantID=""  Do  ;Quit:KlantCount>3
+	For  Set ..KlantNummer=$O(^KKAAP(..KlantNummer)) Quit:..KlantNummer=""  Do  ;Quit:KlantCount>3
 	. Quit:'..CheckKlant()
 	. Do ..ExportOne()
 	. Set KlantCount=KlantCount+1
@@ -123,21 +123,21 @@
 <Implementation><![CDATA[
 	#dim Groep,HistRec,HoofdGroep,KortText,PRNr,SubGroep As %String
 	#dim LijnCnt As %Integer
-	Set ..ProductValidator=##class(AX.Uitgaand.EC.Data.impl.ProductValidator).%New(..KlantID,..GenerationId)
+	Set ..ProductValidator=##class(AX.Uitgaand.EC.Data.impl.ProductValidator).%New(..KlantNummer,..GenerationId)
 
 	Do ..ClearTableID()
 	Do ..ClearSOPR()
 	
  	Set HoofdGroep=0
  	Set LijnCnt=0
- 	For  Set HoofdGroep=$O(^KKAAP(..KlantID,HoofdGroep)) Quit:HoofdGroep=""  Do
+ 	For  Set HoofdGroep=$O(^KKAAP(..KlantNummer,HoofdGroep)) Quit:HoofdGroep=""  Do
 	. Set Groep=""
-	. For  Set Groep=$O(^KKAAP(..KlantID,HoofdGroep,Groep)) Quit:Groep=""  Do
+	. For  Set Groep=$O(^KKAAP(..KlantNummer,HoofdGroep,Groep)) Quit:Groep=""  Do
 	. . Set SubGroep=""
-	. . For  Set SubGroep=$O(^KKAAP(..KlantID,HoofdGroep,Groep,SubGroep)) Quit:SubGroep=""  Do
+	. . For  Set SubGroep=$O(^KKAAP(..KlantNummer,HoofdGroep,Groep,SubGroep)) Quit:SubGroep=""  Do
 	. . . Set KortText=""
-	. . . For  Set KortText=$O(^KKAAP(..KlantID,HoofdGroep,Groep,SubGroep,KortText)) Quit:KortText=""  Do
-	. . . . Set HistRec=^KKAAP(..KlantID,HoofdGroep,Groep,SubGroep,KortText)
+	. . . For  Set KortText=$O(^KKAAP(..KlantNummer,HoofdGroep,Groep,SubGroep,KortText)) Quit:KortText=""  Do
+	. . . . Set HistRec=^KKAAP(..KlantNummer,HoofdGroep,Groep,SubGroep,KortText)
 	. . . . Set PRNr=$P(HistRec,"\",15)
 	. . . . Quit:'..CheckProduct(PRNr)
 	. . . . Set PRNr=..VervangIndienSOPR(PRNr)
@@ -166,7 +166,7 @@
 <Method name="GeefKlantNummerInAXFormaat">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Utils.ConvertCustomerNumber(..KlantID)
+<Implementation><![CDATA[	Quit ..Utils.ConvertCustomerNumber(..KlantNummer)
 ]]></Implementation>
 </Method>
 
@@ -192,7 +192,7 @@
 <Method name="CheckKlant">
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AX.Uitgaand.EC.Klanten.impl.Klanten).%ExistsId(..GenerationId_"||"_..KlantID)
+<Implementation><![CDATA[	Quit ##class(AX.Uitgaand.EC.Klanten.impl.Klanten).%ExistsId(..GenerationId_"||"_..KlantNummer)
 ]]></Implementation>
 </Method>
 
Index: AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml
===================================================================
diff -u -r43343 -r43420
--- AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml	(.../KlantenAssortimentGeneratorRefactored.cls.xml)	(revision 43343)
+++ AX/Uitgaand/PM/Assortimenten/impl/KlantenAssortimentGeneratorRefactored.cls.xml	(.../KlantenAssortimentGeneratorRefactored.cls.xml)	(revision 43420)
@@ -13,6 +13,7 @@
 
 <Property name="CategorieBepaler">
 <Type>AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="DynIterator">
@@ -40,48 +41,63 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Utils">
+<Type>AXimpl.AdminToAxUtils</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="GenerationID">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="KLNaam">
 <Description>
-Property AssortimentGroep As %String;</Description>
+Property AssortimentGroep As %String [ private ];</Description>
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="KLNr">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="DeviceProducten">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="DeviceKlanten">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="CurrentTableID">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="CounterTableID">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="AssortimentGroep">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="arGroep">
 <Type>%String</Type>
 <MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
 </Property>
 
 <Property name="arVervangProd">
 <Type>%String</Type>
 <MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -95,13 +111,15 @@
 	Set ..GenerationID=##class(AX.Uitgaand.EC.Klanten.impl.Klanten).LaatsteGenerationID()
 	Set ..SoprConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
  	Set ..CategorieBepaler=##class(AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler).%New()
+ 	Set ..Utils = ##class(AXimpl.AdminToAxUtils).%New()
  	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ExportAll">
 <Implementation><![CDATA[
+	#dim itKlant As TECH.Iterator
 	Set ..HoofdingStream = ##class(%Library.GlobalCharacterStream).%New()
 	Set ..RegelStream = ##class(%Library.GlobalCharacterStream).%New()
 	Do ..MaakHeaders()
@@ -126,6 +144,7 @@
 </Method>
 
 <Method name="ExportKlant">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Do ..BepaalAssortimentGroep()
 	;w ..KLNr," ",..AssortimentGroep,!
@@ -139,7 +158,7 @@
 </Method>
 
 <Method name="BepaalAssortimentGroep">
-<ReturnType>%String</ReturnType>
+<Private>1</Private>
 <Implementation><![CDATA[
 	If ..KLNr=$$$KlantDKGDeKeukenfabriek {
 		Set ..AssortimentGroep="DKG"
@@ -157,26 +176,30 @@
 </Method>
 
 <Method name="HeeftUitzonderingen">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
+	#dim it As TECH.Iterator
 	Set it=..GeefUitzonderingIterator()
 	Quit it.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefUitzonderingIterator">
 <FormalSpec>KLNr:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set rs=##class(TECH.ResultSet).%New()
 	Do rs.Prepare("Select Product ,Excluded from AX_Uitgaand_EC_Assortiment_impl.KlantAssortiment where Klant=? and GenerationID=? and isnull(Excluded,0)=0")
-	
- 	Set sc=rs.Execute(..KLNr,..GenerationID)
+ 	Do rs.Execute(..KLNr,..GenerationID)
 	Set it=##class(TECH.ResultSetIterator).%New(rs)
 	Quit it
 ]]></Implementation>
 </Method>
 
 <Method name="KlantIterator">
+<Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set rs =##class(TECH.ResultSet).%New()
@@ -201,7 +224,7 @@
 <Implementation><![CDATA[
 	Do ..ClearTableID()
 	Do ..ClearAssortimentGroep()
-	Do ..HoofdingStream.WriteLine(..GeefTableID()_";"_..GeefKlantIDInAXFormaat()_";"_"assortiment voor "_..GeefKlantIDInAXFormaat()_" "_..KLNaam)
+	Do ..HoofdingStream.WriteLine(..GeefTableID()_";"_..GeefKlantNummerInAXFormaat()_";"_"assortiment voor "_..GeefKlantNummerInAXFormaat()_" "_..KLNaam)
 ]]></Implementation>
 </Method>
 
@@ -236,6 +259,7 @@
 
 <Method name="ToevoegenAssortimentGroep">
 <FormalSpec>AssortimentGroep:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Do ..OnthoudenAssortimentGroep(AssortimentGroep)
 	// Onder voorbehoud staat volgende regel in comment. Zal ten gepaste tijde nodig zijn!
@@ -246,6 +270,10 @@
 <Method name="ExportUitzonderingen">
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim it As TECH.Iterator
+	#dim PRNr As %String
+	#dim rs As TECH.ResultSet
+	
 	Do ..ClearSOPR()
 	Set it=..GeefUitzonderingIterator()
 	While it.HasNext()
@@ -266,8 +294,13 @@
 
 <Method name="IsGeldigUitzonderingsProduct">
 <FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim AssortimentGroep As %String
+	
 	Set AssortimentGroep=..CategorieBepaler.GeefAssortiment(PRNr)
+	
 	Quit '..IsOnthoudenAssortimentGroep(AssortimentGroep)
 ]]></Implementation>
 </Method>
@@ -276,37 +309,46 @@
 <FormalSpec>PRNr:%String,Excluded:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim IdentNr As %String
+	
 	Set IdentNr=$$$PRGet($$$IdentNummer)
 	Do ..RegelStream.WriteLine(..GeefTableID()_";"_IdentNr) //Was niet nodig: _";"_$S(Excluded:"Niet opnemen",1:"Opnemen")_";"_PRNr
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKlantIDInAXFormaat">
+<Method name="GeefKlantNummerInAXFormaat">
 <Private>1</Private>
-<Implementation><![CDATA[	Quit $E(..KLNr+100000,2,6)
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Utils.ConvertCustomerNumber(..KLNr)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTableID">
 <Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ..CurrentTableID="" 
 	{
-		Set ..CurrentTableID="AS"_..GeefKlantIDInAXFormaat()_"a"
+		Set ..CurrentTableID="AS"_..GeefKlantNummerInAXFormaat()_"a"
 	}
 	Quit ..CurrentTableID
 ]]></Implementation>
 </Method>
 
 <Method name="ClearTableID">
 <Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Set ..CurrentTableID=""
 ]]></Implementation>
 </Method>
 
 <Method name="VervangIndienSOPR">
 <FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim VervangPRNr As %String
+	
 	Set VervangPRNr=..SoprConvertor.GeefVervangProductDoorSOPRInAX(PRNr)
 	Quit:(VervangPRNr="") PRNr
 	
@@ -317,23 +359,28 @@
 </Method>
 
 <Method name="ClearSOPR">
+<Private>1</Private>
 <Implementation><![CDATA[	Kill ..arVervangProd
 ]]></Implementation>
 </Method>
 
 <Method name="OnthoudenAssortimentGroep">
 <FormalSpec>Groep:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[	Set ..arGroep(Groep)=""
 ]]></Implementation>
 </Method>
 
 <Method name="IsOnthoudenAssortimentGroep">
 <FormalSpec>Groep:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ''$D(..arGroep(Groep))
 ]]></Implementation>
 </Method>
 
 <Method name="ClearAssortimentGroep">
+<Private>1</Private>
 <Implementation><![CDATA[	Kill ..arGroep
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/PM/Assortimenten/impl/ProductAssortimentGeneratorRefactored.cls.xml
===================================================================
diff -u -r43360 -r43420
--- AX/Uitgaand/PM/Assortimenten/impl/ProductAssortimentGeneratorRefactored.cls.xml	(.../ProductAssortimentGeneratorRefactored.cls.xml)	(revision 43360)
+++ AX/Uitgaand/PM/Assortimenten/impl/ProductAssortimentGeneratorRefactored.cls.xml	(.../ProductAssortimentGeneratorRefactored.cls.xml)	(revision 43420)
@@ -40,6 +40,10 @@
 
 <Method name="ExportAll">
 <Implementation><![CDATA[
+	#dim itProduct As TECH.Iterator
+	#dim PRNr As %String
+	#dim rs As TECH.ResultSet
+	
 	Do ..OpenFiles()
 	
 	Set itProduct=..ProductIterator()
@@ -53,12 +57,12 @@
 </Method>
 
 <Method name="ProductIterator">
+<Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set rs=##class(TECH.ResultSet).%New()
 	Do rs.Prepare("SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND (isnull(NonAktief,0) = 0 or NonAktief=2)")
-	
- 	Set sc=rs.Execute()
+ 	Do rs.Execute()
 	Set it=##class(TECH.ResultSetIterator).%New(rs)
 	Quit it
 ]]></Implementation>
@@ -97,6 +101,8 @@
 <FormalSpec>PRNr:%String,Excluded:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim AssortimentGroep,IdentNr As %£String
+	
 	Set IdentNr=$$$PRGet($$$IdentNummer)
 	Use ..DeviceProducten
 	Set AssortimentGroep=..CategorieBepaler.GeefAssortiment(PRNr)
@@ -106,7 +112,10 @@
 
 <Method name="VervangIndienSOPR">
 <FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
+	#dim VervangPRNr As %String
+	
 	Set VervangPRNr=..SoprConvertor.GeefVervangProductDoorSOPRInAX(PRNr)
 	Quit:(VervangPRNr="") PRNr
 	Quit:VervangPRNr'=PRNr ""