Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r46905 -r47151
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 46905)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47151)
@@ -41,7 +41,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.22</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.988.294.15</ItemId>
@@ -111,7 +111,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>15</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.21</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.988.367.15</ItemId>
Index: AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml
===================================================================
diff -u -r47058 -r47151
--- AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 47058)
+++ AXimpl/Admin/DOM/PM/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 47151)
@@ -3,6 +3,24 @@
 <Class name="AXimpl.Admin.DOM.PM.BouwsteenConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>ProductBouwsteen:DOM.PM.Bouwstenen.Bouwsteen,Id:%Integer,ParentId:%Integer=""</FormalSpec>
 <ReturnType>AXimpl.Admin.DOM.PM.Bouwsteen</ReturnType>
@@ -12,7 +30,7 @@
 	Set Bouwsteen.Id = Id
 	Set Bouwsteen.IdentNummer = ProductBouwsteen.KindProduct.IdentNummer
 	Set Bouwsteen.ProductId = ProductBouwsteen.KindProduct.ProductNr
-	Set Bouwsteen.Aantal = ProductBouwsteen.Aantal
+	Set Bouwsteen.Aantal = ..GeefAantal(ProductBouwsteen)
 	Set Bouwsteen.ParentId = ParentId
 	Set Bouwsteen.IsMeeTeRekenenVoorVoorraad = ..IsMeeTeRekenenVoorVoorraad(ProductBouwsteen)
 	
@@ -34,6 +52,24 @@
 	Quit IsMeeTeRekenenVoorVoorraad
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAantal">
+<FormalSpec>ProductBouwsteen:DOM.PM.Bouwstenen.Bouwsteen</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Decimal</ReturnType>
+<Implementation><![CDATA[
+	#dim Aantal As %Decimal = ProductBouwsteen.Aantal
+	
+	If (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)
+
+		Set Aantal = BouwsteenHalfFabr1Dim.DimensieMetUitval / HalffabricaatProduct.GeefWerkvloerGrootteNetto()
+	}
+	
+	Quit Aantal
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r47079 -r47151
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47079)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47151)
@@ -644,6 +644,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Data15.GeefPiece(7)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Data2.ZetPiece(25, IdentNr)
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r46905 -r47151
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 46905)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47151)
@@ -14,7 +14,7 @@
     <SourcingDataAreaId>VHBE</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.63</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.490.814.16</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml
===================================================================
diff -u -r47139 -r47151
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47139)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47151)
@@ -13,7 +13,7 @@
     <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.49</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.191.469.9</ItemId>
@@ -34,7 +34,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.45</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>8.681.164.5</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r46905 -r47151
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 46905)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47151)
@@ -27,7 +27,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.11</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
@@ -48,14 +48,14 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.01</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>2.00</BOMQty>
+      <BOMQty>0.01</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
@@ -104,7 +104,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>14</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.02</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.336.16</ItemId>
@@ -125,14 +125,14 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.98</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>18</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.43</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
@@ -153,7 +153,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>21</BOMLine>
-      <BOMQty>4.00</BOMQty>
+      <BOMQty>0.02</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
Index: AXimpl/Admin/DOM/PM/Bouwsteen.cls.xml
===================================================================
diff -u -r47058 -r47151
--- AXimpl/Admin/DOM/PM/Bouwsteen.cls.xml	(.../Bouwsteen.cls.xml)	(revision 47058)
+++ AXimpl/Admin/DOM/PM/Bouwsteen.cls.xml	(.../Bouwsteen.cls.xml)	(revision 47151)
@@ -8,7 +8,7 @@
 </Property>
 
 <Property name="Aantal">
-<Type>%Integer</Type>
+<Type>%Decimal</Type>
 </Property>
 
 <Property name="IdentNummer">
