Index: AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml
===================================================================
diff -u -r43325 -r43389
--- AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43325)
+++ AX/Uitgaand/VKP/ArtikelLijst/impl/ArtikelLijstGeneratorRefactored.cls.xml	(.../ArtikelLijstGeneratorRefactored.cls.xml)	(revision 43389)
@@ -36,27 +36,37 @@
 <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="KlantID">
 <Description>
 Property AssortimentGroep As %String;</Description>
 <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="arVervangProd">
 <Type>%String</Type>
 <MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -69,6 +79,7 @@
 	Set ..RegelFileWriter = $$$Implementation(RegelFileWriter, ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter())
 	Set:..GenerationId="" ..GenerationId=##class(AX.Uitgaand.EC.Klanten.impl.Klanten).LaatsteGenerationID()
 	Set ..SoprConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..Utils = ##class(AXimpl.AdminToAxUtils).%New()
 	
 	Set ..CounterTableID=1000
 	Quit $$$OK
@@ -77,6 +88,7 @@
 
 <Method name="ExportAll">
 <Implementation><![CDATA[
+	#dim KlantCount As %Integer
 	Set ..HoofdingStream = ##class(%Library.GlobalCharacterStream).%New()
 	Set ..RegelStream = ##class(%Library.GlobalCharacterStream).%New()
 	Do ..MaakHeaders()
@@ -109,7 +121,8 @@
 <Method name="ExportOne">
 <Private>1</Private>
 <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)
 
 	Do ..ClearTableID()
@@ -138,24 +151,28 @@
 <FormalSpec>PRNr:%String,HistRec:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim IdentNr As %String
 	Set IdentNr=$$$PRGet($$$IdentNummer)
 	Do ..RegelStream.WriteLine("AllBlank"_";"_IdentNr_";"_..GeefTableID()_";"_1_";"_"STK"_";")
 ]]></Implementation>
 </Method>
 
 <Method name="ToevoegenHoofding">
 <Private>1</Private>
-<Implementation><![CDATA[	Do ..HoofdingStream.WriteLine(..GeefKlantIDInAXFormaat()_";"_"Verkoopanalyse"_";"_..GeefTableID())
+<Implementation><![CDATA[	Do ..HoofdingStream.WriteLine(..GeefKlantNummerInAXFormaat()_";"_"Verkoopanalyse"_";"_..GeefTableID())
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKlantIDInAXFormaat">
-<Implementation><![CDATA[	Quit $E(..KlantID+100000,2,6)
+<Method name="GeefKlantNummerInAXFormaat">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Utils.ConvertCustomerID(..KlantID)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTableID">
 <Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ..CurrentTableID="" 
 	{
@@ -191,7 +208,10 @@
 
 <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
 	
@@ -202,6 +222,7 @@
 </Method>
 
 <Method name="ClearSOPR">
+<Private>1</Private>
 <Implementation><![CDATA[	Kill ..arVervangProd
 ]]></Implementation>
 </Method>