Index: WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u -r69217 -r70513
--- WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 69217)
+++ WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 70513)
@@ -28,13 +28,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BerekeningService:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",AxProductKenmerkenConverter:WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter="",CheckDelControleur:WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BerekeningService:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",AxProductKenmerkenConverter:WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter="",CheckDelControleur:WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur="",Logger:vhLib.Logger="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -46,6 +51,7 @@
 	Set ..AxProductKenmerkenConverter = $$$Inject(AxProductKenmerkenConverter, ##class(WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter).%New())
 	Set ..CheckDelControleur = $$$Inject(CheckDelControleur, ##class(WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New("CalculatedProduct"))
+	Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -80,7 +86,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim HeeftBezwaar As %Boolean = $$$True
-	#dim BezwaarSignatuur As %String = "SHOFTPUZBKWME"
+	#dim BezwaarSignatuur As %String = $$$If(..ProductTypeApi.IsTaxLosseComponentenProduct(ProductId), "SOFTPUZBKWME", "SHOFTPUZBKWME")
 	#Dim Bezwaar As %String = ..CheckDelControleur.GeefEersteBezwaarIndienAanwezig(ProductId, BezwaarSignatuur)
 	
 	If (Bezwaar = "") {
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u -r58659 -r70513
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 58659)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 70513)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BerekeningService:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",AxProductKenmerkenConverter:WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter="",CheckDelControleur:WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BerekeningService:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",AxProductKenmerkenConverter:WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter="",CheckDelControleur:WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur="",Logger:vhLib.Logger="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml
===================================================================
diff -u -r69217 -r70513
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 69217)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 70513)
@@ -118,13 +118,38 @@
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
 	Do LoggerMock.VerwachtMethodCall("Warning", "ProductUpdater", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_..#RandomProductId_"' - Bezwaar: '"_..#RandomBezwaar_"'")
 	
-	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiMock.VerwachtMethodCall("IsTaxLosseComponentenProduct", ..#RandomProductId).DanReturn($$$False)
 	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock, ProductTypeApiMock)
+	
 	Do $$$AssertTrue(ProductService.HeeftBezwaarVoorProductDelete(..#RandomProductId))
 	Do LoggerMock.Verifieer()
+	Do ProductTypeApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: HeeftBezwaarVoorProductDelete -&gt; Voor LosseComponenten wordt een andere BezwaarSignatuur gebruikt zonder Historiek-check">
+<Implementation><![CDATA[
+	#dim BezwaarSignatuur As %String = "SOFTPUZBKWME"
+	
+	Set CheckDelControleurStub = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService.CheckDelControleur).%New()
+	Do CheckDelControleurStub.IndienMethodCall("GeefEersteBezwaarIndienAanwezig", ..#RandomProductId, BezwaarSignatuur).DanReturn(..#RandomBezwaar)
+	
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("Warning", "ProductUpdater", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_..#RandomProductId_"' - Bezwaar: '"_..#RandomBezwaar_"'")
+	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiMock.VerwachtMethodCall("IsTaxLosseComponentenProduct", ..#RandomProductId).DanReturn($$$True)
+	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock, ProductTypeApiMock)
+	
+	Do $$$AssertTrue(ProductService.HeeftBezwaarVoorProductDelete(..#RandomProductId))
+	Do LoggerMock.Verifieer()
+	Do ProductTypeApiMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: HeeftBezwaarVoorProductDelete -&gt; False indien GEEN bezwaar gevonden en dit wordt gelogd">
 <Implementation><![CDATA[
 	#dim BezwaarSignatuur As %String = "SHOFTPUZBKWME"
@@ -135,10 +160,14 @@
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
 	Do LoggerMock.VerwachtMethodCall("Info", "ProductUpdater", "Geen bezwaar gevonden voor ProductId: '"_..#RandomProductId_"'")
 	
-	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock)
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiMock.VerwachtMethodCall("IsTaxLosseComponentenProduct", ..#RandomProductId).DanReturn($$$False)
 	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock, ProductTypeApiMock)
+	
 	Do $$$AssertFalse(ProductService.HeeftBezwaarVoorProductDelete(..#RandomProductId))
 	Do LoggerMock.Verifieer()
+	Do ProductTypeApiMock.Verifieer()
 ]]></Implementation>
 </Method>