Index: AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter.cls.xml
===================================================================
diff -u -r44589 -r44598
--- AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter.cls.xml	(.../InventoryOutConverter.cls.xml)	(revision 44589)
+++ AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter.cls.xml	(.../InventoryOutConverter.cls.xml)	(revision 44598)
@@ -3,6 +3,11 @@
 <Class name="AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="AxdEntityHeader">
+<Type>AXif.Dynamics.InventoryOut.MessageParts.AxdEntityHeader</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="AxInventSyncCreator">
 <Type>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator</Type>
 <Private>1</Private>
@@ -36,37 +41,50 @@
 <FormalSpec>Request:AXimpl.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.InventoryOut.MessageParts</ReturnType>
 <Implementation><![CDATA[
-	#dim PRNr, SoprPRNr, BlumKunde As %String = ""
+	#dim PRNr As %String = ""
 	Set PRNrIterator = ##class(TECH.StringIterator).%New(Request.SubjectId,",")
-	Set SoprIterator = ##class(TECH.ListbuildIterator).%New()
 	Set MessageParts = ##class(AXif.Dynamics.InventoryOut.MessageParts).%New()
 	
-	Set AxdEntityHeader = ##class(AXif.Dynamics.InventoryOut.MessageParts.AxdEntityHeader).%New()
-	Set AxdEntityHeader.class = "entity"
-	Set AxdEntityHeader.MessageId = MessageId
+	Set ..AxdEntityHeader = ##class(AXif.Dynamics.InventoryOut.MessageParts.AxdEntityHeader).%New()
+	Set ..AxdEntityHeader.class = "entity"
+	Set ..AxdEntityHeader.MessageId = MessageId
 		
 	While PRNrIterator.HasNext(){
-		Set SoprPRNr = ""
 		Set PRNr = PRNrIterator.Next()
 		If ('..SoprProductConverter.IsSOPRInAX(PRNr)){ // Het is GEEN principale SOPR, want geen SOPR in AX
-			Do AxdEntityHeader.InventSync.Insert(..AxInventSyncCreator.MaakInventSync(PRNr))
-		} Else { // Het is WEL een principale SOPR, want een SOPR in AX
-			Set SoprIterator = ..SoprProductConverter.GeefSOPRIterator(PRNr)
-			While SoprIterator.HasNext(){
-				Set SoprPRNr = SoprIterator.Next()
-				Set BlumKunde = ..BlumKundeConverter.AdminNaarAx(..SoprProductConverter.GeefBlumKunde(SoprPRNr))
-				Do AxdEntityHeader.InventSync.Insert(..AxInventSyncCreator.MaakInventSync(SoprPRNr, PRNr, BlumKunde))
+			If ('..SoprProductConverter.IsSOPRInCache(PRNr)){ // Het is GEEN SOPR, dus mag gewoon door
+				Do ..AxdEntityHeader.InventSync.Insert(..AxInventSyncCreator.MaakInventSync(PRNr))
+			} Else { // Het is WEL een SOPR, maar geen Principale SOPR, dus Principale SOPR moet doorgegeven worden aan SluitInSoprVarianten
 			}
+		} Else { // Het is WEL een principale SOPR, want een SOPR in AX, dus doorgeven aan SluitInSoprVarianten
+			Do ..SluitInSoprVarianten(PRNr)
 		}
 	}
+	
 	Set ADUMsgOutboundInQuery = ##class(AXif.Dynamics.InventoryOut.MessageParts.AxdADUMsgOutboundInQuery).%New()
 	Set MessageParts.MessagePart = ADUMsgOutboundInQuery
 	
-	Do MessageParts.MessagePart.Header.Insert(AxdEntityHeader)
+	Do MessageParts.MessagePart.Header.Insert(..AxdEntityHeader)
 	
 	Quit MessageParts
 ]]></Implementation>
 </Method>
+
+<Method name="SluitInSoprVarianten">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim SoprPRNr, BlumKunde As %String = ""
+	Set SoprIterator = ##class(TECH.ListbuildIterator).%New()
+	Set SoprIterator = ..SoprProductConverter.GeefSOPRIterator(PRNr)
+	While SoprIterator.HasNext(){
+		Set SoprPRNr = SoprIterator.Next()
+		Set BlumKunde = ..BlumKundeConverter.AdminNaarAx(..SoprProductConverter.GeefBlumKunde(SoprPRNr))
+		Do ..AxdEntityHeader.InventSync.Insert(..AxInventSyncCreator.MaakInventSync(SoprPRNr, PRNr, BlumKunde))
+	}
+	Set SoprPRNr = ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter/Convert/Test.cls.xml
===================================================================
diff -u -r44591 -r44598
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 44591)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/InventoryOutConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 44598)
@@ -34,6 +34,9 @@
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","10").DanReturn($$$False)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","20").DanReturn($$$False)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","30").DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache","10").DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache","20").DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache","30").DanReturn($$$False)
 	
 	Set AxInventSyncCreatorMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New()
 	Do AxInventSyncCreatorMock.VerwachtMethodCall("MaakInventSync","10","","").DanDoeNiks().ExactAantalKeer(1)
@@ -61,6 +64,7 @@
 	
 	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","10").DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache","10").DanReturn($$$False)
 	
 	Set AxInventSyncCreatorMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New()
 	Do AxInventSyncCreatorMock.VerwachtMethodCall("MaakInventSync","10","","").DanDoeNiks().ExactAantalKeer(1)
@@ -199,6 +203,7 @@
 	Set SoprProductConverterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","10").DanReturn($$$True)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","20").DanReturn($$$False)
+	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInCache","20").DanReturn($$$False)
 	Do SoprProductConverterStub.IndienMethodCall("IsSOPRInAX","30").DanReturn($$$True)
 	Do SoprProductConverterStub.IndienMethodCall("GeefSOPRIterator","10").DanReturn(##class(TECH.ListbuildIterator).%New(KundeStamLijst10))
 	Do SoprProductConverterStub.IndienMethodCall("GeefSOPRIterator","30").DanReturn(##class(TECH.ListbuildIterator).%New(KundeStamLijst30))