Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r47720 -r47976
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47720)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47976)
@@ -90,14 +90,14 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
-      <BOMQty>0.88</BOMQty>
+      <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>0.53</BOMQty>
+      <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
Index: AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml
===================================================================
diff -u -r47151 -r47976
--- AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 47151)
+++ AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 47976)
@@ -59,8 +59,11 @@
 <ReturnType>%Decimal</ReturnType>
 <Implementation><![CDATA[
 	#dim Aantal As %Decimal = ProductBouwsteen.Aantal
+	#dim AantalBeperker As AXimpl.Admin.DOM.PM.BouwsteenConverter.AantalBeperker = ##class(AXimpl.Admin.DOM.PM.BouwsteenConverter.AantalBeperker).%New()
 	
-	If (ProductBouwsteen.%Extends("DOM.PM.Bouwstenen.BouwsteenHalfFabr1Dim")) {
+	If (AantalBeperker.IsBeperkt(ProductBouwsteen.KindProduct.IdentNummer)) {
+		Set Aantal = AantalBeperker.GeefAantal(ProductBouwsteen.KindProduct.IdentNummer)
+	} ElseIf (ProductBouwsteen.%Extends("DOM.PM.Bouwstenen.BouwsteenHalfFabr1Dim")) {
 		#dim BouwsteenHalfFabr1Dim As DOM.PM.Bouwstenen.BouwsteenHalfFabr1Dim = ProductBouwsteen
 		#dim HalffabricaatProduct As DOM.PM.Product = ..ProductApi.GeefProduct(BouwsteenHalfFabr1Dim.KindProduct.ProductNr)
 
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r47720 -r47976
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47720)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47976)
@@ -14,7 +14,7 @@
     <SourcingDataAreaId>VHBE</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>0.63</BOMQty>
+      <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.490.814.16</ItemId>
Index: AXimpl/Admin/DOM/PM/BouwsteenConverter/AantalBeperker.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/DOM/PM/BouwsteenConverter/AantalBeperker.cls.xml	(revision 0)
+++ AXimpl/Admin/DOM/PM/BouwsteenConverter/AantalBeperker.cls.xml	(revision 47976)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.DOM.PM.BouwsteenConverter.AantalBeperker">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="AantallenPerIdentNummer">
+<Type>TECH.KeyValue.UniqueList</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AantallenPerIdentNummer = ..GeefAantallenPerIndentNummer()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsBeperkt">
+<FormalSpec>IdentNummer:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $IsObject(..AantallenPerIdentNummer.FindByKey(IdentNummer))
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantal">
+<FormalSpec>IdentNummer:%String</FormalSpec>
+<ReturnType>%Decimal</ReturnType>
+<Implementation><![CDATA[
+	#dim KeyValuePair As TECH.KeyValuePair = ..AantallenPerIdentNummer.FindByKey(IdentNummer)
+	
+	Quit KeyValuePair.Value
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantallenPerIndentNummer">
+<Private>1</Private>
+<ReturnType>TECH.KeyValue.UniqueList</ReturnType>
+<Implementation><![CDATA[
+	#dim KeyValueList As TECH.KeyValue.UniqueList = ##class(TECH.KeyValue.UniqueList).%New()
+	
+	Do KeyValueList.InsertKeyValue("9.490.776.16", 0)
+	Do KeyValueList.InsertKeyValue("9.490.784.16", 0)
+	Do KeyValueList.InsertKeyValue("9.490.806.16", 0)
+	Do KeyValueList.InsertKeyValue("9.490.814.16", 0)
+	Do KeyValueList.InsertKeyValue("9.537.381.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.390.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.403.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.411.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.420.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.438.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.446.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.454.3", 0)
+	Do KeyValueList.InsertKeyValue("9.537.462.3", 0)
+	Do KeyValueList.InsertKeyValue("9.605.085.3", 0)
+	Do KeyValueList.InsertKeyValue("9.605.158.3", 0)
+	
+	Quit KeyValueList
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r47720 -r47976
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47720)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47976)
@@ -125,14 +125,14 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
-      <BOMQty>0.98</BOMQty>
+      <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>18</BOMLine>
-      <BOMQty>0.43</BOMQty>
+      <BOMQty>0.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>