Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml
===================================================================
diff -u -r43370 -r43373
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43370)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwsteenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43373)
@@ -6,15 +6,36 @@
 <Method name="Test: BouwsteenConverter vult ItemId van de BomLine in met het ProductNummer van het Halffabricaat">
 <Implementation><![CDATA[
 	#dim RandomProductNummer As %Integer = "RandomProductNummer"
-	#dim Converter As WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New()
 	#dim HalffabricaatBouwsteenDummy As DOM.PM.Bouwstenen.BouwsteenHalfFabr = ..MaakHalffabricaatBouwsteenDummy(RandomProductNummer)
 	
+	#dim InterneFirmaBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler).%New()
+	Do InterneFirmaBepalerStub.IndienMethodCall("Bepaal", RandomProductNummer).DanReturn("RandomFirma")
+	
+	#dim Converter As WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New(InterneFirmaBepalerStub)
 	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = Converter.Convert(HalffabricaatBouwsteenDummy)
 	
 	Do $$$AssertEquals(BomLine.ItemId, RandomProductNummer)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: BouwsteenConverter vult SourcingDataAreaId van de BomLine in met een interne firma">
+<Implementation><![CDATA[
+	#dim RandomProductNummer As %Integer = "RandomProductNummer"
+	#dim RandomFirma As %String = "RandomFirma"
+	#dim HalffabricaatBouwsteenDummy As DOM.PM.Bouwstenen.BouwsteenHalfFabr = ..MaakHalffabricaatBouwsteenDummy(RandomProductNummer)
+	
+	#dim InterneFirmaBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler).%New()
+	Do InterneFirmaBepalerMock.VerwachtMethodCall("Bepaal", RandomProductNummer).DanReturn(RandomFirma)
+	
+	#dim Converter As WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New(InterneFirmaBepalerMock)
+	#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = Converter.Convert(HalffabricaatBouwsteenDummy)
+	
+	Do $$$AssertEquals(BomLine.SourcingDataAreaId, RandomFirma)
+	
+	Do InterneFirmaBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="MaakHalffabricaatBouwsteenDummy">
 <FormalSpec>ProductNummer:%Integer</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml
===================================================================
diff -u -r43367 -r43373
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43367)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43373)
@@ -41,7 +41,12 @@
 	Do HalffabricaatBouwstenen.Insert(HalffabricaatBouwsteenDummy2)
 	Do HalffabricaatBouwstenen.Insert(HalffabricaatBouwsteenDummy3)
 	
-	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+	#dim BouwsteenConverterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwsteenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwsteenConverter).%New()
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", HalffabricaatBouwsteenDummy1).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", HalffabricaatBouwsteenDummy2).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
+	Do BouwsteenConverterStub.IndienMethodCall("Convert", HalffabricaatBouwsteenDummy3).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
+	
+	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterStub)
 	#dim BouwstenenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(HalffabricaatBouwstenen)
 	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(BouwstenenIterator)
 	
Index: WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml
===================================================================
diff -u -r43370 -r43373
--- WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 43370)
+++ WSimpl/AX/CalculatedProduct/BouwsteenConverter.cls.xml	(.../BouwsteenConverter.cls.xml)	(revision 43373)
@@ -3,13 +3,32 @@
 <Class name="WSimpl.AX.CalculatedProduct.BouwsteenConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="InterneFirmaBepaler">
+<Type>WSimpl.AX.CalculatedProduct.InterneFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>InterneFirmaBepaler:WSimpl.AX.CalculatedProduct.InterneFirmaBepaler=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..InterneFirmaBepaler = $$$Inject(InterneFirmaBepaler, ##class(WSimpl.AX.CalculatedProduct.InterneFirmaBepaler).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>HalffabricaatBouwsteen:DOM.PM.Bouwstenen.BouwsteenHalfFabr</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.ItemId = HalffabricaatBouwsteen.KindProduct.ProductNr
+	Set BomLine.SourcingDataAreaId = ..InterneFirmaBepaler.Bepaal(HalffabricaatBouwsteen.KindProduct.ProductNr)
 	
 	Quit BomLine
 ]]></Implementation>