Index: AX/Uitgaand/PM/impl/Convertor/Sopr/BlumKunde.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/impl/Convertor/Sopr/BlumKunde.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/impl/Convertor/Sopr/BlumKunde.cls.xml	(revision 42588)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.impl.Convertor.Sopr.BlumKunde">
+<Description>
+Alle input en output is inclusief voorziene voorloopnullen.
+De defaults leeg en 05005 zijn nog onzeker, nog te onderzoeken</Description>
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="AdminNaarAx">
+<FormalSpec>BlumKunde:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:BlumKunde="044260" "08607"
+	Quit:BlumKunde="376683" "08608"
+	Quit:BlumKunde="300260" "08609"
+	Quit:BlumKunde="452250" "08610"
+	Quit:BlumKunde="332250" "08611"
+	Quit:BlumKunde="295250" "08612"
+	Quit:BlumKunde="485784" "08613"
+	Quit:BlumKunde="002250" "08614"
+	Quit:BlumKunde="285250" "08615"
+	Quit:BlumKunde="280250" "08616"
+	Quit:BlumKunde="286250" "08617"
+	Quit:BlumKunde="310250" "08618"
+	Quit:BlumKunde="823375" "08619"
+	Quit:BlumKunde="000250" "08620"
+	Quit:BlumKunde="336250" "08621"
+	Quit:BlumKunde="325250" "08622"
+	Quit:BlumKunde="099250" "08623"
+	Quit:BlumKunde="326250" "08624"
+	Quit:BlumKunde="335250" "08625"
+	Quit:BlumKunde="337250" "08626"
+	Quit:BlumKunde="811984" "08627"
+	Quit:BlumKunde="340250" "08628"
+	Quit:BlumKunde="212250" "08629"
+	Quit:BlumKunde="271250" "08630"
+	Quit "05005"
+]]></Implementation>
+</Method>
+
+<Method name="AxNaarAdmin">
+<FormalSpec>LeverancierNummer:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:LeverancierNummer="08607" "044260"
+	Quit:LeverancierNummer="08608" "376683"
+	Quit:LeverancierNummer="08609" "300260"
+	Quit:LeverancierNummer="08610" "452250"
+	Quit:LeverancierNummer="08611" "332250"
+	Quit:LeverancierNummer="08612" "295250"
+	Quit:LeverancierNummer="08613" "485784"
+	Quit:LeverancierNummer="08614" "002250"
+	Quit:LeverancierNummer="08615" "285250"
+	Quit:LeverancierNummer="08616" "280250"
+	Quit:LeverancierNummer="08617" "286250"
+	Quit:LeverancierNummer="08618" "310250"
+	Quit:LeverancierNummer="08619" "823375"
+	Quit:LeverancierNummer="08620" "000250"
+	Quit:LeverancierNummer="08621" "336250"
+	Quit:LeverancierNummer="08622" "325250"
+	Quit:LeverancierNummer="08623" "099250"
+	Quit:LeverancierNummer="08624" "326250"
+	Quit:LeverancierNummer="08625" "335250"
+	Quit:LeverancierNummer="08626" "337250"
+	Quit:LeverancierNummer="08627" "811984"
+	Quit:LeverancierNummer="08628" "340250"
+	Quit:LeverancierNummer="08629" "212250"
+	Quit:LeverancierNummer="08630" "271250"
+	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml
===================================================================
diff -u -r42532 -r42588
--- AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 42532)
+++ AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 42588)
@@ -3,6 +3,11 @@
 <Class name="AX.Uitgaand.PM.Product.impl.ProductIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="QueryAPI">
 <Type>TECH.Query.QueryAPI</Type>
 <Private>1</Private>
@@ -27,6 +32,9 @@
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
+	Set Filter = ##class(AX.Uitgaand.PM.Product.impl.ProductIteratorFilter).%New()
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.Product.impl.ProductDixfConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -37,20 +45,21 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
+	//_" and ID in (682391)"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..ResultSet.Next() > 0 )
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.Product.Product</ReturnType>
 <Implementation><![CDATA[
-	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..ResultSet.GetData(1))
+	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
 	#dim ConvertedProduct As AXdixf.Product.Product = ..Converter.Convert(Product)
 	Quit ConvertedProduct
 ]]></Implementation>
