Index: AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml
===================================================================
diff -u -r43314 -r43366
--- AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml	(.../ProductConvertor.cls.xml)	(revision 43314)
+++ AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml	(.../ProductConvertor.cls.xml)	(revision 43366)
@@ -22,6 +22,7 @@
 d ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).test()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
+	#dim PRNr As %String
 	set PRNr=6945 ; E24
 	Do ..%New().testone(PRNr)
 	set PRNr=111800 ; DKG
@@ -49,9 +50,52 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefSOPRIterator">
+<FormalSpec>PRNr:%Integer</FormalSpec>
+<ReturnType>TECH.ListbuildIterator</ReturnType>
+<Implementation><![CDATA[
+	#dim lbBLIDs As TECH.ListOfObjects
+	Set lbBLIDs=..GetVHProds(PRNr)
+	Quit ##class(TECH.ListbuildIterator).%New(lbBLIDs)
+]]></Implementation>
+</Method>
+
+<Method name="GeefVervangProductDoorSOPRInAX">
+<FormalSpec>PRNr:%Integer</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim lbBLIDs As %List = ..GetVHProds(PRNr)
+	Quit $$$If($ListLength(lbBLIDs)>0,$list(lbBLIDs),"")
+]]></Implementation>
+</Method>
+
+<Method name="AdminNaarAx">
+<FormalSpec>PRNr:%String</FormalSpec>
+<ReturnType>AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct</ReturnType>
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct).%New()
+	Set AxProduct.IsSoprInCache = ..IsSOPRInCache(PRNr)
+	Set AxProduct.IsSoprInAx = ..IsSOPRInAX(PRNr)
+	
+	If ((AxProduct.IsSoprInAx = 1) && (AxProduct.IsSoprInCache = 1) || (AxProduct.IsSoprInAx = 0) && (AxProduct.IsSoprInCache = 0)){
+		Set AxProduct.BlumKunde = ..GeefBlumKunde(PRNr)
+		Set AxProduct.AxLeverancier = ..BlumKundeConvertor.AdminNaarAx(AxProduct.BlumKunde)
+	} Else {
+		Set AxProduct.VervangSoprPRNr = ..GeefVervangProductDoorSOPRInAX(PRNr)
+		Set AxProduct.HeeftVervangSoprPRNr = (PRNr '= AxProduct.VervangSoprPRNr)
+		Set AxProduct.BlumKunde = ..GeefBlumKunde(PRNr)
+		Set AxProduct.AxLeverancier = ..BlumKundeConvertor.AdminNaarAx(AxProduct.BlumKunde)
+	}
+	
+	Quit AxProduct
+]]></Implementation>
+</Method>
+
 <Method name="testone">
 <FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
+	#dim it As TECH.Iterator
    w !,PRNr," ",$$$PRGet($$$KortTekst)," ",$$$PRGet($$$IdentNummer),!
 	w "  IsSOPRInCache : ",..IsSOPRInCache(PRNr),!
 	w "  IsSOPRInAX : ",..IsSOPRInAX(PRNr),!
@@ -60,6 +104,7 @@
 	S it=..GeefSOPRIterator(PRNr)
 	While it.HasNext()
 	{
+		#dim SOPRPRNr As %String
 		Set SOPRPRNr=it.Next()
 		Write "    ",SOPRPRNr," ",$$$ProductGet(SOPRPRNr,$$$KortTekst)," ",..GeefBlumKunde(SOPRPRNr),!
 	}
@@ -68,7 +113,10 @@
 
 <Method name="IsSOPRInCache">
 <FormalSpec>PRNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim lbBLIDs As TECH.ListOfObjects
 	Set lbBLIDs=..GetVHProds(PRNr)
 	Quit $LL(lbBLIDs)>1
 ]]></Implementation>
@@ -79,23 +127,22 @@
 Alleen het product waarvan het identnummer begin met een 0 is geschikt als SOPR in AX
 De test neemt alleen de eerste uit de lijst omdat SOMS "K" producten op hun eentje bestaan zonder een product met identnr beginnend met 0</Description>
 <FormalSpec>PRNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim lbBLIDs As TECH.ListOfObjects
 	Set lbBLIDs=..GetVHProds(PRNr)
 	Quit ($LL(lbBLIDs)>1)&&($LI(lbBLIDs)=PRNr)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSOPRIterator">
