Index: AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml
===================================================================
diff -u -r43027 -r47243
--- AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 43027)
+++ AX/Uitgaand/PM/Product/impl/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 47243)
@@ -3,6 +3,11 @@
 <Class name="AX.Uitgaand.PM.Product.impl.ProductIteratorFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
+<Property name="ServiceProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsServiceProductFilter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SoprIteratorFilter">
 <Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
 <Private>1</Private>
@@ -15,6 +20,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
+	Set ..ServiceProductFilter = ##class(AX.Uitgaand.PM.impl.IsServiceProductFilter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -25,7 +31,7 @@
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
 	
-	Quit ..SoprIteratorFilter.IsValid(Product)
+	Quit (..SoprIteratorFilter.IsValid(Product) && $$$Not(..ServiceProductFilter.IsValid(Product)))
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml
===================================================================
diff -u -r46662 -r47243
--- AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 46662)
+++ AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 47243)
@@ -33,12 +33,12 @@
 	Set AxProduct.EcoResProductTranslationDescription = $Translate(Product.Tekst.GetOmschrijving("N"," "),";",",")
 	Set AxProduct.EcoResProductTranslationLanguageId = "nl-be"
 	Set AxProduct.EcoResProductTranslationName = Product.Basis.KortTekst
-	Set AxProduct.EcoResStorageDimensionGroupName = ..BepaalEcoResStorageDimensionGroupName(Product)
-	Set AxProduct.EcoResTrackingDimensionGroupName = ..BepaalEcoResTrackingDimensionGroupName(Product)
+	Set AxProduct.EcoResStorageDimensionGroupName = "WMS"
+	Set AxProduct.EcoResTrackingDimensionGroupName = "Batch"
 	Set AxProduct.IsReuseConfigurationEnabled = "Nee"
 	Set AxProduct.IsVariantGenerationEnabled = "Nee"
 	Set AxProduct.ProductSubType = $$$If(..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product),"ProductMaster","Product")
-	Set AxProduct.ProductType = ..BepaalProductType(Product)
+	Set AxProduct.ProductType = "Artikel"
 	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
 	Set AxProduct.VariantConfigurationTechnology = $$$If(..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product),"Vooraf gedefinieerde variant","")
 	Quit AxProduct
@@ -98,56 +98,6 @@
 	Quit ADUCertClaimLevel
 ]]></Implementation>
 </Method>
-
-<Method name="BepaalEcoResStorageDimensionGroupName">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim EcoResStorageDimensionGroupName As %String = "WMS"
-	#dim ProductNummer As %String = Product.Basis.ProductNr
-	
-	If (##class(TECH.StringUtils).Contains(ProductNummer,"797700","1102922","1156079","785609","769387","830298","865318","865317","865329","865330","865327")) {
-		Set EcoResStorageDimensionGroupName = "Service"
-	}
-	
-	Quit EcoResStorageDimensionGroupName
-]]></Implementation>
-</Method>
-
-<Method name="BepaalEcoResTrackingDimensionGroupName">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Quit "None"
-	
-	#dim EcoResTrackingDimensionGroupName As %String = "Batch"
-	#dim ProductNummer As %String = Product.Basis.ProductNr
-	
-	If (##class(TECH.StringUtils).Contains(ProductNummer,"797700","1102922","1156079","785609","769387","830298","865318","865317","865329","865330","865327")) {
-		Set EcoResTrackingDimensionGroupName = "None"
-	}
-	
-	Quit EcoResTrackingDimensionGroupName
-]]></Implementation>
-</Method>
-
-<Method name="BepaalProductType">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductType As %String = "Artikel"
-	#dim ProductNummer As %String = Product.Basis.ProductNr
-	
-	If (##class(TECH.StringUtils).Contains(ProductNummer,"797700","1102922","1156079","785609","769387","830298","865318","865317","865329","865330","865327")) {
-		Set ProductType = "Service"
-	}
-	
-	Quit ProductType
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/impl/IsServiceProductFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/impl/IsServiceProductFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/impl/IsServiceProductFilter.cls.xml	(revision 47243)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.impl.IsServiceProductFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="IsValid">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="IsValid">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$False
+	#dim ProductNummer As %String = Product.Basis.ProductNr
+	
+	If (##class(TECH.StringUtils).Contains(ProductNummer,"797700","1102922","1156079","785609","769387","830298","865318","865317","865329","865330","865327")) {
+		Set IsValid = $$$True
+	} 	
+	
+	Quit IsValid
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml
===================================================================
diff -u -r46267 -r47243
--- AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 46267)
+++ AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 47243)
@@ -3,6 +3,17 @@
 <Class name="AX.Uitgaand.PM.Product.impl.ProductIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
+<Property name="AxEntiteit">
+<Type>%String</Type>
+<InitialExpression>"Product"</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="AxEntiteitLogger">
+<Type>AX.Uitgaand.PM.impl.LoggerProductenMigratie</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="MigratieProductVolgensAxEntiteitRepository">
 <Type>AX.Uitgaand.PM.impl.MigratieProductVolgensAxEntiteitRepository</Type>
 <Private>1</Private>
@@ -29,14 +40,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",MigratieProductVolgensAxEntiteitRepository:AX.Uitgaand.PM.impl.MigratieProductVolgensAxEntiteitRepository</FormalSpec>
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",AxEntiteitLogger:AX.Uitgaand.PM.impl.LoggerProductenMigratie</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..MigratieProductVolgensAxEntiteitRepository = $$$Inject(MigratieProductVolgensAxEntiteitRepository,##class(AX.Uitgaand.PM.impl.MigratieProductVolgensAxEntiteitRepository).%New())
-	Do ..MigratieProductVolgensAxEntiteitRepository.VerwijderVolgensAxEntiteit("Product", "VHBE")
+	Set ..AxEntiteitLogger = $$$Inject(AxEntiteitLogger,##class(AX.Uitgaand.PM.impl.LoggerProductenMigratie).%New())
+	Do ..AxEntiteitLogger.ResetLoggingAxEntiteit(..AxEntiteit, ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv())
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
 	Set Filter = ##class(AX.Uitgaand.PM.Product.impl.ProductIteratorFilter).%New()
@@ -69,16 +80,8 @@
 	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
 	#dim ConvertedProduct As AXdixf.Product.Product = ..Converter.Convert(Product)
 	
-	#dim ProductNr As %String = Product.Basis.ProductNr
-	#dim AxEntiteit As %String = "Product"
-	#dim Vestiging As %String = "VHBE"
-	If $$$Not(..MigratieProductVolgensAxEntiteitRepository.BestaatVolgensProductFilter(ProductNr, AxEntiteit, Vestiging)) {
-		Set MigratieProductVolgensAxEntiteit = ##class(AX.Uitgaand.PM.impl.MigratieProductVolgensAxEntiteit).%New()
-		Set MigratieProductVolgensAxEntiteit.AxEntiteit = AxEntiteit
-		Set MigratieProductVolgensAxEntiteit.ProductNr = ProductNr
-		Set MigratieProductVolgensAxEntiteit.Vestiging = Vestiging
-		Do MigratieProductVolgensAxEntiteit.Save()
-	}	
+	Do ..AxEntiteitLogger.LogAxEntiteit(Product.Basis.ProductNr, ..AxEntiteit, ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv())
+	
 	Quit ConvertedProduct
 ]]></Implementation>
 </Method>