Index: AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml	(revision 42588)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor">
+<IncludeCode>Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="BlumKundeConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.BlumKunde</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..BlumKundeConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.BlumKunde).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="test">
+<Description>
+d ##class(AXimpl.Convertor.Product).test()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	set PRNr=6945 ; E24
+	Do ..%New().testone(PRNr)
+	set PRNr=111800 ; DKG
+	Do ..%New().testone(PRNr)
+	set PRNr=519062
+	Do ..%New().testone(PRNr)
+
+	Set PRNr=1432651
+	Do ..%New().testone(PRNr)
+	Set PRNr=1342834
+	Do ..%New().testone(PRNr)
+
+	Set PRNr=1427883
+	Do ..%New().testone(PRNr)
+	
+	Set PRNr=7107
+	Do ..%New().testone(PRNr)
+]]></Implementation>
+</Method>
+
+<Method name="testone">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+   w !,PRNr," ",$$$PRGet($$$KortTekst)," ",$$$PRGet($$$IdentNummer),!
+	w "  IsSOPRInCache : ",..IsSOPRInCache(PRNr),!
+	w "  IsSOPRInAX : ",..IsSOPRInAX(PRNr),!
+	w "  GeefVervangProductDoorSOPRInAX : ",..GeefVervangProductDoorSOPRInAX(PRNr),!
+	w "  SOPRIterator ",!
+	S it=..GeefSOPRIterator(PRNr)
+	While it.HasNext()
+	{
+		Set SOPRPRNr=it.Next()
+		Write "    ",SOPRPRNr," ",$$$ProductGet(SOPRPRNr,$$$KortTekst)," ",..GeefBlumKunde(SOPRPRNr),!
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsSOPRInCache">
+<FormalSpec>PRNr:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Set lbBLIDs=..GetVHProds(PRNr)
+	Quit $LL(lbBLIDs)>1
+]]></Implementation>
+</Method>
+
+<Method name="IsSOPRInAX">
+<Description>
+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>
+<Implementation><![CDATA[
+	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>
+<Implementation><![CDATA[
+ 	Set VHKLNr=$O(^PRPUTZ("N",PRNr,""))
+ 	If VHKLNr=""
+ 	{
+	 	Set BLKLNr=212250
+	 }
+ 	Else
+ 	{
+		Set BLKLNr=$P($G(^PRPUTZ("N",PRNr,VHKLNr,0)),"\",1)
+ 	}
+	Quit BLKLNr
+]]></Implementation>
+</Method>
+
+<Method name="GeefVervangProductDoorSOPRInAX">
+<FormalSpec>PRNr:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Set lbBLIDs=..GetVHProds(PRNr)
+	Quit:($LL(lbBLIDs)="") ""
+	Quit $LI(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
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml
===================================================================
diff -u -r42554 -r42588
--- AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 42554)
+++ AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 42588)
@@ -25,7 +25,7 @@
 <ReturnType>AXdixf.Product.Product</ReturnType>
 <Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.Product.Product).%New()
-	Set AxProduct.ADUCertClaimLevel = Product.Basis.FSCHout
+	Set AxProduct.ADUCertClaimLevel = ..BepaalADUCertClaimLevel(Product)
 	Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
 	Set AxProduct.EcoResProductTranslationDescription = ..OmschrijvingSamensteller.SamenstellingOmschrijvingProductenInEenString(Product)
 	Set AxProduct.EcoResProductTranslationLanguageId = "nl-be"
@@ -41,6 +41,38 @@
 	Quit AxProduct
 ]]></Implementation>
 </Method>
+
+<Method name="BepaalADUCertClaimLevel">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>AXdixf.Product.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUCertClaimLevel As %String = ""
+	#dim FSCHout As %String = Product.Basis.FSCHout
+	
+	If (FSCHout = ""){
+		Set ADUCertClaimLevel = 0
+	} ElseIf (FSCHout = "GEEN"){
+		Set ADUCertClaimLevel = 10
+	} ElseIf (FSCHout = "5050"){
+		Set ADUCertClaimLevel = 30
+	} ElseIf (FSCHout = "8030"){
+		Set ADUCertClaimLevel = 40
+	} ElseIf (FSCHout = "CW"){
+		Set ADUCertClaimLevel = 50
+	} ElseIf (FSCHout = "7030"){
+		Set ADUCertClaimLevel = 60
+	} ElseIf (FSCHout = "RCLD"){
+		Set ADUCertClaimLevel = 80
+	} ElseIf (FSCHout = "MC"){
+		Set ADUCertClaimLevel = 90
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.IllegalArgumentException).%New("ADUCertClaimLevel kan niet worden geset voor product "_Product)
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+	
+	Quit ADUCertClaimLevel
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/impl/Convertor/Sopr/AxProduct.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/impl/Convertor/Sopr/AxProduct.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/impl/Convertor/Sopr/AxProduct.cls.xml	(revision 42588)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="AxLeverancier">
+<Type>%String</Type>
+</Property>
+
+<Property name="BlumKunde">
+<Type>%String</Type>
+</Property>
+
+<Property name="HeeftVervangSoprPRNr">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="IsSoprInAx">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="IsSoprInCache">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="VervangSoprPRNr">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml	(revision 42588)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.Product.impl.ProductIteratorFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="IsValid">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AxProductConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AxProductConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Item:TECH.ResultSet</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$False
+	#dim ConvertedAxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct
+	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
+	#dim IsBlumProduct As %Boolean = (Product.Basis.LeverancierNummer = "5005")
+	
+	If (IsBlumProduct = 1){
+		Set ConvertedAxProduct = ..AxProductConvertor.AdminNaarAx(Product.Basis.ProductNr)
+		If ((ConvertedAxProduct.IsSoprInAx = 1) && (ConvertedAxProduct.IsSoprInCache = 1) || (ConvertedAxProduct.IsSoprInAx = 0) && (ConvertedAxProduct.IsSoprInCache = 0)){
+			Set IsValid = $$$True
+		} 
+	} Else {
+		Set IsValid = $$$True
+	}
+	
+	Quit IsValid
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>