Index: vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47136 -r47144
--- vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47136)
+++ vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47144)
@@ -8,9 +8,9 @@
 <Super>AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
-<Method name="Convert">
-<FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("Convert",Message)
+<Method name="ConvertProductItem">
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ConvertProductItem",ProductItem)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml
===================================================================
diff -u -r47060 -r47144
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 47060)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 47144)
@@ -3,11 +3,6 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.MappingTest">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="Envelope">
-<Type>AXif.Dynamics.ProductItemIn.Envelope</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="ProductItem">
 <Type>AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</Type>
 <Private>1</Private>
@@ -53,7 +48,7 @@
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Set ..ProductItem = ..GeefTeConverterenProductItem()
-	Set ..Envelope = ..MaakEnvelopeMetProductItem(..ProductItem) 
+	
 	Set ..ProductMock = ..GeefProduct()
 	Set ..ProductAPIMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
 	Do ..ProductAPIMock.IndienMethodCall("BestaatIdentNr",$$$ElkeWaarde).DanReturn($$$True)
@@ -96,7 +91,7 @@
 	
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 	Do ..KlasRepositoryMock.Verifieer()
@@ -108,8 +103,7 @@
 	Set ..ProductItem.CertClaimLevel = "NonApplicable"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
-
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -119,7 +113,7 @@
 	Set ..ProductItem.CertClaimLevel = "NotCertified"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","GEEN").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -130,7 +124,7 @@
 	Set ..ProductItem.CertClaimLevel = "PEFC70"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","5050").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -141,7 +135,7 @@
 	Set ..ProductItem.CertClaimLevel = "PEFC80"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","8030").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -152,7 +146,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCControlledWood"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","CW").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -163,7 +157,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCMix70"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","7030").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -174,7 +168,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCRecycled100"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","RCLD").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -185,7 +179,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCMixCredit"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","MC").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -198,7 +192,7 @@
 
 	Set ..ProductItem.CertClaimLevel = "FSCRecycledCredit"
 
-	Do ..Converter.Convert(..Envelope)
+	Do ..Converter.ConvertProductItem(..ProductItem)
 ]]></Implementation>
 </Method>
 
@@ -209,7 +203,7 @@
 
 	Set ..ProductItem.CertClaimLevel = "FSC100"
 
-	Do ..Converter.Convert(..Envelope)
+	Do ..Converter.ConvertProductItem(..ProductItem)
 ]]></Implementation>
 </Method>
 
@@ -220,7 +214,7 @@
 
 	Set ..ProductItem.CertClaimLevel = "OngeldigClaimLevel"
 
-	Do ..Converter.Convert(..Envelope)
+	Do ..Converter.ConvertProductItem(..ProductItem)
 ]]></Implementation>
 </Method>
 
@@ -229,7 +223,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Blank"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -240,7 +234,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Zero"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -251,7 +245,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Half"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0.5").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -262,7 +256,7 @@
 	Set ..ProductItem.CountableOrDivisible = "One"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","1").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -275,7 +269,7 @@
 
 	Set ..ProductItem.CountableOrDivisible = "OngeldigeWaarde"
 
-	Do ..Converter.Convert(..Envelope)
+	Do ..Converter.ConvertProductItem(..ProductItem)
 ]]></Implementation>
 </Method>
 
