Index: BL/Prod/GAData/TBXLadeXML.cls.xml
===================================================================
diff -u -r2 -r33
--- BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 2)
+++ BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 33)
@@ -106,11 +106,11 @@
 	
 	// Prepare variables 
 	Set WSOrd=..WSOrd
-	Set lbDomLU=WSOrd.DomainLookUp(WSOrd.WebDomain,$LB("VERW"))
-	Set ..sDomVERW=$LG(lbDomLU,1)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(WSOrd.WebDomain,"")
+	Set ..sDomVERW=TBXContext.GeefDomeinVerwerker()
 	
 	Set Taal=""
-	If ..sDomVERW?1(1"SFS",1"MBHO") Do   ; Added by WimV on 12/04/2010 
+	If TBXContext.KlantGegevensViaDataOpt() Do
 	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(..sDomVERW,WSOrd.KLNummer)   ; ,$LB("Stg","NoAction"))
 	. Set:($IsObject(KLMini)) Taal=KLMini.Taal
 	. Set KLMini=""
@@ -269,10 +269,11 @@
 	
 	// Prepare variables 
 	Set WSOrd=..WSOrd
-	Set lbDomLU=pxWSOrd.DomainLookUp(WSOrd.WebDomain,$LB("VERW"))
-	Set ..sDomVERW=$LG(lbDomLU,1)
-	Set ..Munt=$$GetUserMunt^cspBasis.Library(..sDomVERW,)
-	If ..sDomVERW="SFS" Do
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(WSOrd.WebDomain,"")
+	Set ..sDomVERW=TBXContext.GeefDomeinVerwerker()
+
+	Set ..Munt=TBXContext.GeefUserMuntEenheid(..sDomVERW)   ; $$GetUserMunt^cspBasis.Library(..sDomVERW,)
+	If TBXContext.GeefDomeinVerwerker()="SFS" Do
 	. ; Aankoopprijzen in EUR berekend en getoond 
 	. ; Verkoopprijzen in CHF berekend en getoond 
 	. ; ==> m.a.w.  pxOrder.Munt moet correct ingevuld worden (EUR of CHF);  prijzen van WSOrd niet meer omrekenen, dus Munt="EUR" 
@@ -538,61 +539,5 @@
 	Quit sc
 ]]></Implementation>
 </Method>
-
-<Method name="TestEDIxPREV">
-<Description>
-TestMethod 
-Oproepen via 
-  s sc=##class(BL.Prod.GAData.TBXLadeXML).TestEDI()   w sc,!
-!!! DEPRECATED !!!</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>wsID:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set wsID=$G(wsID,720)
-	Set OutputType="EDI"
-	Set FileName="EDI_Order_"_##class(WS.TBX.Order).OrderNrCalc(wsID)_".xml"
-	Set FilePathTest=""
-	;Set FilePathTest="\\Notes01\Shared\W V\"
-	Set FilePath=##class(%File).NormalizeDirectory(FilePathTest)_FileName
-	Set TopTag="TBOX_ORDER_EDI"
-	Set blnIndentTags=1
-	Set AllowEmptyProxy=0
-	
-	// Open WSOrd 
-	Set WSOrd=##class(WS.TBX.Order).%OpenId(wsID)
-	
-	// Build Proxy 
-	Set blProxy=##class(BL.Prod.GAData.TBXLadeXML).Instantiate()
-	Do blProxy.Init("D","EUR","",1,1,)   ; Taal As %String, Munt As %String = "EUR", sDomVERW As %String = "", blnShowAKP As %Boolean, blnShowVKP As %Boolean, blnBeursUser As %Boolean = 0)
-	Set pxOrder=blProxy.BuildProxyDoc(WSOrd,OutputType,.sc)
-	If $$$ISERR(sc) Do  Quit sc
-	. w "Error while testing method  TestEDI() : "_$$ParseStatus^vhLib(sc),!
-	
-	// Create Stream + assign FileName 
-	Set FileStream=##class(%FileCharacterStream).%New()
-	Set sc=FileStream.LinkToFile(FilePath)
-	Quit:($$$ISERR(sc)) sc
-	Set sc=$$ProxyToXMLStream^vhLib(pxOrder,.FileStream, .TopTag, blnIndentTags, AllowEmptyProxy)
-	Quit:($$$ISERR(sc)) sc
-	Set sc=FileStream.SaveStream()
-	
-	// SendMiniMail with attached file (FileName) 
-	Set AttachFile=FileStream.Filename
-	Set lbAttachments=$LB($LB(AttachFile,0))
-	Set From="AdminTBX@vanhoecke.be"
-	Set lbTo=$LB("wv@vanhoecke.be")
-	Set Subj="TBox WebOrder - Bestellung"
-	Set Body="Remarks + Attached file."_$$$CRLF_$$$CRLF
-	Set sc=$$SendMiniMail^vhLib(From,lbTo,Subj,Body,,,,,lbAttachments)
-
-	// Close object instances
-	Do FileStream.%Close()
-	Set FileStream=""
-	Do blProxy.Close()
-	
-	Quit sc
-]]></Implementation>
-</Method>
 </Class>
 </Export>