-<FormalSpec>PRNr:%Integer</FormalSpec>
-<Implementation><![CDATA[
-	Set lbBLIDs=..GetVHProds(PRNr)
-	Quit ##class(TECH.ListbuildIterator).%New(lbBLIDs)
-]]></Implementation>
-</Method>
-
 <Method name="GeefBlumKunde">
 <FormalSpec>PRNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim VHKLNr As %String
+	#dim BLKLNr As %String
  	Set VHKLNr=$O(^PRPUTZ("N",PRNr,""))
  	If VHKLNr=""
  	{
@@ -109,51 +156,25 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVervangProductDoorSOPRInAX">
-<FormalSpec>PRNr:%Integer</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim lbBLIDs As %List = ..GetVHProds(PRNr)
-	Quit $$$If($ListLength(lbBLIDs)>0,$list(lbBLIDs),"")
-]]></Implementation>
-</Method>
-
 <Method name="GetVHProds">
 <FormalSpec>PRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
- Quit:$E($$$PRGet($$$IdentNummer))="6" ""
- Set BLID=$$GetBlumID^BLPROD(PRNr)
- Set lbPRNrs=""
- For BI=0,1,2,3,4,5,7,8 DO  IF BI=8 FOR CH=65:1:90 Do  ; [IDENT] JCL ; UGLY 0..8 & A..Z
- . If $G(CH)>64 Set BI=$char(CH) 
- . Set IdentNr=BI_$S($L(BLID)=8:$E(BLID,2,8),1:BLID)_" "
- . Quit:'$D(^KPR2(IdentNr))
- . Set lbPRNrs=lbPRNrs_$LB(+^(IdentNr))
- Quit lbPRNrs
-]]></Implementation>
-</Method>
-
-<Method name="AdminNaarAx">
-<FormalSpec>PRNr:%String</FormalSpec>
-<ReturnType>AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct</ReturnType>
-<Implementation><![CDATA[
-	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct).%New()
-	Set AxProduct.IsSoprInCache = ..IsSOPRInCache(PRNr)
-	Set AxProduct.IsSoprInAx = ..IsSOPRInAX(PRNr)
 	
-	If ((AxProduct.IsSoprInAx = 1) && (AxProduct.IsSoprInCache = 1) || (AxProduct.IsSoprInAx = 0) && (AxProduct.IsSoprInCache = 0)){
-		Set AxProduct.BlumKunde = ..GeefBlumKunde(PRNr)
-		Set AxProduct.AxLeverancier = ..BlumKundeConvertor.AdminNaarAx(AxProduct.BlumKunde)
-	} Else {
-		Set AxProduct.VervangSoprPRNr = ..GeefVervangProductDoorSOPRInAX(PRNr)
-		Set AxProduct.HeeftVervangSoprPRNr = (PRNr '= AxProduct.VervangSoprPRNr)
-		Set AxProduct.BlumKunde = ..GeefBlumKunde(PRNr)
-		Set AxProduct.AxLeverancier = ..BlumKundeConvertor.AdminNaarAx(AxProduct.BlumKunde)
-	}
-	
-	Quit AxProduct
+	 #dim BLID,IdentNr As %String
+	 #dim lbPRNrs As TECH.ListOfObjects
+	 #dim BI,CH As %Integer
+
+	 Quit:$E($$$PRGet($$$IdentNummer))="6" ""
+	 Set BLID=$$GetBlumID^BLPROD(PRNr)
+	 Set lbPRNrs=""
+	 For BI=0,1,2,3,4,5,7,8 DO  IF BI=8 FOR CH=65:1:90 Do  ; [IDENT] JCL ; UGLY 0..8 & A..Z
+	 . If $G(CH)>64 Set BI=$char(CH) 
+	 . Set IdentNr=BI_$S($L(BLID)=8:$E(BLID,2,8),1:BLID)_" "
+	 . Quit:'$D(^KPR2(IdentNr))
+	 . Set lbPRNrs=lbPRNrs_$LB(+^(IdentNr))
+	 Quit lbPRNrs
 ]]></Implementation>
 </Method>
 </Class>