Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r75019 -r75030
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 75019)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 75030)
@@ -149,7 +149,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:AXimpl.Dynamics.SalesOrderIn.Converter.OrderlijnenSorteerder,OrderSluiter:CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01,ToeleveringService:AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,OrderIngaveService:APPS.VKP.OrderIngaveService,OfferteRepository:APPS.VKP.Offerte.OfferteRepository,SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,VerkoopApi:DOM.VKP.VerkoopAPI,Mailer:AXimpl.Dynamics.SalesOrderIn.Converter.Mailer,LeverAdresMaker:AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker,LandRepository:DOM.common.Locatie.impl.LandRepository,ProductRepository:Prod.ProductRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductService:WSimpl.AX.CalculatedProduct.ProductService="",BerekeningServiceProduct:APPS.PM.Maatwerk.impl.BerekeningServiceProduct=""</FormalSpec>
+<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:AXimpl.Dynamics.SalesOrderIn.Converter.OrderlijnenSorteerder,OrderSluiter:CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01,ToeleveringService:AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,OrderIngaveService:APPS.VKP.OrderIngaveService,OfferteRepository:APPS.VKP.Offerte.OfferteRepository,SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,VerkoopApi:DOM.VKP.VerkoopAPI,Mailer:AXimpl.Dynamics.SalesOrderIn.Converter.Mailer,LeverAdresMaker:AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker,LandRepository:DOM.common.Locatie.impl.LandRepository,ProductRepository:Prod.ProductRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductService:WSimpl.AX.CalculatedProduct.ProductService="",BerekeningServiceProduct:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",VhConfigRepository:APPS.PM.Maatwerk.impl.VhConfigRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -176,7 +176,7 @@
 	
 	Set ..VerkoopApi = $$$Inject(VerkoopApi, ##class(DOM.VKP.impl.VerkoopAPI).%New())
 	Set ..VhConfigHelper = ##class(APPS.PM.Maatwerk.impl.VhConfigHelper).%New()
-	Set ..VhConfigRepository = ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
+	Set ..VhConfigRepository = $$$Inject(VhConfigRepository, ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New())
 	Set ..ToeleveringLockControleerder = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.ToeleveringLockControleerder).%New()
 	
 	Set ..Logger = ##class(vhLib.Logger).%New()