@@ -284,7 +278,7 @@
 	Set ..ProductItem.NetWeight  = "5.32"
 	Do ..ProductMock.VerwachtMethodCall("ZetGewichtPerDuizendStuksInKG","5.32").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -295,7 +289,7 @@
 	Set ..ProductItem.PrimaryVendorId  = "01001"
 	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierId","L||1001").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -306,7 +300,7 @@
 	Set ..ProductItem.GTIN = "Barcode"
 	Do ..ProductMock.VerwachtMethodCall("ZetBarcodeWaarde","Barcode").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -317,7 +311,7 @@
 	Set ..ProductItem.LeadTimePurch = 4
 	Do ..ProductMock.VerwachtMethodCall("ZetLevertermijn",1).DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -328,7 +322,7 @@
 	Set ..ProductItem.LowestQtyPurch = 50
 	Do ..ProductMock.VerwachtMethodCall("ZetMinimumBestelhoeveelheid",50).DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -339,7 +333,7 @@
 	Set ..ProductItem.InventUnitId = "STK"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","ST").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -350,7 +344,7 @@
 	Set ..ProductItem.InventUnitId = "cm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -361,7 +355,7 @@
 	Set ..ProductItem.InventUnitId = "cm2"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM2").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -372,7 +366,7 @@
 	Set ..ProductItem.InventUnitId = "g"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","G").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -383,7 +377,7 @@
 	Set ..ProductItem.InventUnitId = "m"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","M").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -394,7 +388,7 @@
 	Set ..ProductItem.InventUnitId = "cm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -405,7 +399,7 @@
 	Set ..ProductItem.InventUnitId = "mm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","MM").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -416,7 +410,7 @@
 	Set ..ProductItem.InventUnitId = "mm2"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","MM2").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -428,7 +422,7 @@
 	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("InventUnidId 'niet toegelaten' kan niet geconverteerd worden voor itemnummer IdentNummer")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.IllegalArgumentException).%ClassName(1),Substrings))
 	Set ..ProductItem.InventUnitId = "niet toegelaten"
-	Do ..Converter.Convert(..Envelope)
+	Do ..Converter.ConvertProductItem(..ProductItem)
 ]]></Implementation>
 </Method>
 
@@ -437,7 +431,7 @@
 	Set ..ProductItem.CostInsuranceFreight = 3
 	Do ..ProductMock.VerwachtMethodCall("ZetCifPercentage","3").DanDoeNiks()
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -455,7 +449,7 @@
 	Do ..ProductMock.VerwachtMethodCall("ZetAantalInNormaalVerpakking",5).DanDoeNiks() ;QtyNVP 
 	Do ..ProductMock.VerwachtMethodCall("ZetPalletAantal",100).DanDoeNiks() ;QtyPLT	
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -473,7 +467,7 @@
 	Do ..ProductMock.VerwachtMethodCall("ZetAantalInNormaalVerpakking","").DanDoeNiks() ;QtyNVP
 	Do ..ProductMock.VerwachtMethodCall("ZetPalletAantal","").DanDoeNiks() ;QtyPLT	
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -485,23 +479,12 @@
 	
 	Do ..ProductMock.VerwachtMethodCall("ZetCifPPL",34).DanDoeNiks() ;ActiveCostPrice
 
