Index: BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml
===================================================================
diff -u -r68613 -r68641
--- BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml	(.../beNEWSOBELWOOD.cls.xml)	(revision 68613)
+++ BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml	(.../beNEWSOBELWOOD.cls.xml)	(revision 68641)
@@ -371,13 +371,15 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"De Kaderdeur kon niet bewaard worden",sc))
 	}
 	
+	#dim KaderdeurProduct As Prod.Product
 	#dim IpComKey As %String = ..StelInIpComVoorKlant( ..Partij.GeefCode() )
 	
 	Do GADefKaderdeur.KPRCreate(,Aantal)
+	Set KaderdeurProduct = GADefKaderdeur.Product
 	
-	Kill ^IPCom("D",IpComKey)   ; Opkuis ^IPCom 
+	Kill:($$$HasLength(IpComKey)) ^IPCom("D",IpComKey)   ; Opkuis ^IPCom 
 	
-	Quit GADefKaderdeur.Product
+	Quit KaderdeurProduct
 ]]></Implementation>
 </Method>
 
@@ -388,12 +390,21 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Groep As %String = "KAD"
-	#dim IpComKey As %String = $$NewIPCom2^HADWIZ(Groep,"CREATE")
+	#dim IpAdresVoorIpCom As %String
+	If ##class(APPS.common.EDI.impl.EDIBasisVerwerker).IsEdiVerwerkingViaBackgroundProcess() {
+		Set IpAdresVoorIpCom = ##class(APPS.common.EDI.impl.EDIBasisVerwerker).GeefIpAdresVoorEdiVerwerking()
+	}
+	Else {
+		Set IpAdresVoorIpCom = ##class(TECH.Process).GeefClientIP()   ; Normale ClientIpAdres 
+	}
+
+	#dim IpComKey As %String = $$NewIPCom2metIP^HADWIZ("KAD","CREATE",IpAdresVoorIpCom)
+
+	If $$$HasLength(IpComKey) {
+		Set ^IPCom("D",IpComKey,"P","KLANT") = Klantnummer
+		Set ^IPCom("D",IpComKey,"P","FORM") = "EDI-KAD-NS"
+	}
 	
-	Set ^IPCom("D",IpComKey,"P","KLANT") = Klantnummer
-	Set ^IPCom("D",IpComKey,"P","FORM") = "EDI-KAD-NS"
-	
 	Quit IpComKey
 ]]></Implementation>
 </Method>