Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r46524 -r46904
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 46524)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 46904)
@@ -13,91 +13,91 @@
     <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.866.026.4</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>8.681.245.5</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.814.542.9</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.833.811.9</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.663.357.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.662.791.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>8.681.326.5</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.767.370.4</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.767.388.4</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
-      <BOMQty>4</BOMQty>
+      <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.741.604.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r46524 -r46904
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 46524)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 46904)
@@ -13,119 +13,119 @@
     <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.832.215.7</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.636.342.9</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.473.845.0</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.978.059.9</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.988.294.15</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.312.061.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.304.851.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.705.488.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.644.092.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.647.871.7</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
-      <BOMQty>.1456</BOMQty>
+      <BOMQty>0.15</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.656.267.6</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
-      <BOMQty>.11312</BOMQty>
+      <BOMQty>0.11</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.098.256.7</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>.084</BOMQty>
+      <BOMQty>0.08</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.046.558.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>14</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.467.855.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>15</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.988.367.15</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>16</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
-      <BOMQty>4</BOMQty>
+      <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.061.808.9</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r46524 -r46904
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 46524)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 46904)
@@ -14,28 +14,28 @@
     <SourcingDataAreaId>VHBE</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.490.814.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.405.044.0</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>4</BOMQty>
+      <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.638.498.4</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>8</BOMQty>
+      <BOMQty>8.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.296.807.3</ItemId>
Index: vhTest/Mock/AXimpl/Formatter.cls.xml
===================================================================
diff -u -r46142 -r46904
--- vhTest/Mock/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46142)
+++ vhTest/Mock/AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46904)
@@ -73,7 +73,8 @@
 
 <Method name="FormatNumber">
 <FormalSpec>Number:%String,Decimals:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("FormatNumber",Number,Decimals)
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("FormatNumber",Number,Decimals)
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Formatter.cls.xml
===================================================================
diff -u -r46142 -r46904
--- AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46142)
+++ AXimpl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 46904)
@@ -21,6 +21,7 @@
 
 <Method name="FormatNumber">
 <FormalSpec>Number:%String,Decimals:%String</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit $justify(Number,"",Decimals)
 ]]></Implementation>
 </Method>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r46524 -r46904
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 46524)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 46904)
@@ -13,147 +13,147 @@
     <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.677.094.10</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.677.141.10</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.369.650.8</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.098.027.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.247.731.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.705.488.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.494.388.1</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.644.998.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.661.673.8</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>4</BOMQty>
+      <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.683.698.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>14</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.336.16</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>15</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.383.007.12</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>16</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>0.376.199.2</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>18</BOMLine>
-      <BOMQty>1</BOMQty>
+      <BOMQty>1.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>19</BOMLine>
-      <BOMQty>2</BOMQty>
+      <BOMQty>2.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.964.581.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>20</BOMLine>
-      <BOMQty>10</BOMQty>
+      <BOMQty>10.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.181.528.11</ItemId>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>21</BOMLine>
-      <BOMQty>4</BOMQty>
+      <BOMQty>4.00</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyInventTransId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
Index: WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml
===================================================================
diff -u -r45156 -r46904
--- WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 45156)
+++ WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 46904)
@@ -3,14 +3,32 @@
 <Class name="WSimpl.AX.CalculatedProduct.BouwsteenConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="Formatter">
+<Type>AXimpl.Formatter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Formatter:AXimpl.Formatter</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Bouwsteen:AXimpl.Admin.DOM.PM.Bouwsteen,ConfigVariantId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine</ReturnType>
 <Implementation><![CDATA[
 	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New()
 	
 	Set BomLine.BOMLine = Bouwsteen.Id
-	Set BomLine.BOMQty = Bouwsteen.Aantal
+	Set BomLine.BOMQty = ..Formatter.FormatNumber(Bouwsteen.Aantal, 2)
 	Set BomLine.BOMQtySerie = 1
 	Set BomLine.ConfigVariantId = ConfigVariantId
 	Set BomLine.ItemId = Bouwsteen.IdentNummer
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml
===================================================================
diff -u -r45156 -r46904
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 45156)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46904)
@@ -33,7 +33,7 @@
 	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ..Converter.Convert(..BouwsteenDummy, ..RandomConfigVariantId)
 	
 	Do $$$AssertEquals(BomLine.BOMLine, ..BouwsteenDummy.Id)
-	Do $$$AssertEquals(BomLine.BOMQty, ..BouwsteenDummy.Aantal)
+	Do $$$AssertEquals(BomLine.BOMQty, "0.00")
 	Do $$$AssertEquals(BomLine.BOMQtySerie, 1)
 	Do $$$AssertEquals(BomLine.ConfigVariantId, ..RandomConfigVariantId)
 	Do $$$AssertEquals(BomLine.ItemId, ..BouwsteenDummy.IdentNummer)
@@ -62,6 +62,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Formatter wordt opgeroepen een formatteerd tot 2 cijfers na de komma">
+<Implementation><![CDATA[
+	#dim RandomAantal As %String = "RandomAantal"
+	#dim RandomResultaat As %String = "RandomResultaat"
+	
+	#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+	Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomAantal, 2).DanReturn(RandomResultaat)
+	
+	#dim BouwsteenDummy = ..GeefBouwsteenDummy()
+	Set BouwsteenDummy.Aantal = RandomAantal
+	
+	#dim BouwsteenConverter As WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New(FormatterMock)
+	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = BouwsteenConverter.Convert(BouwsteenDummy, ..RandomConfigVariantId)
+	
+	Do $$$AssertEquals(BomLine.BOMQty, RandomResultaat)
+	
+	Do FormatterMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefBouwsteenDummy">
 <Private>1</Private>
 <ReturnType>AXimpl.Admin.DOM.PM.Bouwsteen</ReturnType>