Index: APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml
===================================================================
diff -u -r375 -r388
--- APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 375)
+++ APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 388)
@@ -95,14 +95,10 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
 	set lbMailTo = ""
-	Set DataIO = ##class(WS.TBX.DataIOSoap).%New()
-	Set Result=DataIO.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
 	
 	Set KLNrVoorVerwerkingVH=..GeefKLNrVoorVerwerkingVH()
 	If $L(KLNrVoorVerwerkingVH) {
-		Set $ZT = "errorBijRegio"
-		Set RegioID = DataIO.GetKlantRegioID(..GeefKLNrVoorVerwerkingVH())
-		Set $ZT = ""
+		Set RegioID=..GeefRegioID()
 		Set lbMailTo = $LB("OV_WebOrder_R"_##class(TECH.StringUtils).AlignRight(RegioID,"0",2)_"@vanhoecke.be")
 	}
 	Else {
@@ -118,6 +114,19 @@
 	}
 
 	Quit lbMailTo
+]]></Implementation>
+</Method>
+
+<Method name="GeefRegioID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set DataIO = ##class(WS.TBX.DataIOSoap).%New()
+	Set Result=DataIO.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
+	Set $ZT = "errorBijRegio"
+	Set RegioID = DataIO.GetKlantRegioID(..GeefKLNrVoorVerwerkingVH())
+	Set $ZT = ""
+	Quit RegioID
 	
 errorBijRegio
 	Set $ZT = ""
@@ -143,7 +152,7 @@
 
 <Method name="WebServer">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[  Quit "www.tandem-box.com"
+<Implementation><![CDATA[	Quit ..GeefOrderDomein()
 ]]></Implementation>
 </Method>