Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml
===================================================================
diff -u -r48001 -r48128
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 48001)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 48128)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter">
-<Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
-<Parameter name="LegalEntity">
-<Type>%String</Type>
-<Default>OverschijfInAfgeleideClass</Default>
-</Parameter>
-
 <Property name="ProductItemConverter">
 <Type>AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter</Type>
 <Private>1</Private>
@@ -53,10 +47,13 @@
 <Method name="Convert">
 <FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
 <Implementation><![CDATA[
+	#Dim LegalEntity as %String
 	Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
+	Set LegalEntity = Message.Body.MessageParts.MessagePart.SenderId
+	
 	While ProductItemIterator.HasNext(){
 		#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
-		Do ..ProductItemConverter.ConvertProductItem(ProductItem, ..#LegalEntity)
+		Do ..ProductItemConverter.ConvertProductItem(ProductItem,LegalEntity)
 		
 		Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
 		While SOPRIterator.HasNext(){
@@ -70,7 +67,7 @@
 			If $Length(SOPRProductId){			
 				#dim SOPRIdentNummer = ..ProductAPI.GeefProduct(SOPRProductId).GeefIdentNr()
 				#dim SOPRPrice as %Numeric = SOPR.CostPrice	
-				Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice),..#LegalEntity)
+				Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice),LegalEntity)
 			} else {
 				Do ..StuurOntbrekendeSOPRMail(ProductItem.ItemId,SOPR.ContractId)
 			}