-	Do ..Converter.Convert(..Envelope)	
+	Do ..Converter.ConvertProductItem(..ProductItem)	
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="MaakEnvelopeMetProductItem">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.ProductItemIn.Envelope</ReturnType>
-<Implementation><![CDATA[
-	Set Envelope = ##class(AXif.Dynamics.ProductItemIn.Envelope).%New()
-	Do Envelope.Body.MessageParts.MessagePart.Item.Insert(ProductItem)
-	Quit Envelope
-]]></Implementation>
-</Method>
-
 <Method name="GeefTeConverterenProductItem">
 <Implementation><![CDATA[
 	Set ProductItem = ##class(AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem).%New()	
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml
===================================================================
diff -u -r47059 -r47144
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47059)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47144)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test Standaard gedrag converter bij inlezen bericht">
+<Method name="Test Standaard gedrag converter van ProductItem">
 <Implementation><![CDATA[
 	#dim ProductMock as vhTest.Mock.PM.DOM.Product = ..GeefProductMockMetVerwachtMethodCalls()
 	
@@ -30,7 +30,7 @@
 	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New(ProductAPIMock,ProductRolAPIMock,LangtekstBewaarderMock,KlasRepositoryMock)
 	
 	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
-	Do Converter.Convert(Envelope)
+	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1))
 	
 	Do ProductMock.Verifieer()
 	Do ProductAPIMock.Verifieer()
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(revision 47144)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test EnvelopeConverter meld waar er nog soprvarianten ontbreken in cache">
+<Implementation><![CDATA[
+	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
+
+	#dim Principaal as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).%ConstructClone(1)
+
+	#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).%ConstructClone(1)
+	Set SOPR.ItemId = "SOPRIdentNummer"
+	Set SOPR.ActiveCostPrice = 80
+	Set SOPR.SOPR= ##class(%ListOfDataTypes).%New()
+	
+	Set ProductItemConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New()
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().Nooit()
+	
+	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
+	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("")
+		
+	#dim ProductAPIMock as vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	
+	Set MailMock = ##class(vhTest.Mock.TECH.Mail.Mail).%New()
+	Do MailMock.VerwachtMethodCall("ZetVerzender",$$$SystemMail("Product Synchronizatie AX - Admin")).DanDoeNiks()
+	Do MailMock.VerwachtMethodCall("VoegToeOntvanger","PM_Administratie@vanhoecke.be").DanDoeNiks()
+	Do MailMock.VerwachtMethodCall("ZetOnderwerp","Ontbrekend SOPR product in Admin").DanDoeNiks()
+	Do MailMock.VerwachtMethodCall("ZetInhoud","Beste,"_ $$$CRLF _ $$$CRLF _" Voor principaal product 'IdentNummer' in AX bestaat het product voor SOPR contract 'vhbe-08614' nog niet.")	
+	#dim MailAPIMock as vhTest.Mock.TECH.Mail.MailAPI = ##class(vhTest.Mock.TECH.Mail.MailAPI).MockInstance()
+	Do MailAPIMock.VerwachtMethodCall("MaakNieuwMail").DanReturn(MailMock)
+	Do MailAPIMock.VerwachtMethodCall("VerstuurMail",MailMock).DanDoeNiks()
+
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock)
+	
+	Do Converter.Convert(Envelope)
+	Do ProductItemConverterMock.Verifieer()
+	Do ProductLookupMock.Verifieer()
+	Do MailAPIMock.Verifieer()
+	Do MailMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test EnvelopeConverter roept de ProductItemConverter op voor elk product en zijn sopr variant">
+<Implementation><![CDATA[
+	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
+
+	#dim Principaal as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).%ConstructClone(1)
+
+	#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).%ConstructClone(1)
+	Set SOPR.ItemId = "SOPRIdentNummer"
+	Set SOPR.ActiveCostPrice = 80
+	Set SOPR.SOPR= ##class(%ListOfDataTypes).%New()
+	
+	Set ProductItemConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New()
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().ExactAantalKeer(1)
+	
+	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
+	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("SOPRProductId")
+	
+	Set ProductMock = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductMock.VerwachtMethodCall("GeefIdentNr").DanReturn("SOPRIdentNummer")
+	
+	#dim ProductAPIMock as vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductAPIMock.VerwachtMethodCall("GeefProduct","SOPRProductId",).DanReturn(ProductMock)
+	
+	#dim MailAPIMock as vhTest.Mock.TECH.Mail.MailAPI = ##class(vhTest.Mock.TECH.Mail.MailAPI).MockInstance()
+	
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock)
+	
+	Do Converter.Convert(Envelope)
+	Do ProductMock.Verifieer()
+	Do ProductAPIMock.Verifieer()
+	Do ProductItemConverterMock.Verifieer()
+	Do ProductLookupMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefEnvelope">
+<FormalSpec>XMLFilenaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.ProductItemIn.Envelope</ReturnType>
+<Implementation><![CDATA[
+	set XMLCorrelator = ##class(TECH.XMLCorrelater).%New()
+	#dim Bestandsnaam as %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(""),XMLFilenaam)
+	Quit XMLCorrelator.GeefObjectVanBestand(Bestandsnaam,"AXif.Dynamics.ProductItemIn.Envelope","Envelope")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(revision 0)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(revision 47144)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="ProductItemConverter">
+<Type>AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductAPI">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductLookup">
+<Type>AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MailAPI">
+<Type>TECH.Mail.MailAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductItemConverter:AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,ProductAPI:DOM.PM.ProductAPI,ProductLookup:AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler,MailAPI:TECH.Mail.MailAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ProductItemConverter = $$$Inject(ProductItemConverter,##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New())
+	set ..ProductAPI = $$$Inject(ProductAPI,##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	Set ..ProductLookup = $$$Inject(ProductLookup, ##class(AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New())
+	Set ..MailAPI = $$$Inject(MailAPI,##class(TECH.Context).Instance().GeefMailAPI())
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Convert">
+<FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
+<Implementation><![CDATA[
+	Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
+	While ProductItemIterator.HasNext(){
+		#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
+		Do ..ProductItemConverter.ConvertProductItem(ProductItem)
+		Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
+		While SOPRIterator.HasNext(){
+			#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntitySOPR = SOPRIterator.Next()
+			try {
+				#dim SOPRProductId = ..ProductLookup.GeefProductIdVoorLeverancierId(ProductItem.ItemId,##class(DOM.AKP.enu.Leverancier).Blum(),SOPR.ContractId)
+			} catch {
+				#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).ClassName(1))				
+			}		
+			If $Length(SOPRProductId){			
+				#dim SOPRIdentNummer = ..ProductAPI.GeefProduct(SOPRProductId).GeefIdentNr()
+				#dim SOPRPrice as %Numeric = SOPR.CostPrice	
+				Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice))
+			} else {
+				Do ..StuurOntbrekendeSOPRMail(ProductItem.ItemId,SOPR.ContractId)
+			}
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="StuurOntbrekendeSOPRMail">
+<FormalSpec>ItemId:%String,ContractId:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Mail As TECH.Mail.Mail = ..MailAPI.MaakNieuwMail()
+	Do Mail.ZetVerzender($$$SystemMail("Product Synchronizatie AX - Admin"))
+	Do Mail.VoegToeOntvanger("PM_Administratie@vanhoecke.be")
+	Do Mail.ZetOnderwerp("Ontbrekend SOPR product in Admin")
+	Do Mail.ZetInhoud("Beste,"_ $$$CRLF _ $$$CRLF _" Voor principaal product '" _ ItemId _ "' in AX bestaat het product voor SOPR contract '" _ ContractId _ "' nog niet.")
+	Do ..MailAPI.VerstuurMail(Mail)
+]]></Implementation>
+</Method>
+
+<Method name="ApplySOPRToProductItem">
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,IdentNummer:%String,ProductPrice:%Numeric</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</ReturnType>
+<Implementation><![CDATA[
+	Set ProductItem.SOPR = ##class(%ListOfDataTypes).%New()
+	; Ext met ModuleType=Cust er tussen uit halen
+	Set ProductItem.ItemId = IdentNummer
+	Set ProductItem.ActiveCostPrice = ProductPrice
+	
+	Quit ProductItem
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47136 -r47144
--- vhTest/Fake/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47136)
+++ vhTest/Fake/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47144)
@@ -12,6 +12,18 @@
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertProductItem">
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="XConvert">
+<FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47136 -r47144
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47136)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47144)
@@ -38,20 +38,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Convert">
-<FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
+<Method name="ConvertProductItem">
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
 <Implementation><![CDATA[
-	#dim count as %Integer = 0
-	#dim nieuw as %Integer = 0
-	Set ProducItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
-	While ProducItemIterator.HasNext(){
-		#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProducItemIterator.Next()
-		if ..ProductAPI.BestaatIdentNr(ProductItem.ItemId) { ; Update
-			Do ..UpdateProduct(ProductItem)
-		} else { ;insert
-			Set nieuw = nieuw + 1
-			Do ..MaakProduct(ProductItem)
-		}
+	if ..ProductAPI.BestaatIdentNr(ProductItem.ItemId) { ; Update
+		Do ..UpdateProduct(ProductItem)
+	} else { ;insert
+		Do ..MaakProduct(ProductItem)
 	}
 ]]></Implementation>
 </Method>
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter/Test/ProductItemInUpdateKorttekst.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter/Test/ProductItemInUpdateKorttekst.xml	(revision 0)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter/Test/ProductItemInUpdateKorttekst.xml	(revision 47144)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope xmlns="http://schemas.microsoft.com/dynamics/2011/01/documents/Message">
+    <Header>
+        <MessageId>{FFA896FC-810A-4048-AEC8-1A9D3E1C9159}</MessageId>
+        <Action>http://tempuri.org/ADUMsgItemOutQueryService/find</Action>
+    </Header>
+    <Body>
+        <MessageParts xmlns="http://schemas.microsoft.com/dynamics/2011/01/documents/Message">
+            <ADUMsgItemOutQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgItemOutQuery">
+                <!-- <DocPurpose>Original</DocPurpose> -->
+                <SenderId>vhbe</SenderId>
+                <Item class="entity">
+                    <!-- <_DocumentHash>9623390eae8dddd1affa007117370f21</_DocumentHash> -->
+                    <ActiveCostPrice>64</ActiveCostPrice>
+                    <BOMQty>1.0000</BOMQty>
+                    <BOMUnitId>STK</BOMUnitId>
+                    <CertClaimLevel>NonApplicable</CertClaimLevel>
+                    <CostInsuranceFreight>1.00</CostInsuranceFreight>
+                    <CountableOrDivisible>Blank</CountableOrDivisible>
+                    <GTIN>09002617767988</GTIN>
+                    <InventUnitId>STK</InventUnitId>
+                    <ItemId>IdentNummer</ItemId>
+                    <LeadTime_Purch>6</LeadTime_Purch>
+                    <LowestQty_Purch>100.00</LowestQty_Purch>
+                    <NetWeight>5.49</NetWeight>
+                    <PrimaryVendorId>08629</PrimaryVendorId>
+                    <ProductGroupId>KB-KVD</ProductGroupId>
+                    <ProductMainGroupId>KB</ProductMainGroupId>
+                    <ProductSubGroupId>KB-KVD-SVD/BL</ProductSubGroupId>
+                    <Qty_GVP>10.00</Qty_GVP>
+                    <Qty_KVP>1.00</Qty_KVP>
+                    <Qty_NVP>5.00</Qty_NVP>
+                    <Qty_PLT>100.00</Qty_PLT>
+                    <ReqGroupId>BTO Blum</ReqGroupId>
+                    <Stopped_Invent>No</Stopped_Invent>
+                    <Stopped_Purch>No</Stopped_Purch>
+                    <Stopped_Sales>No</Stopped_Sales>
+                    <VendName>Blum 212250 E12</VendName>
+                    <Translation class="entity">
+                        <Description>AVENTOS SERVO-DRIVE   support d'interrupteur</Description>
+                        <LanguageId>fr</LanguageId>
+                        <Name>korttekst</Name>
+                    </Translation>
+                    <Translation class="entity">
+                        <Description>AVENTOS SERVO-DRIVE  schakelaarhouder</Description>
+                        <LanguageId>nl-be</LanguageId>
+                        <Name>21P5216   AUFN   100SEIW</Name>
+                    </Translation>
+                    <Ext class="entity">
+                        <CustVendRelation>08629</CustVendRelation>
+                        <ExternalItemId>0123456789012345678901234567890123456789</ExternalItemId>
+                        <ModuleType>Vend</ModuleType>
+                    </Ext>
+                    <SOPR class="entity">
+                        <ContractId>vhbe-08614</ContractId>
+                        <CostPrice>80.00000000000000000000</CostPrice>
+                        <VendAccount>08614</VendAccount>
+                        <VendName>Blum 002250 Bruynzeel-Keller</VendName>
+                    </SOPR>
+                </Item>
+            </ADUMsgItemOutQuery>
+        </MessageParts>
+    </Body>
+</Envelope>
\ No newline at end of file