Index: APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml
===================================================================
diff -u -r320 -r339
--- APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 320)
+++ APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(.../VHEPNOrderHandler.cls.xml)	(revision 339)
@@ -47,24 +47,36 @@
 <Method name="GetMailTo">
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
-  set MailTo = ""
-  
-  if ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).SFS() {
-	  set MailTo = $listbuild($$$EMailOVSfs2VH)
-  } elseif ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).MBHolland() {
-	  set MailTo = $listbuild($$$EMailOVMbho2VH)
-  } elseif ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).HafeleBE() {
-	  set MailTo = $listbuild($$$EMailOVHflb2VH)
-  } elseif ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).Kisch() {
-	  set MailTo = $listbuild($$$EMailOVKisch2VH)
-  } else {
-	  set MailTo = $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
-  }
+	Set DataIO = ##class(WS.TBX.DataIOSoap).%New()
+	Set Result=DataIO.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
 
-  Quit MailTo
+	Set $ZT = "errorBijRegio"
+	Set RegioID = DataIO.GetKlantRegioID(..GeefKLNrVoorVerwerkingVH())
+	Set $ZT = ""
+	Set MailTo = "OV_WebOrder_R"_##class(TECH.StringUtils).AlignRight(RegioID,"0",2)
+	Quit $LB(""""_MailTo_""" <"_MailTo_">")
+errorBijRegio
+	Set $ZT = ""
+	set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do ##class(vhLib.Logger).%New("TBXWeb").ErrorMail("Error bij ophalen Regio "_..WSOrd.mID_" ("_DataIO.Location_ ")",Exception.ToString())
+	Quit $listbuild("""OV_TBX_KLANT"" <OV_TBX_KLANT@vanhoecke.be>")
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKLNrVoorVerwerkingVH">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If ..Requester = ##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke() {
+		Set KlantNr = ..WSOrd.KLNummer
+	} 
+	Else {
+		Set KlantNr = ##class(APPS.TBXWeb.Utils).GeefKlantnummerVanHandel(..WSOrd.%Id())
+	}
+	Quit KlantNr
+]]></Implementation>
+</Method>
+
 <Method name="WebServer">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[  Quit "www.tandem-box.com"
Index: APPS/TBXWeb/Utils.cls.xml
===================================================================
diff -u -r334 -r339
--- APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 334)
+++ APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 339)
@@ -75,5 +75,16 @@
 <Implementation><![CDATA[	quit ##class(WS.TBX.GroepOrder).%OpenId(OrderID).TotPrijs
 ]]></Implementation>
 </Method>
+
+<Method name="GeefKlantnummerVanHandel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>WSOrderID:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set WSOrder=##class(WS.TBX.OrderAbstract).%OpenId(WSOrderID)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(WSOrder.WebDomain,"")
+	Quit TBXContext.GeefDomeinKlantNummer()
+]]></Implementation>
+</Method>
 </Class>
 </Export>