@@ -606,14 +606,16 @@
 <Implementation><![CDATA[
 	#dim IsProductIdHergebruikt As %Boolean = $$$False
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ..GeefJSONParsedVhConfig(OrderLine.VhConfig)
-	If (..VhConfigRepository.BestaatVhConfigVoorInventTransId(OrderLine.InventTransId))
+	Set CID = ##class(TECH.StringUtils).Replace(##class(TECH.StringUtils).Replace(OrderLine.CID, "}", ""), "{", "")
+	Do ##class(Tools.Wlip).%New(110).String("1")
+	If (..VhConfigRepository.BestaatVhConfigVoorCID(CID))
 	{
-		Do ##class(vhLib.Logger).%New("PVR DEBUG").Warning(..%ClassName(), " VhConfigVoorInventTransId bestaat "_OrderLine.InventTransId)
-		Set ReedsGekendeProductId = ..VhConfigRepository.GeefAdminProductNrVoorInventTransId(OrderLine.InventTransId)
-		Do ##class(vhLib.Logger).%New("PVR DEBUG").Warning(..%ClassName(), " VhConfigVoorInventTransId bestaat met id" _ ReedsGekendeProductId)
-		Do ..VhConfigRepository.VerwijderInventTransId(OrderLine.InventTransId)
+		Do ##class(Tools.Wlip).%New(110).String("2")
+		Set ReedsGekendeProductId = ..VhConfigRepository.GeefAdminProductNrVoorCID(CID)
+		Do ##class(Tools.Wlip).%New(110).String("3")
+		Do ..VhConfigRepository.VerwijderCID(CID)
 	}
-	
+	Do ##class(Tools.Wlip).%New(110).String("4")
 	Do ..VhConfigHelper.ZetVhConfig(VhConfig)
 	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
 	Set ProductData.CID = CID
Index: vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r75019 -r75030
--- vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75019)
+++ vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75030)
@@ -49,6 +49,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAdminProductNrVoorCID">
+<FormalSpec>CID:%String</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAdminProductNrVoorCID",CID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefAdminProductNrVoorInventTransId">
 <FormalSpec>InventTransId:%String</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r75019 -r75030
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 75019)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 75030)
@@ -257,6 +257,10 @@
 	Do BerekeningServiceProductMock.VerwachtMethodCall("MaakProductVanKenmerken", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(MaatwerkProduct)
 	
 	Set ProductServiceMock = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	
+	Set VhConfigRepositoryMock = ##class(vhTest.Mock.APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
+	Do VhConfigRepositoryMock.VerwachtMethodCall("BestaatVhConfigVoorCID", $$$ElkeWaarde).DanDoeNiks()
+	Do VhConfigRepositoryMock.VerwachtMethodCall("SaveVhConfig", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 
 	#dim ProductOrderlijnMock As vhTest.Mock.DOM.VKP.impl.DataM.DataMProductOrderlijn = ##class(vhTest.Utils.DOM.VKP.ProductOrderlijn).StandaardProductLijn()
 	Do ProductOrderlijnMock.VerwachtMethodCall("ZetAxInventTransId",StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).OrderLine.GetAt(1).InventTransId).DanDoeNiks()
@@ -282,7 +286,7 @@
 	#dim ToeleveringServiceMock As vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService).%New()
 	Do ToeleveringServiceMock.VerwachtMethodCall("VerwijderToeleveringenViaOrder" , OrderMock).ExactAantalKeer(1).DanDoeNiks()
 	
-	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(..GeefOrderApi(OrderMock), OrderLevenCyclusServiceMock,,ProductBepalerMock,..GeefDocumentReferentie(), ..GeefOrderLijnenSorteerder(), ,ToeleveringServiceMock, ,,..GeefSalesOrderLineStatusRepository(), ..GeefVerkoopApiStub(), , , ,ProductRepositoryMock, ProductTypeAPIMock, DataMProductRepositoryMock, ProductServiceMock, BerekeningServiceProductMock)
+	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(..GeefOrderApi(OrderMock), OrderLevenCyclusServiceMock,,ProductBepalerMock,..GeefDocumentReferentie(), ..GeefOrderLijnenSorteerder(), ,ToeleveringServiceMock, ,,..GeefSalesOrderLineStatusRepository(), ..GeefVerkoopApiStub(), , , ,ProductRepositoryMock, ProductTypeAPIMock, DataMProductRepositoryMock, ProductServiceMock, BerekeningServiceProductMock, VhConfigRepositoryMock)
 	Do SalesOrderConverter.Convert(StandaardOrder)
 	
 	Do OrderMock.Verifieer()
@@ -292,6 +296,7 @@
 	Do ToeleveringServiceMock.Verifieer()
 	Do DataMProductRepositoryMock.Verifieer()
 	Do BerekeningServiceProductMock.Verifieer()
+	Do VhConfigRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r75019 -r75030
--- APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75019)
+++ APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75030)
@@ -88,6 +88,16 @@
 	Quit MaatwerkConfiguratieData.AdminProductNr
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAdminProductNrVoorCID">
+<FormalSpec>CID:%String</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[
+	#dim MaatwerkConfiguratieData As APPS.PM.Maatwerk.dto.MaatwerkConfiguratieData = ..GeefViaFilter("CID = ?", $LB(CID))
+	
+	Quit MaatwerkConfiguratieData.AdminProductNr
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r72684 -r75030
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72684)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 75030)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:AXimpl.Dynamics.SalesOrderIn.Converter.OrderlijnenSorteerder,OrderSluiter:CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01,ToeleveringService:AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,OrderIngaveService:APPS.VKP.OrderIngaveService,OfferteRepository:APPS.VKP.Offerte.OfferteRepository,SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,VerkoopApi:DOM.VKP.VerkoopAPI,Mailer:AXimpl.Dynamics.SalesOrderIn.Converter.Mailer,LeverAdresMaker:AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker,LandRepository:DOM.common.Locatie.impl.LandRepository,ProductRepository:Prod.ProductRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductService:WSimpl.AX.CalculatedProduct.ProductService="",BerekeningServiceProduct:APPS.PM.Maatwerk.impl.BerekeningServiceProduct=""</FormalSpec>
+<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:AXimpl.Dynamics.SalesOrderIn.Converter.OrderlijnenSorteerder,OrderSluiter:CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01,ToeleveringService:AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,OrderIngaveService:APPS.VKP.OrderIngaveService,OfferteRepository:APPS.VKP.Offerte.OfferteRepository,SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,VerkoopApi:DOM.VKP.VerkoopAPI,Mailer:AXimpl.Dynamics.SalesOrderIn.Converter.Mailer,LeverAdresMaker:AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker,LandRepository:DOM.common.Locatie.impl.LandRepository,ProductRepository:Prod.ProductRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductService:WSimpl.AX.CalculatedProduct.ProductService="",BerekeningServiceProduct:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",VhConfigRepository:APPS.PM.Maatwerk.impl.VhConfigRepository=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>