Index: AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51080 -r51176
--- AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51080)
+++ AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
@@ -3,6 +3,16 @@
 <Class name="AXimpl.Admin.Common.HerverpakteSoprService.KindProductService">
 <Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
+<Property name="AantalHerverpakt">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="InputProductId">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ProductRolApi">
 <Type>DOM.PM.ProductRolAPI</Type>
 <Private>1</Private>
@@ -40,6 +50,8 @@
 	#dim KindProductId As %String = ""
 	#dim Teller As %Integer = 0
 	
+	Set ..InputProductId = ProductId
+	Set ..AantalHerverpakt = 0
 	Set SamengesteldProduct = ..ProductRolApi.GeefSamengesteldProduct(ProductId)
 	Set BouwsteenIterator = SamengesteldProduct.GeefKindBouwsteenIterator()
 	While BouwsteenIterator.HasNext() {
@@ -49,11 +61,13 @@
 			If ($$$Not(MagMeerdereKinderenHebben)) {
 				If ($$$Not(BouwsteenIterator.HasNext()) && (Teller = 0)) {
 					Set KindProductId = BouwsteenProductId
+					Set ..AantalHerverpakt = Bouwsteen.GeefAantal()
 				} Else {
 					Set Teller = Teller + 1
 				}
 			} Else {
 				Set KindProductId = BouwsteenProductId
+				Set ..AantalHerverpakt = Bouwsteen.GeefAantal()
 			}
 		} ElseIf ((ZoekenOpSoprOfSoprKind = "SoprKind") && (..SoprProductConverter.IsSOPRKindInCache(BouwsteenProductId))) {
 			Set KindProductId = BouwsteenProductId
@@ -63,6 +77,22 @@
 	Quit KindProductId
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAantalHerverpakt">
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	If (..InputProductId = ProductId) {
+		Quit:(..AantalHerverpakt > 0) ..AantalHerverpakt
+	}
+	
+	Do ..GeefKindProductId(ProductId, $$$False, "Sopr")
+	
+	Quit:((..AantalHerverpakt = 0) || (..AantalHerverpakt = "")) 1
+	
+	Quit ..AantalHerverpakt
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml
===================================================================
diff -u -r51030 -r51176
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 51030)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 51176)
@@ -175,6 +175,63 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Default werking GeefAantalHerverpakt">
+<Implementation><![CDATA[
+	Set MoederProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct.IndienMethodCall("GeefKindBouwsteenIterator").DanReturn(..GeefBouwsteenIteratorVolgensAantalKinderen(1))
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
+	
+	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$True)
+	
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..SoprProductConverter = SoprProductConverterStub
+	#dim AantalHerverpakt As %String = ..GeefKindProductService().GeefAantalHerverpakt(..#ProductId1)
+	
+	Do $$$AssertEquals(AantalHerverpakt, 2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefAantalHerverpakt geeft minimaal 1 terug als GeefAantal leeg geeft">
+<Implementation><![CDATA[
+	Set MoederProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct.IndienMethodCall("GeefKindBouwsteenIterator").DanReturn(..GeefBouwsteenIteratorMet1BouwsteenZonderAantal())
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
+	
+	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$True)
+	
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..SoprProductConverter = SoprProductConverterStub
+	#dim AantalHerverpakt As %String = ..GeefKindProductService().GeefAantalHerverpakt(..#ProductId1)
+	
+	Do $$$AssertEquals(AantalHerverpakt, 1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefAantalHerverpakt geeft minimaal 1 terug als GeefAantal nul geeft">
+<Implementation><![CDATA[
+	Set MoederProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct.IndienMethodCall("GeefKindBouwsteenIterator").DanReturn(..GeefBouwsteenIteratorMet1BouwsteenMetAantalNul())
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
+	
+	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache", ..#ProductId2).DanReturn($$$True)
+	
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..SoprProductConverter = SoprProductConverterStub
+	#dim AantalHerverpakt As %String = ..GeefKindProductService().GeefAantalHerverpakt(..#ProductId1)
+	
+	Do $$$AssertEquals(AantalHerverpakt, 1)
+]]></Implementation>
+</Method>
+
 <Method name="GeefKindProductService">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit ##class(AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New(..ProductRolApi, ..SoprProductConverter)
@@ -192,14 +249,49 @@
 	
 	For Kind=2:1:AantalKinderen+1 {
 		Set ProductNr = $Parameter($this,"ProductId"_Kind)
-		Set BouwsteenProduct = ##class(vhTest.Mock.DOM.PM.Product).%New(ProductNr)
-		Do BouwsteenProduct.IndienMethodCall("GeefPRNr").DanReturn(ProductNr)
-		Do BouwsteenLijst.Insert(BouwsteenProduct)
+		Set BouwsteenProductMock = ##class(vhTest.Mock.DOM.PM.KindBouwsteen).%New(ProductNr)
+		Do BouwsteenProductMock.IndienMethodCall("GeefPRNr").DanReturn(ProductNr)
+		Do BouwsteenProductMock.IndienMethodCall("GeefAantal").DanReturn(2)
+		Do BouwsteenLijst.Insert(BouwsteenProductMock)
 	}
 	
 	Quit ##class(TECH.ListIterator).%New(BouwsteenLijst)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefBouwsteenIteratorMet1BouwsteenZonderAantal">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductNr As %String
+	Set BouwsteenLijst = ##class(%ListOfDataTypes).%New()
+	
+	Set ProductNr = ..#ProductId2
+	Set BouwsteenProductMock = ##class(vhTest.Mock.DOM.PM.KindBouwsteen).%New(ProductNr)
+	Do BouwsteenProductMock.IndienMethodCall("GeefPRNr").DanReturn(ProductNr)
+	Do BouwsteenProductMock.IndienMethodCall("GeefAantal").DanReturn("")
+	Do BouwsteenLijst.Insert(BouwsteenProductMock)
+	
+	Quit ##class(TECH.ListIterator).%New(BouwsteenLijst)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBouwsteenIteratorMet1BouwsteenMetAantalNul">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductNr As %String
+	Set BouwsteenLijst = ##class(%ListOfDataTypes).%New()
+	
+	Set ProductNr = ..#ProductId2
+	Set BouwsteenProductMock = ##class(vhTest.Mock.DOM.PM.KindBouwsteen).%New(ProductNr)
+	Do BouwsteenProductMock.IndienMethodCall("GeefPRNr").DanReturn(ProductNr)
+	Do BouwsteenProductMock.IndienMethodCall("GeefAantal").DanReturn(0)
+	Do BouwsteenLijst.Insert(BouwsteenProductMock)
+	
+	Quit ##class(TECH.ListIterator).%New(BouwsteenLijst)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Base.cls.xml
===================================================================
diff -u -r48469 -r51176
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Base.cls.xml	(.../Base.cls.xml)	(revision 48469)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Base.cls.xml	(.../Base.cls.xml)	(revision 51176)
@@ -34,7 +34,9 @@
 <ReturnType>DOM.AKP.ProductToeleveringLijn</ReturnType>
 <Implementation><![CDATA[
     Set ToeleveringLijnMock = ##class(vhTest.Mock.DOM.AKP.ProductToeleveringLijn).%New()
-    Do ToeleveringLijnMock.IndienMethodCall("ZetAantal",$$$ElkeWaarde).DanDoeNiks()
+    Do ToeleveringLijnMock.IndienMethodCall("ZetAantal",500).DanDoeNiks()
+    Do ToeleveringLijnMock.IndienMethodCall("ZetAantal",25).DanDoeNiks()
+    Do ToeleveringLijnMock.IndienMethodCall("ZetAantal",26).DanDoeNiks()
     Do ToeleveringLijnMock.IndienMethodCall("ZetMunt",$$$ElkeWaarde).DanDoeNiks()
     Do ToeleveringLijnMock.IndienMethodCall("ZetEenheidsPrijs",$$$ElkeWaarde).DanDoeNiks()
     Do ToeleveringLijnMock.IndienMethodCall("ZetNettoprijs",$$$ElkeWaarde).DanDoeNiks()
Index: AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml
===================================================================
diff -u -r51047 -r51176
--- AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 51047)
+++ AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 51176)
@@ -273,13 +273,20 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
+	#dim MoederProductId As %String
 	#dim ProductId as %String = ..ProductLookup.GeefProductIdVoorLeverancierId(JournalEntryLine.ItemId,Toelevering.GeefLeverancierID(),JournalEntryLine.SOPRContractId)
-	If (..HerverpakteSoprService.IsHerverpakteSopr(ProductId)) {
+	#dim IsHerverpakteSopr As %Boolean = ..HerverpakteSoprService.IsHerverpakteSopr(ProductId)
+	If (IsHerverpakteSopr) {
+		Set MoederProductId = ProductId
 		Set ProductId = ..HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(ProductId)
 	}
 	#dim Aantal as %Decimal = JournalEntryLine.Qty
 	#dim ToeleveringLijn As DOM.AKP.ProductToeleveringLijn = Toelevering.MaakNieuweProductLijn(ProductId)
-	Do ToeleveringLijn.ZetAantal(JournalEntryLine.Qty)
+	If (IsHerverpakteSopr) {
+		Do ToeleveringLijn.ZetAantal(JournalEntryLine.Qty * ..HerverpakteSoprService.GeefAantalHerverpakt(MoederProductId))
+	} Else {
+		Do ToeleveringLijn.ZetAantal(JournalEntryLine.Qty)
+	}
 	Do ToeleveringLijn.ZetMunt("EUR")
 	Do ToeleveringLijn.ZetEenheidsPrijs(0)
 	Do ToeleveringLijn.ZetNettoprijs(0)
Index: vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml
===================================================================
diff -u -r51047 -r51176
--- vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51047)
+++ vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51176)
@@ -7,6 +7,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AXimpl.Admin.Common.HerverpakteSoprService</Super>
 
+<Method name="GeefAantalHerverpakt">
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijstHerverpakteSoprs">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[	Quit ""
Index: vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51032 -r51176
--- vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51032)
+++ vhTest/Fake/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
@@ -7,6 +7,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AXimpl.Admin.Common.HerverpakteSoprService.KindProductService</Super>
 
+<Method name="GeefAantalHerverpakt">
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefKindProductId">
 <FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean,ZoekenOpSoprOfSoprKind:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestTerugname/TestherverpakteSoprper2herverpakt/JournaalTerugname.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestTerugname/TestherverpakteSoprper2herverpakt/JournaalTerugname.xml	(revision 0)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestTerugname/TestherverpakteSoprper2herverpakt/JournaalTerugname.xml	(revision 51176)
@@ -0,0 +1,14 @@
+<ADUMsgWMSJournalOut xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgWMSJournalOut">
+    <JournalTable class="entity">
+        <JournalId>00500018</JournalId>
+        <LegalEntityId>vhbe</LegalEntityId>
+        <PackingSlipId>PackingSlipId</PackingSlipId>
+        <JournalTrans class="entity">
+            <CustVendAccount>03042</CustVendAccount>
+            <InventTransType>Sales</InventTransType>
+            <ItemId>Identnummer</ItemId>
+            <JournalLineNum>1.0000000000</JournalLineNum>
+            <Qty>222.00</Qty>
+        </JournalTrans>
+    </JournalTable>
+</ADUMsgWMSJournalOut>
Index: vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml
===================================================================
diff -u -r51047 -r51176
--- vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51047)
+++ vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51176)
@@ -8,6 +8,13 @@
 <Super>AXimpl.Admin.Common.HerverpakteSoprService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="GeefAantalHerverpakt">
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAantalHerverpakt",ProductId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijstHerverpakteSoprs">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstHerverpakteSoprs")
Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml
===================================================================
diff -u -r51038 -r51176
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51038)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51176)
@@ -86,11 +86,12 @@
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertTrue(Result)
@@ -109,7 +110,7 @@
 
 	Set ..ProductRolApi = ProductRolApiStub
 	
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -122,7 +123,7 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -136,7 +137,7 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -159,7 +160,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -182,7 +183,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -206,7 +207,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -226,11 +227,12 @@
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %String = HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(..#ProductId1)
 	
 	Do $$$AssertEquals(Result, ..#ProductId11)
@@ -254,7 +256,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %String = HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(..#ProductId1)
 	
 	Do $$$AssertEquals(Result, "")
@@ -321,15 +323,18 @@
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId3, $$$False, "Sopr").DanReturn(..#ProductId33)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId5, $$$False, "Sopr").DanReturn(..#ProductId55)	
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId5, $$$False, "Sopr").DanReturn(..#ProductId55)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId3).DanDoeNiks()
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId5).DanDoeNiks()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId33, $$$True, "SoprKind").DanReturn(..#ProductId333)
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId55, $$$True, "SoprKind").DanReturn(..#ProductId555)
 	
 	Set ..ProductApi = ProductApiStub
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %ListOfDataTypes = HerverpakteSoprService.GeefLijstHerverpakteSoprs()
 	
 	Do $$$AssertEquals(Result.Count(), 3)
@@ -339,6 +344,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: GeefAantalHerverpakt roept GeefAantalHerverpakt van de KindProductService op">
+<Implementation><![CDATA[
+	Set MoederProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
+	
+	Set KindProductServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceMock.VerwachtMethodCall("GeefAantalHerverpakt",..#ProductId1).DanReturn(2)
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..KindProductService = KindProductServiceMock
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
+	#dim Aantal As %Integer = HerverpakteSoprService.GeefAantalHerverpakt(..#ProductId1)
+	
+	Do $$$AssertEquals(Aantal,2)
+	Do KindProductServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefHerverpakteSoprService">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit ##class(AXimpl.Admin.Common.HerverpakteSoprService).%New(..ProductApi, ..ProductRolApi, ..KindProductService)
Index: vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml
===================================================================
diff -u -r51032 -r51176
--- vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51032)
+++ vhTest/Mock/AXimpl/Admin/Common/HerverpakteSoprService/KindProductService.cls.xml	(.../KindProductService.cls.xml)	(revision 51176)
@@ -8,6 +8,13 @@
 <Super>AXimpl.Admin.Common.HerverpakteSoprService.KindProductService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="GeefAantalHerverpakt">
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAantalHerverpakt",ProductId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefKindProductId">
 <FormalSpec>ProductId:%Integer,MagMeerdereKinderenHebben:%Boolean,ZoekenOpSoprOfSoprKind:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml
===================================================================
diff -u -r51047 -r51176
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml	(.../TestTerugname.cls.xml)	(revision 51047)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml	(.../TestTerugname.cls.xml)	(revision 51176)
@@ -5,6 +5,9 @@
 
 <Method name="Test terugname wordt een toelevering en receptie voor Leverancier Vanhoecke aangemaakt">
 <Implementation><![CDATA[
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+    Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$False)
+    
 	Set ProductLijnen = ##class(%ListOfObjects).%New()
 	#dim ProductLijnMock as DOM.AKP.ProductToeleveringLijn = ..GeefProductToeleveringLijn()
 	Do ProductLijnen.Insert(ProductLijnMock)
@@ -44,7 +47,7 @@
 
 	#dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock()
 
-    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock)
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock,HerverpakteSoprServiceMock)
     #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
 
     Do $$$AssertEquals(Response,Antwoord)
@@ -60,6 +63,10 @@
 
 <Method name="Test onwaarschijnlijke terugname van 2 klanten wordt 1 toelevering en receptie voor Leverancier Vanhoecke aangemaakt">
 <Implementation><![CDATA[
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+    Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$False)
+    Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","8765").DanReturn($$$False)
+    
 	Set ProductLijnen = ##class(%ListOfObjects).%New()
 	#Dim ProductLijn1 as vhTest.Mock.DOM.AKP.ProductToeleveringLijn = ..GeefProductToeleveringLijn()
 	Do ProductLijnen.Insert(ProductLijn1)
@@ -105,7 +112,7 @@
 
 	#dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock()
 
-    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock)
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock,HerverpakteSoprServiceMock)
 
     #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
     
@@ -124,6 +131,7 @@
 <Implementation><![CDATA[
 	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
     Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$True)
+    Do HerverpakteSoprServiceMock.IndienMethodCall("GeefAantalHerverpakt","4321").DanReturn(1)
     Do HerverpakteSoprServiceMock.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft", "4321").DanReturn("4321")
     
 	Set ProductLijnen = ##class(%ListOfObjects).%New()
@@ -180,8 +188,74 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test herverpakte Sopr per 2 herverpakt">
+<Implementation><![CDATA[
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+    Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$True)
+    Do HerverpakteSoprServiceMock.IndienMethodCall("GeefAantalHerverpakt","4321").DanReturn(2)
+    Do HerverpakteSoprServiceMock.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft", "4321").DanReturn("4321")
+    
+	Set ProductLijnen = ##class(%ListOfObjects).%New()
+	#dim ProductLijnMock as DOM.AKP.ProductToeleveringLijn = ..GeefProductToeleveringLijn()
+	Do ProductLijnMock.VerwachtMethodCall("ZetAantal",444).DanDoeNiks() // Ter info: Input = 222 (zie bestand) en GeefAantalHerverpakt = 2 (zie boven)
+	Do ProductLijnen.Insert(ProductLijnMock)
+    #dim ToeleveringMock as DOM.AKP.Toelevering = ..GeefToelevering("L||6051",ProductLijnen)
+    Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",4321).DanReturn(ProductLijnMock)
+
+    #dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+
+    Do ToeleveringAPIMock.VerwachtMethodCall("MaakNieuwToelevering","L||6051","").DanReturn(ToeleveringMock)
+    Do ToeleveringAPIMock.VerwachtMethodCall("Bewaar",ToeleveringMock).DanDoeNiks()
+
+    Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
+    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||6051").DanReturn("4321")
+
+ 	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
+ 	Do ReceptieServiceMock.VerwachtMethodCall("MaakReceptieVoorToelevering",ToeleveringMock ,$$$CurrentTimeStamp ,"5000180","PackingSlipId").DanReturn("5000180")
+
+	; moet eigenlijk anders getest worden, maar door de %CacheString in de request werken de matchers niet :-(
+	;#dim InventSyncProductList as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(..GeefInventSyncProduct("4321",""))
+ 	;Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "4321", InventSyncProductList)
+	Set Antwoord = ##class(AXif.Dynamics.Inventory.MessageParts).%New()
+	Set InventoryOutConverter = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	;Do InventoryOutConverter.VerwachtMethodCall("Convert",..Matches.Object(RequestInventoryOut),"MessageID").DanReturn(Antwoord)
+	Do InventoryOutConverter.VerwachtMethodCall("Convert",$$$ElkeWaarde,"MessageID").DanReturn(Antwoord)
+	
+	Set ProductDummy = ##class(Prod.Product).%New()
+	Set ProductDummy.OpslagZone = "1"
+	Set ProductRepositoryMock = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryMock.VerwachtMethodCall("BestaatViaID","4321").DanReturn($$$True)
+	Do ProductRepositoryMock.VerwachtMethodCall("GeefViaID","4321").DanReturn(ProductDummy)
+	
+	Set BezwarenBepalerMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.ConversieBezwarenBepaler).%New()
+	Do BezwarenBepalerMock.IndienMethodCall("GeefBezwaren",$$$ElkeWaarde).DanReturn(##class(%ListOfDataTypes).%New())
+
+	Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New()
+	Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||6051","1","101").DanDoeNiks()
+
+	#dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock()
+
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock,HerverpakteSoprServiceMock)
+    #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
+
+    Do $$$AssertEquals(Response,Antwoord)
+    Do ProductLijnMock.Verifieer()
+    Do ToeleveringAPIMock.Verifieer()
+    Do ToeleveringMock.Verifieer()
+    Do ProductLookupMock.Verifieer()
+    Do HerverpakteSoprServiceMock.Verifieer()
+    Do ReceptieServiceMock.Verifieer()
+    Do InventoryOutConverter.Verifieer()
+    Do ProductRepositoryMock.Verifieer()
+    Do FLOWTOEMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test Conversie voor terugname">
 <Implementation><![CDATA[
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+    Do HerverpakteSoprServiceMock.IndienMethodCall("IsHerverpakteSopr","4321").DanReturn($$$False)
+    
     Set ToeleveringLijnMock = ##class(vhTest.Mock.DOM.AKP.ProductToeleveringLijn).%New()
     Do ToeleveringLijnMock.VerwachtMethodCall("ZetAantal",500).DanDoeNiks()
     Do ToeleveringLijnMock.VerwachtMethodCall("ZetMunt","EUR").DanDoeNiks()
@@ -237,7 +311,7 @@
 
 	#dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock()
 
-    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock)
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock,HerverpakteSoprServiceMock)
     #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
     
     Do $$$AssertEquals(Response,Antwoord)    
Index: AXimpl/Admin/Common/HerverpakteSoprService.cls.xml
===================================================================
diff -u -r51082 -r51176
--- AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51082)
+++ AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51176)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="AantalHerverpakt">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KindProductService">
 <Type>AXimpl.Admin.Common.HerverpakteSoprService.KindProductService</Type>
 <Private>1</Private>
@@ -56,6 +61,7 @@
 	
 	Set ..InputProductId = ProductId
 	Set ..KindSoprProductId = ""
+	Set ..AantalHerverpakt = 0
 	If (..ProductRolApi.BestaatAdministratiefProduct(ProductId)) {
 		If (..ProductRolApi.IsSamengesteldProduct(ProductId)) {
 			Set SamengesteldProduct = ..ProductRolApi.GeefSamengesteldProduct(ProductId)
@@ -65,6 +71,7 @@
 					Set SoprKindProductId = ..KindProductService.GeefKindProductId(KindSoprProductId, $$$True, "SoprKind")
 					If $$$HasLength(SoprKindProductId) {
 						Set ..KindSoprProductId = KindSoprProductId
+						Set ..AantalHerverpakt = ..KindProductService.GeefAantalHerverpakt(ProductId)
 					}
 				}
 			}
@@ -93,6 +100,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAantalHerverpakt">
+<Description>
+Write ##class(AXimpl.Admin.Common.HerverpakteSoprService).%New()GeefAantalHerverpakt()
+OPGELET: Dit gaat ervan uit dat er slechts 1 kind mag zijn (dat een Sopr moet zijn die een SoprKind heeft), wat volgens de huidige business-logic het geval is.</Description>
+<FormalSpec>ProductId:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	If (..InputProductId = ProductId) {
+		Quit:(..AantalHerverpakt > 0) ..AantalHerverpakt
+	}
+	
+	Quit ..KindProductService.GeefAantalHerverpakt(ProductId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijstHerverpakteSoprs">
 <Description>
 Set L = ##class(AXimpl.Admin.Common.HerverpakteSoprService).%New().GeefLijstHerverpakteSoprs()		Opgelet: Duurt erg lang (+- 6 min)