Index: cspBasis/GAProdTBox/tmpDev.mac.rou
===================================================================
diff -u -r319 -r320
--- cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 319)
+++ cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 320)
@@ -151,74 +151,6 @@
  */
  
  
-WSOrdToAdmin(wsID,OFFToAdmin)
-	#define SoapMethod   1
- ;	#define SoapLoc      "cache01\ADMIN1"
-	#define SoapLoc      "cache02\DEV-ADMIN1"
-	
-	New %RemoteIP,WSOrd,msg,sc,SoapErrorMsg,Opties,DestLoc,lbResult     ; ,SaveOK,blnCalcPrs,blnFixed,OptiePRS,PreCalcID
-	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
- 
-	If $$$Not(##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.GAProdTBox_AllowOrderImportIntoAdmin")) {
-		// Import vanuit de DEMO-versie van TBoxWeb is niet toegelaten. 
-		Quit $LB("","Import from this namespace ("_$$$NSpace_")_is not allowed !!!")
-	}
- 
-	Set WSOrd=##class(WS.TBX.Order).%OpenId(wsID)
-	Quit:('$IsObject(WSOrd)) $LB("","Unable to open WSOrder object")
-	Quit:('$$otaBonTypeAllowed(.msg)) $LB("",msg)   ;Quit:(WSOrd.BonType'?1(1"BBON",1"INKP")) $LB("","BonType should be 'BBON' or 'INKP'")
-	Set sc=$$$OK
-	Do otaTransferWS
-	  ;s lbResult=$LB($P($H,",",2),"TEST")   ; 
-	If $L($LG(lbResult,1)) Do
-	. Do WSOrd.AddToTransferLog($LG(lbResult,1),$G(DestLoc),$LG(lbResult,2))
-	. Set:(WSOrd.BonType="OFF") WSOrd.BonType=OFFToAdmin
-	. Set sc=WSOrd.%Save()
-	Do otaAddToLog
-	Set WSOrd=""   ; Close 
-	Quit:($$$ISERR(sc)) $LB("",sc)
-	Quit lbResult
-otaBonTypeAllowed(msg)   ; msg als .local doorgeven
-	Kill msg
-	Quit:(WSOrd.BonType="OFF")&&($G(OFFToAdmin)?1(1"BBON",1"INKP")) 1   ; Change BonType after TransferWS()
-	Quit:(WSOrd.BonType?1(1"BBON",1"INKP")) 1
-	; Else 
-	Set msg="BonType should be 'BBON' or 'INKP'"
-	Quit 0
-otaTransferWS
-	Set Opties=""
-	If $$otaUseSoapMsg Do 
-	. ;Set SoapErrorMsg=""
-	. Set lbResult=$$otaTransferViaSoapMsg(Opties)
-	Else  Do
-	. ; Uitvoeren in huidige namespace:
-	. Set DestLoc="-"
-	. If $$$SoapMethod Do
-	..  Set lbResult=$$otaTransferViaSoapMethod(Opties)
-	. Else  Do
-	..  Set lbResult=##class(BL.PR.GA.TandemBox).WSOrdToAdmin(WSOrd,Opties)
-	Quit
-otaTransferViaSoapMethod(Opties)
-	Quit ##class(WS.TBX.Calc).WSOrdToAdmin(WSOrd,.Opties)   ; Class Method, returns $LB
-otaUseSoapMsg()
-	Quit ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("cspBasis.GAProdTBox_OrderImportIntoAdminViaSoapMsg")
-otaTransferViaSoapMsg(Opties)
-	Set lbResult=""
-	Do otaTransferViaSoapMsgSub("WS.TBX.CalcSoap","WSOrdToAdmin")
-	Quit lbResult
-otaTransferViaSoapMsgSub(SoapClass,method)
-	New Client,Result,lbLocations,locNdx
-	Set Client=$System.OBJ.New(SoapClass)
-	Set Result=Client.PrepareWSOrdToAdmin(.lbLocations,.locNdx)   ; No PeekServer, only one location
-	  ;d WL^vhDBG("PeekServer (PrepareWSOrdToAdmin) finished ==>  locNdx="_$G(locNdx))
-	Do:(locNdx<0) otaSoapAddToLog   ; Problem: no location
-	Set DestLoc=Client.Location
-	Quit:('Result)
-	Do:(locNdx>1) otaSoapAddToLog   ; Not the first location
-	Set $ZTRAP="otaSoapErrorTransfer"
-	Set lbResult=Client.WSOrdToAdmin(WSOrd,.Opties,$G(%RemoteIP))
-	Set $ZTRAP=""
-	Quit
 otaSoapAddToLog
 	New lbExtras
 	Set lbExtras=$$PeekSOAPBuildLog^cspBasis.SOAPlib(SoapClass,method,lbLocations,locNdx)
@@ -228,7 +160,6 @@
 	New CustomMsg
 	Do
 	. Quit:($G(%objlasterror,1))
-	. // Hyperevent JS error messagebox
 	. New msg,blnOnServer
 	. Set blnOnServer=($$$GETERRORCODE(%objlasterror)=$$$SOAPFaultReceived)
 	. Set msg="'TransferToADMIN Failed."_"\n\n"_"SOAP message: '"_"+"_##class(%CSP.Page).QuoteJS($S(blnOnServer:"the SOAP server returned a SOAP fault.", 1:$$ParseStatus^vhLib(%objlasterror)))
@@ -237,7 +168,7 @@
 	Set CustomMsg="WSOrd:  ID="_wsID_"  : TransferToADMIN Failed."
 	Do SOAPErrorMail^cspBasis.SOAPlib("TBX_ERR",,CustomMsg,,Client)
 	Set $ZE=""
-	Quit
+	Quit $lb("","Een error has occured")
 otaAddToLog
 	Do oxxAddToLog("TRANSF")
 	Quit
@@ -255,7 +186,6 @@
 	. Set %request=""   k %request
 	Else  Do
 	. Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,$G(%session.Data("DOMAIN")),$G(%session.Data("KLNR")),$G(%session.Data("MODE")),wsID,$G(%session.Data("VERW")),,,lbExtras)
-	;Do ##class(cspBasis.GAProdTBox).AddToLog(Actie,Domain,KLNr,WizMode,wsID,Verwerker,Taal,VhisieLogin,lbExtras)
 	Quit
  
  
@@ -384,4 +314,4 @@
  // Column headers: 
 Product	Code	Label	SubGroepCode	element_key	Parameters	Display	VolgNr	FixedKeys	MetaItem	item.ID	param.Item	param.ID 
 	
- */
\ No newline at end of file
+ */