Index: vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenConverter/Test.cls.xml
===================================================================
diff -u -r47058 -r47151
--- vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47058)
+++ vhUnitTest/AXimpl/Admin/DOM/PM/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47151)
@@ -19,7 +19,7 @@
 <Method name="Test: BouwsteenConverter converteert Bouwstenen">
 <Implementation><![CDATA[
 	#dim RandomId As %Integer = $$$DummyInteger
-	#dim ProductBouwsteenDummy As DOM.PM.Bouwstenen.Bouwsteen = ..GeefDummyProductBouwsteenDummy()
+	#dim ProductBouwsteenDummy As DOM.PM.Bouwstenen.Bouwsteen = ..GeefProductBouwsteenDummy()
 	#dim Bouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen = ..BouwsteenConverter.Convert(ProductBouwsteenDummy, RandomId)
 	
 	Do $$$AssertEquals(Bouwsteen.IdentNummer, ProductBouwsteenDummy.KindProduct.IdentNummer)
@@ -33,7 +33,7 @@
 <Method name="Test: ParentProductId wordt ingevuld">
 <Implementation><![CDATA[
 	#dim RandomParentId As %String = $$$DummyString
-	#dim ProductBouwsteenDummy As DOM.PM.Bouwstenen.Bouwsteen = ..GeefDummyProductBouwsteenDummy()	
+	#dim ProductBouwsteenDummy As DOM.PM.Bouwstenen.Bouwsteen = ..GeefProductBouwsteenDummy()	
 	#dim Bouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen = ..BouwsteenConverter.Convert(ProductBouwsteenDummy, "", RandomParentId)
 	
 	Do $$$AssertEquals(Bouwsteen.ParentId, RandomParentId)
@@ -60,7 +60,40 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefDummyProductBouwsteenDummy">
+<Method name="Test: Aantal wordt overgenomen van Bouwstenen indien niet-bewerkte halffabricaten">
+<Implementation><![CDATA[
+	#dim RandomAantal As %Integer = 5
+	
+	#dim ProductBouwsteenDummy As DOM.PM.Bouwstenen.Bouwsteen = ..GeefProductBouwsteenDummy()
+	Set ProductBouwsteenDummy.Aantal = RandomAantal
+	
+	Do $$$AssertEquals(..BouwsteenConverter.Convert(ProductBouwsteenDummy, "").Aantal, RandomAantal)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Aantal wordt berekend indien bewerkte halffabricaten">
+<Implementation><![CDATA[
+	#dim RandomWerkvloerGrootteNetto As %Integer = 100
+	#dim RandomDimensieMetUitval As %Integer = 40
+	
+	#dim BewerkteProductBouwsteen As DOM.PM.Bouwstenen.BouwsteenHalfFabr1Dim = ##class(DOM.PM.Bouwstenen.BouwsteenHalfFabr1Dim).%New()
+	Set BewerkteProductBouwsteen.DimensieMetUitval = RandomDimensieMetUitval
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefWerkvloerGrootteNetto").DanReturn(RandomWerkvloerGrootteNetto)
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct", "").DanReturn(ProductStub)
+	
+	Set ..BouwsteenConverter = ##class(AXimpl.Admin.DOM.PM.BouwsteenConverter).%New(ProductApiStub)
+	
+	#dim VerwachtAantal As %Decimal = RandomDimensieMetUitval / RandomWerkvloerGrootteNetto
+	
+	Do $$$AssertEquals(..BouwsteenConverter.Convert(BewerkteProductBouwsteen, "").Aantal, VerwachtAantal)
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductBouwsteenDummy">
 <Private>1</Private>
 <ReturnType>DOM.PM.Bouwstenen.Bouwsteen</ReturnType>
 <Implementation><![CDATA[
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46998 -r47151
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46998)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47151)
@@ -14,6 +14,12 @@
 <Type>%Integer</Type>
 </Property>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefWerkvloerEenheid">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
@@ -22,8 +28,7 @@
 
 <Method name="ZetWerkvloerEenheid">
 <FormalSpec>WerkvloerEenheid:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefLevertermijn">
Index: DOM/PM/Product.cls.xml
===================================================================
diff -u -r46998 -r47151
--- DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46998)
+++ DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 47151)
@@ -376,6 +376,11 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="IsFysiekHetzelfdeProductAls">
 <Abstract>1</Abstract>
 <FormalSpec>AnderProductID:%String</FormalSpec>
Index: vhTest/Mock/DOM/PM/Product.cls.xml
===================================================================
diff -u -r46998 -r47151
--- vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46998)
+++ vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 47151)
@@ -400,6 +400,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWerkvloerGrootteNetto")
+]]></Implementation>
+</Method>
+
 <Method name="HeeftHoutCertificaat">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("HeeftHoutCertificaat")
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r46998 -r47151
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 46998)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 47151)
@@ -596,6 +596,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefWerkvloerGrootteNetto()
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Product.ZetIdentNr(IdentNr)
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46998 -r47151
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46998)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47151)
@@ -370,6 +370,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerGrootteNetto">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWerkvloerGrootteNetto")
+]]></Implementation>
+</Method>
+
 <Method name="IsInUitverkoop">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("IsInUitverkoop")
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r46905 -r47151
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 46905)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47151)
@@ -20,7 +20,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.20</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>8.681.245.5</ItemId>
@@ -55,7 +55,7 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.20</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>8.681.326.5</ItemId>
@@ -90,14 +90,14 @@
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.88</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>1.00</BOMQty>
+      <BOMQty>0.53</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
Index: AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml
===================================================================
diff -u -r47068 -r47151
--- AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml	(.../BouwsteenIterator.cls.xml)	(revision 47068)
+++ AXimpl/Admin/DOM/PM/BouwsteenIterator.cls.xml	(.../BouwsteenIterator.cls.xml)	(revision 47151)
@@ -38,7 +38,7 @@
 	Set ..Product = Product
 	Set ..Filter = Filter
 	Set ..BouwsteenConverter = $$$Inject(BouwsteenConverter, ##class(AXimpl.Admin.DOM.PM.BouwsteenConverter).%New())
-	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
 	
 	Do ..Reset()