Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml	(.../1658629.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMaatwerkMetSoprHalffabricaat/1658629.xml	(.../1658629.xml)	(revision 56757)
@@ -19,90 +19,103 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.433.826.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>0.1907</BOMQty>
+      <BOMQty>0.1619</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.680.532.5</ItemId>
+      <ScrapVar>17.78</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.802.201.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.802.007.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.833.811.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.607.164.5</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.606.968.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
-      <BOMQty>0.1856</BOMQty>
+      <BOMQty>0.1576</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.681.164.5</ItemId>
+      <ScrapVar>17.80</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.211.983.0</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.212.017.0</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.741.604.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml	(.../794542.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml	(.../794542.xml)	(revision 56757)
@@ -20,27 +20,31 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.490.806.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.876.414.0</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.795.258.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.296.807.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml	(.../1561083.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml	(.../1561083.xml)	(revision 56757)
@@ -20,41 +20,47 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.682.357.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>0.0187</BOMQty>
+      <BOMQty>0.0155</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.593.745.12</ItemId>
+      <ScrapVar>20.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>0.1097</BOMQty>
+      <BOMQty>0.0847</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.391.697.10</ItemId>
+      <ScrapVar>29.51</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.446.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.344.630.12</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml	(.../823131.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml	(.../823131.xml)	(revision 56757)
@@ -19,20 +19,23 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.794.481.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.794.503.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.156.299.8</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgaluxEénNiveau/794868.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgaluxEénNiveau/794868.xml	(.../794868.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgaluxEénNiveau/794868.xml	(.../794868.xml)	(revision 56757)
@@ -20,13 +20,15 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.490.784.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.136.684.8</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgalux/64938.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgalux/64938.xml	(.../64938.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOrgalux/64938.xml	(.../64938.xml)	(revision 56757)
@@ -19,27 +19,31 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.490.814.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.405.044.0</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>0.7889</BOMQty>
+      <BOMQty>0.6574</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.840.535.0</ItemId>
+      <ScrapVar>20.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>8.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.296.807.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 56757)
@@ -19,118 +19,135 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.832.215.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.636.342.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.473.845.0</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.978.059.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
-      <BOMQty>0.2157</BOMQty>
+      <BOMQty>0.1876</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.988.294.15</ItemId>
+      <ScrapVar>15.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.501.477.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.502.204.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.705.488.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.644.092.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.647.871.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>0.1456</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.656.267.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>0.1131</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.098.256.7</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>0.0840</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.046.558.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>14</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.467.855.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>15</BOMLine>
-      <BOMQty>0.2145</BOMQty>
+      <BOMQty>0.1865</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.988.367.15</ItemId>
+      <ScrapVar>15.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>16</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.061.808.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 56757)
@@ -19,90 +19,103 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.866.026.4</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>0.2006</BOMQty>
+      <BOMQty>0.1734</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.681.245.5</ItemId>
+      <ScrapVar>15.71</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.814.542.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.833.811.9</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.663.357.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.662.791.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
-      <BOMQty>0.1957</BOMQty>
+      <BOMQty>0.1691</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.681.326.5</ItemId>
+      <ScrapVar>15.72</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.767.370.4</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.767.388.4</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.741.604.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r56659 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 56659)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 56757)
@@ -19,132 +19,151 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.677.094.10</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.677.141.10</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
-      <BOMQty>0.1942</BOMQty>
+      <BOMQty>0.1481</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.263.16</ItemId>
+      <ScrapVar>28.69</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.369.650.8</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.682.357.16</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
-      <BOMQty>0.0250</BOMQty>
+      <BOMQty>0.0209</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.361.16</ItemId>
+      <ScrapVar>20.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.247.731.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.705.488.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.508.344.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.644.998.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>11</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.661.673.8</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>12</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.683.698.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>13</BOMLine>
-      <BOMQty>0.0192</BOMQty>
+      <BOMQty>0.0142</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.090.336.16</ItemId>
+      <ScrapVar>35.69</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>14</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.383.007.12</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>15</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.376.199.2</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>16</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>17</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>18</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.964.581.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>19</BOMLine>
       <BOMQty>10.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.181.528.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 56757)
@@ -15,59 +15,67 @@
     <Weight>6827.91</Weight>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
-      <BOMQty>0.4857</BOMQty>
+      <BOMQty>0.4140</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.191.469.9</ItemId>
+      <ScrapVar>17.33</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>A.651.451.2</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>A.651.228.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
-      <BOMQty>0.4457</BOMQty>
+      <BOMQty>0.3799</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>8.681.164.5</ItemId>
+      <ScrapVar>17.33</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.701.341.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.503.408.2</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>3.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.130.915.1</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>4.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.741.604.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml	(.../1561072.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml	(.../1561072.xml)	(revision 56757)
@@ -20,69 +20,79 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.369.650.8</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>2</BOMLine>
-      <BOMQty>0.0088</BOMQty>
+      <BOMQty>0.0073</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.593.745.12</ItemId>
+      <ScrapVar>20.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>3</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.376.199.2</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>4</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.373.586.5</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>5</BOMLine>
       <BOMQty>2.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.964.581.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>6</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.537.438.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>7</BOMLine>
       <BOMQty>0.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.605.085.3</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>8</BOMLine>
       <BOMQty>1.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.303.950.12</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>9</BOMLine>
       <BOMQty>7.0000</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.181.528.11</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <BOMLine class="entity">
       <BOMLine>10</BOMLine>
-      <BOMQty>0.1104</BOMQty>
+      <BOMQty>0.0849</BOMQty>
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>9.387.614.10</ItemId>
+      <ScrapVar>30.01</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml
===================================================================
diff -u -r56664 -r56757
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml	(.../500816.xml)	(revision 56664)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml	(.../500816.xml)	(revision 56757)
@@ -20,6 +20,7 @@
       <BOMQtySerie>1</BOMQtySerie>
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>
       <ItemId>0.725.995.6</ItemId>
+      <ScrapVar>0.00</ScrapVar>
     </BOMLine>
     <VariantDescription class="entity">
       <ConfigVariantId>DummyRequestMessageId</ConfigVariantId>