Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/ProductItemConverterFake.cls.xml
===================================================================
diff -u -r49525 -r49562
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/ProductItemConverterFake.cls.xml	(.../ProductItemConverterFake.cls.xml)	(revision 49525)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/ProductItemConverterFake.cls.xml	(.../ProductItemConverterFake.cls.xml)	(revision 49562)
@@ -15,10 +15,14 @@
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="IndexenAangepast">
+<Property name="IndexenVerwijderd">
 <Type>%Boolean</Type>
 </Property>
 
+<Property name="IndexenAangemaakt">
+<Type>%Boolean</Type>
+</Property>
+
 <Property name="ProductIsGelocked">
 <Type>%Boolean</Type>
 </Property>
@@ -54,7 +58,8 @@
 <Implementation><![CDATA[
 	Set ..NieuwProductGegeven = $$$False
 	Set ..DoorgestuurdNaarEWMS = $$$False
-	Set ..IndexenAangepast = $$$False
+	Set ..IndexenAangemaakt = $$$False
+	Set ..IndexenVerwijderd = $$$False
 	Set ..ReturnLockException = $$$False
 	Quit ##super(ProductAPI,ProductRolAPI,LangtekstBewaarder,KlasRepository,Logger,MailAPI,PakketService)
 ]]></Implementation>
@@ -70,13 +75,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="UpdateIndexen">
-<FormalSpec>ProductId:%String</FormalSpec>
+<Method name="VerwijderIndexen">
+<FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..IndexenAangepast = $$$True
+<Implementation><![CDATA[	Set ..IndexenVerwijderd = $$$True
 ]]></Implementation>
 </Method>
 
+<Method name="MaakIndexen">
+<FormalSpec>ProductID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..IndexenAangemaakt = $$$True
+]]></Implementation>
+</Method>
+
 <Method name="UnLockProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r49522 -r49562
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 49522)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 49562)
@@ -137,7 +137,10 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	try {
-		Do:$$$HasLength(Product.GeefID()) ..LockProduct(Product.GeefID()) ;nieuw product heeft nog geen ID
+		If $$$HasLength(Product.GeefID()){
+			Do ..LockProduct(Product.GeefID()) ;nieuw product heeft nog geen ID
+			Do ..VerwijderIndexen(Product.GeefID())
+		}
 
 		Do Product.ZetLeverancierId(..BepaalLeverancierId(ProductItem,LegalEntity)) ;PrimaryVendorId
 		Do Product.ZetAxGesynchroniseerd($$$True)		
@@ -182,8 +185,9 @@
 
 		Set Filter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ExtFilter).Maak("Cust")
 		Do ..ConvertExtModuleTypeCust(Product, ##class(TECH.DynamicIterator).%New(##class(TECH.ListIterator).%New(ProductItem.Ext),"",Filter))
-		Do ..UpdateIndexen(Product.GeefID())
+		
 		Do Product.Save()
+		Do ..MaakIndexen(Product.GeefID())
 		Do ..UnLockProduct(Product.GeefID())
 	} catch {
 		#dim Exception as TECH.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -682,15 +686,25 @@
 ]]></Implementation>
 </Method>
 
-<Method name="UpdateIndexen">
+<Method name="VerwijderIndexen">
 <FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do ..Logger.Info("AX ProductSynchronizatie","Updating indexes for product '"_ProductID_ "'")
+	Do ..Logger.Info("AX ProductSynchronizatie","Verwijderen indexen voor product '"_ProductID_ "'")
 	Do ..ProductZoekIndexBuilder.Init(ProductID)
 	Do ..ProductZoekIndexBuilder.DeleteIndex()
+	Do ..Logger.Info("AX ProductSynchronizatie","Indexen verwijderd voor product '"_ProductID_ "'")
+]]></Implementation>
+</Method>
+
+<Method name="MaakIndexen">
+<FormalSpec>ProductID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..Logger.Info("AX ProductSynchronizatie","Maak indexen voor product '"_ProductID_ "'")
+	Do ..ProductZoekIndexBuilder.Init(ProductID)
 	do ..ProductZoekIndexBuilder.BuildIndex(1)
-	Do ..Logger.Info("AX ProductSynchronizatie","Indexes updated for product '"_ProductID_ "'")
+	Do ..Logger.Info("AX ProductSynchronizatie","Indexen gemaakt voor product '"_ProductID_ "'")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/NieuwProductMock.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/NieuwProductMock.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/NieuwProductMock.cls.xml	(revision 49562)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.NieuwProductMock">
+<Super>vhTest.Mock.DOM.PM.Product</Super>
+
+<UDLText name="T">
+<Content><![CDATA[
+// reden van deze class is dat ik een mock wil die pas na het oproepen van Save() een ID terug geeft als GeefID() opgeroepen word.
+
+]]></Content>
+</UDLText>
+
+<Property name="Saved">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="ID">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>NieuwProductID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	
+	Set ..Saved= $$$False
+	Set ..ID = NieuwProductID
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Save">
+<Implementation><![CDATA[
+	Set ..Saved = $$$True
+	do ..VerwerkMethodCall("Save")
+]]></Implementation>
+</Method>
+
+<Method name="GeefID">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do ..VerwerkMethodCall("GeefID")
+	Quit:(..Saved) ..ID
+	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>