Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProductRepository.cls.xml
===================================================================
diff -u
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(revision 0)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(revision 57281)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.PM.impl.DataM.DataMProductRepository,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderViaID">
+<FormalSpec>PRNr:%String,BewaarHistoriek:%Boolean=1</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderViaID",PRNr,BewaarHistoriek)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57267 -r57281
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57267)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57281)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: DOM/PM/impl/DataM/DataMProductRepository.cls.xml
===================================================================
diff -u -r38186 -r57281
--- DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(.../DataMProductRepository.cls.xml)	(revision 38186)
+++ DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(.../DataMProductRepository.cls.xml)	(revision 57281)
@@ -3,7 +3,7 @@
 <Class name="DOM.PM.impl.DataM.DataMProductRepository">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="ProductAPI">
 <Type>DOM.PM.ProductAPI</Type>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57267 -r57281
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57267)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57281)
@@ -43,8 +43,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DataMProductRepository">
+<Type>DOM.PM.impl.DataM.DataMProductRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -58,6 +63,7 @@
 	Set ..AfbeeldingService = $$$Inject(AfbeeldingService, ##class(WSimpl.AX.CalculatedProduct.AfbeeldingService).%New())
 	Set ..ProductDataFactory = $$$Inject(ProductDataFactory, ##class(DOM.PM.dto.ProductDataFactory).%New())
 	Set ..LadeVariantBepaler = $$$Inject(LadeVariantBepaler, ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New())
+	Set ..DataMProductRepository = $$$Inject(DataMProductRepository, ##class(DOM.PM.impl.DataM.DataMProductRepository).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -155,7 +161,7 @@
 		} ElseIf (Product.IsGenerischProduct()) {
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor het in BOMBOL door AX aangeleverde AdminProductNummer '"_ProductId_"' is in Cache een generisch product gevonden, dat daarom niet geüpdatet wordt."))
 		} Else {
-			// PRODUCT EERST NOG DELETEN !!!!!
+			// PRODUCT EERST NOG DELETEN !!!!! Do ..DataMProductRepository.VerwijderViaID(ProductId, 0)
 			Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request, ..ProductDataFactory.MaakProductData(ProductId, Product.GeefDossierNr()))
 		}
 	} Else {
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProductRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(revision 0)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProductRepository.cls.xml	(revision 57281)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.DOM.PM.impl.DataM.DataMProductRepository">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.PM.impl.DataM.DataMProductRepository</Super>
+
+<Method name="VerwijderViaID">
+<FormalSpec>PRNr:%String,BewaarHistoriek:%Boolean=1</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>