Index: BL/EC/Common.mac.rou
===================================================================
diff -u -r762 -r1523
--- BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 762)
+++ BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 1523)
@@ -43,22 +43,19 @@
 	For EST=1:1:$ESTACK Set Body=Body_$C(13)_"   "_$STACK($STACK-EST,"PLACE")
 	Set Body=Body_$C(13)_$C(13)_"Device: "_$I_" Job: "_$J
 	Set Body=Body_$C(13)_"Server: "_$ZU(110)_" NameSpace: "_$ZU(5)
-	Set From="System@vanhoecke.be"
+	Set From=$$$SystemMail("VHISIE")
 	Set Subj="VHISIE - Error to Log"
-	Set To=$LB("pv@vanhoecke.be")
+	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
 	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 	
 	Quit Logging
  
 WebServiceTrap()
 	;Fout gebruiksvriendelijk maken en mailen naar van hoecke indien niet op development server
-	If '$$InDevelop^vhLib() Do
-	. Do MailTrap()
-	. Set $ZERROR=##class(Res.Vertaling).GetVertalingPlus($$$VertalingsGroep,"InternalErrorVH","O",Taal,,1)
-	. Set Taal=$S($L($G(%Taal)):%Taal,$IsObject($G(%ECSession)):%ECSession.Taal,1:"E")
- 
-	s $ETRAP=""
- 
+	Do MailTrap()
+	;Set Taal=$S($L($G(%Taal)):%Taal,$IsObject($G(%ECSession)):%ECSession.Taal,1:"E")
+	;Set $ZERROR=##class(Res.Vertaling).GetVertalingPlus($$$VertalingsGroep,"InternalErrorVH","O",Taal,,1)
+	;s $ETRAP=""
 	Quit
 		
 MailTrap()
@@ -71,9 +68,9 @@
 	For EST=1:1:$ESTACK Set Body=Body_$C(13)_"   "_$STACK($STACK-EST,"PLACE")
 	Set Body=Body_$C(13)_$C(13)_"Device: "_$I_" Job: "_$J
 	Set Body=Body_$C(13)_"Server: "_$ZU(110)_" NameSpace: "_$ZU(5)
-	Set From="System@vanhoecke.be"
+	Set From=$$$SystemMail("VHISIE")
 	Set Subj="VHISIE - Errortrap "_$ZError
-	Set To=$LB("pv@vanhoecke.be")
+	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
 	/*   */       ; ORIG code - door PV
 	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 	/*   * /             
Index: BL/EC/sub/pxKlantInfo.cls.xml
===================================================================
diff -u
--- BL/EC/sub/pxKlantInfo.cls.xml	(revision 0)
+++ BL/EC/sub/pxKlantInfo.cls.xml	(revision 1523)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.EC.sub.pxKlantInfo">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Nummer">
+<Type>%String</Type>
+</Property>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+
+<Property name="Woonplaats">
+<Type>%String</Type>
+</Property>
+</Class>
+</Export>
Index: BL/EC/DynaplugLogger.cls.xml
===================================================================
diff -u
--- BL/EC/DynaplugLogger.cls.xml	(revision 0)
+++ BL/EC/DynaplugLogger.cls.xml	(revision 1523)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.EC.DynaplugLogger">
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhLib.Logger</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GetMailFields">
+<Description>
+Do ##class(VHSys.Logging).GetMailFields(.From,.lbTo,.Subj, "Error")</Description>
+<FormalSpec><![CDATA[&From:%String,&lbTo:%List,&Subj:%String,SubjInfo:%String="Error"]]></FormalSpec>
+<Implementation><![CDATA[
+ 
+ 	Set From=$$$SystemMail("Dynaplug")
+	Set lbTo=$LB("ICT_DynaplugSysOp@vanhoecke.be")
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<Description><![CDATA[
+This callback method is invoked by the <METHOD>%New</METHOD> method to 
+provide notification that a new instance of an object is being created.
+
+<P>If this method returns an error then the object will not be created.]]></Description>
+<FormalSpec>NotUsed:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit ##super("DYNAPLUG")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: TECH/ListUtils.cls.xml
===================================================================
diff -u -r1508 -r1523
--- TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1508)
+++ TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1523)
@@ -36,6 +36,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ListToPieces">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>List:%ListOfDataTypes,Delim:%String="\"</FormalSpec>
+<Implementation><![CDATA[
+	set Pieces = ""
+	set itList = ##class(TECH.ListIterator).%New(List)
+	while itList.HasNext() {
+		set Item = itList.Next()
+		set Pieces = Pieces _ Item _ Delim
+	}
+	set Pieces = $piece(Pieces,Delim,1,$length(Pieces,Delim)-1)			
+
+	quit Pieces
+]]></Implementation>
+</Method>
+
 <Method name="CloneList">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>sourceList:%ListOfObjects</FormalSpec>
Index: WS/TBX/DataIOWWWSoap.cls.xml
===================================================================
diff -u -r1074 -r1523
--- WS/TBX/DataIOWWWSoap.cls.xml	(.../DataIOWWWSoap.cls.xml)	(revision 1074)
+++ WS/TBX/DataIOWWWSoap.cls.xml	(.../DataIOWWWSoap.cls.xml)	(revision 1523)
@@ -4,28 +4,14 @@
 <Super>%SOAP.WebClient,WS.SOAPClientExt</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="LOCATION">
-<Description>
-This is the URL used to access the web service.</Description>
-<Default>http://iserv.vanhoecke.be/csp/demo/WS.TBX.DataIOWWW.cls</Default>
+<Parameter name="XMLIGNORENULL">
+<Default>1</Default>
 </Parameter>
 
-<Parameter name="LOCATIONxxCACHE01xxADMIN1">
-<Description>
-  Location van CacheWWW/hadev  : "http://iserv.vanhoecke.be/csp/hadev/WS.TBX.DataIOWWW.cls"; </Description>
-<Default>http://iserv.vanhoecke.be/csp/hadev/WS.TBX.DataIOWWW.cls</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxCACHE02xxDEVADMIN1">
-<Description>
-  Location van CacheWWW/demo   : "http://iserv.vanhoecke.be/csp/demo/WS.TBX.DataIOWWW.cls";  </Description>
-<Default>http://iserv.vanhoecke.be/csp/demo/WS.TBX.DataIOWWW.cls</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 This is the namespace used by the Service</Description>
-<Default>http://tempuri.org</Default>
+<Default>http://vhisie.vanhoecke.be</Default>
 </Parameter>
 
 <Parameter name="SERVICENAME">
@@ -41,7 +27,7 @@
 <WebMethod>1</WebMethod>
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
-<Implementation><![CDATA[ Quit ..WebMethod("PeekServer").Invoke(##this,"http://tempuri.org/WS.TBX.DataIOWWW.PeekServer")
+<Implementation><![CDATA[ Quit ..WebMethod("PeekServer").Invoke(##this,"http://vhsie.vanhoecke.be/WS.TBX.DataIOWWW.PeekServer")
 ]]></Implementation>
 </Method>
 
@@ -54,7 +40,7 @@
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
 <Implementation><![CDATA[
- Set lbResult=..WebMethod("WSOrdToWWW").Invoke(##this,"http://tempuri.org/WS.TBX.DataIOWWW.WSOrdToWWW",.WSOrd,.SecureKey,.Opties)
+ Set lbResult=..WebMethod("WSOrdToWWW").Invoke(##this,"http://vhsie.vanhoecke.be/WS.TBX.DataIOWWW.WSOrdToWWW",.WSOrd,.SecureKey,.Opties)
  Set $LI(lbResult,4)=$System.Encryption.Base64Decode($LG(lbResult,4))
  Quit lbResult
 ]]></Implementation>
@@ -68,7 +54,7 @@
 <WebMethod>1</WebMethod>
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
-<Implementation><![CDATA[ Quit ..WebMethod("GetWSOrdFromWWW").Invoke(##this,"http://tempuri.org/WS.TBX.DataIOWWW.GetWSOrdFromWWW",.WSOrderID,.SecureKey)
+<Implementation><![CDATA[ Quit ..WebMethod("GetWSOrdFromWWW").Invoke(##this,"http://vhsie.vanhoecke.be/WS.TBX.DataIOWWW.GetWSOrdFromWWW",.WSOrderID,.SecureKey)
 ]]></Implementation>
 </Method>
 
@@ -80,7 +66,7 @@
 <WebMethod>1</WebMethod>
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
-<Implementation><![CDATA[ Quit ..WebMethod("UpdateWSOrdPropts").Invoke(##this,"http://tempuri.org/WS.TBX.DataIOWWW.UpdateWSOrdPropts",.WSOrderID,.SecureKey, .ProptName, .ProptValue)
+<Implementation><![CDATA[ Quit ..WebMethod("UpdateWSOrdPropts").Invoke(##this,"http://vhsie.vanhoecke.be/WS.TBX.DataIOWWW.UpdateWSOrdPropts",.WSOrderID,.SecureKey, .ProptName, .ProptValue)
 ]]></Implementation>
 </Method>
 
@@ -92,8 +78,19 @@
 <WebMethod>1</WebMethod>
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
-<Implementation><![CDATA[ Quit ..WebMethod("DeleteWSOrdOnWWW").Invoke(##this,"http://tempuri.org/WS.TBX.DataIOWWW.DeleteWSOrdOnWWW",.WSOrderID,.SecureKey)
+<Implementation><![CDATA[ Quit ..WebMethod("DeleteWSOrdOnWWW").Invoke(##this,"http://vhsie.vanhoecke.be/WS.TBX.DataIOWWW.DeleteWSOrdOnWWW",.WSOrderID,.SecureKey)
 ]]></Implementation>
 </Method>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set WebServiceRoot = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_WebServiceLocationDMZ")
+	set ..Location = ##class(TECH.Files).AppendFile(WebServiceRoot,"WS.TBX.DataIOWWW.cls")
+	quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: WS/EC/enu/ZoekType.cls.xml
===================================================================
diff -u
--- WS/EC/enu/ZoekType.cls.xml	(revision 0)
+++ WS/EC/enu/ZoekType.cls.xml	(revision 1523)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.EC.enu.ZoekType">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Enumeration</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>,NaamOfNummer,Woonplaats,Postcode,Straat</Default>
+</Parameter>
+
+<Method name="NaamOfNummer">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	quit "NaamOfNummer"
+]]></Implementation>
+</Method>
+
+<Method name="Woonplaats">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	quit "Woonplaats"
+]]></Implementation>
+</Method>
+
+<Method name="Postcode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	quit "Postcode"
+]]></Implementation>
+</Method>
+
+<Method name="Straat">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	quit "Straat"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhLib.mac.rou
===================================================================
diff -u -r1342 -r1523
--- vhLib.mac.rou	(.../vhLib.mac.rou)	(revision 1342)
+++ vhLib.mac.rou	(.../vhLib.mac.rou)	(revision 1523)
@@ -1175,10 +1175,10 @@
  // Function: Wordt dit programma in development-omgeving uitgevoerd of niet
  // ==========================================================================================================================================
 InDevelop()
-	Quit ($ZCVT($ZU(110),"U")="CACHE02")
- 
+	quit ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="DEV"
+	
 InWebDevelop()
-	Quit ("WWW01/CACHE01"'[$ZCVT($ZU(110),"U"))
+	quit ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="DMZ-DEV"
  
  
  // ==========================================================================================================================================
Index: WS/EC/WebShopServer.cls.xml
===================================================================
diff -u -r1074 -r1523
--- WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1074)
+++ WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1523)
@@ -3,15 +3,15 @@
 <Class name="WS.EC.WebShopServer">
 <IncludeCode>BL.EC.Common,BL.Derde.KlantSpecifiek</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="errWrongLogin">
 <Default>WrongLogin</Default>
 </Parameter>
 
 <Parameter name="errMultipleKlanten">
-<Default>WrongClient</Default>
+<Default>MultipleClient</Default>
 </Parameter>
 
 <Parameter name="errNoAccessRight">
@@ -43,6 +43,16 @@
 <Default>http://vhisie.vanhoecke.be</Default>
 </Parameter>
 
+<Method name="PeekServer">
+<Description>
+PeekServer</Description>
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit 1_" - "_$$$Server_" - "_$$$NSpace_" - "_..%ClassName(1)
+]]></Implementation>
+</Method>
+
 <Method name="GetOfferteInfo">
 <Description>
 GetOfferteInfo</Description>
@@ -126,13 +136,58 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekKlant">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>SessionID:%String,ZoekString:%String,ZoekType:WS.EC.enu.ZoekType=""</FormalSpec>
+<ReturnType>BL.EC.pxDynaPlug</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
+	$$$blSession
+   	Set Status=%blSession.ReInstateSession(SessionID)
+   	
+   	Quit:$IsObject(Status) $$$dpStatusERR(..#errInvalidSession)
+	
+	set pxDynaPlug = ##class(BL.EC.pxDynaPlug).Create($$$OK)
+	
+	set intZoekType = ZoekType
+	if ZoekType = ##class(WS.EC.enu.ZoekType).NaamOfNummer() {
+		set intZoekType = ""
+	}
+	elseif ZoekType = ##class(WS.EC.enu.ZoekType).Woonplaats() {
+		set intZoekType = "W"
+	}
+	elseif ZoekType = ##class(WS.EC.enu.ZoekType).PostCode() {
+		set intZoekType = "P"
+	}
+	elseif ZoekType = ##class(WS.EC.enu.ZoekType).Straat() {
+		set intZoekType = "S"
+	}
+	
+	set rsKlanten = ##class(%ResultSet).%New("BL.EC.Toegang:ZoekKlant")
+	do rsKlanten.Execute(ZoekString,intZoekType)
+	while (rsKlanten.Next()) && (pxDynaPlug.Klanten.Size < 200 ) {
+		set KlantInfo = ##class(BL.EC.sub.pxKlantInfo).%New()
+		set KlantInfo.Nummer = rsKlanten.Data("Nummer")
+		set KlantInfo.Naam = rsKlanten.Data("Naam")
+		set KlantInfo.Woonplaats = rsKlanten.Data("Woonplaats")
+		do pxDynaPlug.Klanten.Insert(KlantInfo)
+	}
+	
+	Quit pxDynaPlug
+]]></Implementation>
+</Method>
+
 <Method name="Confirm">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>SessionID:%String,pxDynaPlug:BL.EC.pxDynaPlug</FormalSpec>
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+   $$$TECHErrorTrapOn
 
+
    #Include BL.EC.Common
 
    $$$blSession
@@ -155,7 +210,9 @@
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+   $$$TECHErrorTrapOn
 
+
    #Include BL.EC.Common
 
    $$$blSession
@@ -171,105 +228,159 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Transfer">
+<Method name="MeerdereKlanten">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type,Optie,Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein=""</FormalSpec>
+<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein=""</FormalSpec>
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
-	Set Type = $ZCVT(Type,"U")
-	If ( Type="DYNASHOP" ) || (Type = "DYNAPLAN" ) Do
-	. Set Result=$$DynaPlug()
-	ELse  Do
-	. Set Result=##class(BL.EC.pxDynaPlug).%New()
-	. Set Result.Status="Transfer type unknown: "_Type_" ("_$ZN_")"
-	. Set Result.Omschrijving="Transfer type unknown: "_Type_" ("_$ZN_")"
+	if ..IsValidLogon(.dpStatus,GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP,Domein,.LogIn) {
+		set dpStatus = ##class(BL.EC.pxDynaPlug).Create($$$OK)
+		set dpStatus.MeerdereKlanten =  LogIn.MultipleKlanten
+		if $IsObject(LogIn) set dpStatus.SessionID = LogIn.SessionKey
+	}
+	quit dpStatus
+]]></Implementation>
+</Method>
 
-  	Quit Result
-	
-	;===============================================================================================	
-	; Dynalog DYNAPLUG transfer
-	;===============================================================================================	
-DynaPlug()
-	
-	
-	#define KlantLVanHoeckeInMultipleKlanten(%v)  ##class(Derde.EC.Toegang).%OpenId(%v).Klanten.Find($$$KlantLVanHoecke)
+<Method name="GetMinDynalogVersion">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<Implementation><![CDATA[	quit $piece($get(^KPR(0,"DYNAPLUG")),"\",1)
+]]></Implementation>
+</Method>
 
+<Method name="GetLatestDynalogVersion">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<Implementation><![CDATA[	quit $piece($get(^KPR(0,"DYNAPLUG")),"\",2)
+]]></Implementation>
+</Method>
 
-	;do WLIP^vhDBG(195,"DynaplugVersion " _ DynaplugVersion)
-	;do WLIP^vhDBG(195,"DynalogVersion "_  DynalogVersion )
+<Method name="GetMinDynaplugVersion">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<Implementation><![CDATA[	quit $piece($get(^KPR(0,"DYNAPLUG")),"\",3)
+]]></Implementation>
+</Method>
 
-	;------------------------------------------------------------------
-	;dynaplug version check
-	If (DynaplugVersion)<($$GetMinDynaplugVersion) Do  Quit dpStatus
-	. Set dpStatus=##class(BL.EC.pxDynaPlug).%New()
-	. Set dpStatus.Status=$$$DynaPlugTranslate(..#errDynaplugVersionOutOfDate)   
-	. Set dpStatus.Omschrijving=dpStatus.Status   
-	;------------------------------------------------------------------
-	;dynalog version check
-	If (DynalogVersion)<($$GetMinDynalogVersion) Do  Quit dpStatus
-	. Set dpStatus=##class(BL.EC.pxDynaPlug).%New()
-	. Set dpStatus.Status=$$$DynaPlugTranslate(..#errDynalogVersionOutOfDate)  
-	. Set dpStatus.Omschrijving=dpStatus.Status   
-	;------------------------------------------------------------------
+<Method name="GetLatestDynaplugVersion">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<Implementation><![CDATA[	quit $piece($get(^KPR(0,"DYNAPLUG")),"\",4)
+]]></Implementation>
+</Method>
 
-
-	;Indien '' als charstring wo doorgegeven dan bevat deze mogelijk toch een null char (deze verwijderen)
-	Set Optie=$$$StripC0(Optie)
-	
+<Method name="IsValidLogon">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&dpStatus,GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP,Domein,&LogIn]]></FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
 	$$$blGeneral
 	$$$blSession
 
-	Set EncryptType=$$$liMD5+$$$liBase64
-	Set dpStatus=%blSession.LogInUser(GebruikersNaam,WachtWoordEncrypt,EncryptType,Taal,Domein,ClientIP,.LogIn)
-	If $isObject(dpStatus) Quit $$$dpStatusERR(..#errWrongLogin)
-	If '$isObject(LogIn) Quit $$$dpStatusERR(..#errWrongLogin)
+	set Logger = ##class(BL.EC.DynaplugLogger).%New()
 
-	Set blnMultipleKlanten = 0
-	If LogIn.MultipleKlanten  Do  // test of gebruiker een KS-er is .. Klant "L VAN HOECKE" gebruiken
-	. Set blnMultipleKlanten=$$$Not($$$KlantLVanHoeckeInMultipleKlanten(%blSession.Session.ToegangID))  
-	. Set:$$$Not(blnMultipleKlanten) LogIn.KlantNr = $$$KlantLVanHoecke  
+	set Errors = ##class(ListOfDataTypes).%New()
 	
-	Quit:blnMultipleKlanten $$$dpStatusERR(..#errMultipleKlanten)  // stoppen indien meerdere klanten
-	
-	Set SessionKey=LogIn.SessionKey
-	$$$ReInstateSession(SessionKey)
-	Set dpStatus=%blSession.SetKlant(LogIn.KlantNr,.Taal)
-	If '%blSession.HasAccessTo($$$tgWebShop) Quit $$$dpStatusERR(..#errNoAccessRight)
-	$$$AddToLog("I","EDI DynaPlug","LogIn","User:"_$G(GebruikersNaam)_", DynaplugVersion:"_$G(DynaplugVersion)_", Version:"_$G(DynalogVersion)_", EncryptT:"_$G(EncryptType)_", Domein:"_$G(Domein)_", Opties: "_Optie_", IP:"_$G(ClientIP))
-	
-	$$$blDynaPlug
+	;dynaplug type controle
+	Set Type = $ZCVT(Type,"U")
+	if Type'?1(1"DYNASHOP",1"DYNAPLAN")  { 
+		do Errors.Insert("Transfer type unknown: "_Type) 
+		do Logger.Warning("Transfer type unknown:","User:"_GebruikersNaam_", Type : "_Type)
+	}
 
-	Set dpStatus=%blDynaPlug.Transfer(Data, Optie, DynaplugVersion, Taal , Type)
-	
-	if (DynalogVersion < $$GetLatestDynalogVersion) {
-	  	set dpStatus.VersionUpdateInfo = $$$DynaPlugTranslate("NewDynalogVersionAvailable")
+	;dynaplug version check
+	if (DynaplugVersion)<(..GetMinDynaplugVersion()) {
+		do Errors.Insert($$$DynaPlugTranslate(..#errDynaplugVersionOutOfDate))
+		do Logger.Warning(..#errDynaplugVersionOutOfDate,"User:"_GebruikersNaam_", Version : "_DynaplugVersion)
 	}
-	if (DynaplugVersion < $$GetLatestDynaplugVersion) {
-		
-		set:$length(dpStatus.VersionUpdateInfo) dpStatus.VersionUpdateInfo = dpStatus.VersionUpdateInfo _ $$$CRLF
-		set dpStatus.VersionUpdateInfo = dpStatus.VersionUpdateInfo _ $$$DynaPlugTranslate("NewDynaplugVersionAvailable")
-		
+
+	;dynalog version check
+	If (DynalogVersion)<(..GetMinDynalogVersion()) {
+		do Errors.Insert($$$DynaPlugTranslate(..#errDynalogVersionOutOfDate))
+	 	do Logger.Warning(..#errDynalogVersionOutOfDate,"User:"_GebruikersNaam_", Version : "_DynalogVersion)
 	}
+
+	; login user	
+	Set EncryptType=$$$liMD5+$$$liBase64
 	
+	set CanLogon = %blSession.LogInUser(GebruikersNaam,WachtWoordEncrypt,EncryptType,Taal,Domein,ClientIP,.LogIn)
+	If $isObject(CanLogon) || '$IsObject(LogIn) { 
+		do Errors.Insert($$$DynaPlugTranslate(..#errWrongLogin))
+		do Logger.Warning(..#errWrongLogin,"User:"_GebruikersNaam)
+	}
 	
-	Quit dpStatus
+	set blnValid = ( Errors.Size = 0 )
 	
-	#define VersionInfo(%Field)		$piece($get(^KPR(0,"DYNAPLUG")),"\",%Field)
+	if 'blnValid {
+		set dpStatus = ##class(BL.EC.pxDynaPlug).%New()
+		set dpStatus.Status = "Error"
+		set dpStatus.Omschrijving = ##class(TECH.ListUtils).ListToPieces(Errors,$$$CRLF)
+	}
 
+	Quit blnValid
+]]></Implementation>
+</Method>
 
-GetMinDynalogVersion()
-	Quit $$$VersionInfo(1)
+<Method name="Transfer">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>GebruikersNaam,WachtWoordEncrypt,Type="",Optie="",Data:%GlobalCharacterStream,Taal,DynaplugVersion,DynalogVersion,ClientIP="",Domein="",KlantNummer=""</FormalSpec>
+<ReturnType>BL.EC.pxDynaPlug</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[
 	
-GetLatestDynalogVersion()	
-	Quit $$$VersionInfo(2)
+	$$$TECHErrorTrapOn
 	
-GetMinDynaplugVersion()
-	Quit $$$VersionInfo(3)
+	set Logger = ##class(BL.EC.DynaplugLogger).%New()
+	do Logger.Info("Transfer - Logon","User:"_GebruikersNaam_", Type : "_Type_", DynaplugVersion:"_DynaplugVersion_", Version:"_DynalogVersion_", IP:"_ClientIP_", Domein:"_Domein_", Opties: "_Optie)
 	
-GetLatestDynaplugVersion()	
-	Quit $$$VersionInfo(4)
+	if ..IsValidLogon(.dpStatus,GebruikersNaam,WachtWoordEncrypt,Type,Taal,DynaplugVersion,DynalogVersion,ClientIP,Domein,.LogIn) {
+		
+		Set Optie=$$$StripC0(Optie)
+	
+		$$$blGeneral
+		$$$blSession
+
+		set blnMultipleKlanten = 0
+		if ( LogIn.MultipleKlanten )&&('$length(KlantNummer))  set blnMultipleKlanten = 1  
+		
+		if 'blnMultipleKlanten {	// stoppen indien meerdere klanten
+	
+			if $length(KlantNummer) set LogIn.KlantNr = KlantNummer   // als klant is meebinnen gekomen keihard zetten
+		
+			Set SessionKey=LogIn.SessionKey
+			$$$ReInstateSession(SessionKey)
+			
+			set dpStatus=%blSession.SetKlant(LogIn.KlantNr,.Taal)
+			
+			if %blSession.HasAccessTo($$$tgWebShop) {
+				do Logger.Info("Transfer - HasAccess","User:"_GebruikersNaam_", DynaplugVersion:"_DynaplugVersion_", Version:"_DynalogVersion_", Domein:"_Domein_", Opties: "_Optie_", IP:"_ClientIP)
+			
+				$$$blDynaPlug
+				Set dpStatus=%blDynaPlug.Transfer(Data, Optie, DynaplugVersion, Taal , Type)
+			
+				if (DynalogVersion < ..GetLatestDynalogVersion()) {
+			  		set dpStatus.VersionUpdateInfo = $$$DynaPlugTranslate("NewDynalogVersionAvailable")
+				}
+				if (DynaplugVersion < ..GetLatestDynaplugVersion()) {
+					set:$length(dpStatus.VersionUpdateInfo) dpStatus.VersionUpdateInfo = dpStatus.VersionUpdateInfo _ $$$CRLF
+					set dpStatus.VersionUpdateInfo = dpStatus.VersionUpdateInfo _ $$$DynaPlugTranslate("NewDynaplugVersionAvailable")
+				}
+			}
+			else {
+				set dpStatus = $$$dpStatusERR(..#errNoAccessRight)
+				do Logger.Warning(..#errNoAccessRight,"User:"_GebruikersNaam)
+			}
+		}
+		else {
+			set dpStatus = $$$dpStatusERR(..#errMultipleKlanten) 
+			do Logger.Warning(..#errMultipleKlanten,"User:"_GebruikersNaam) 
+		}
+	}
+	
+	Quit dpStatus
 ]]></Implementation>
 </Method>
 
Index: WS/TBX/DataIOWWW.cls.xml
===================================================================
diff -u -r1074 -r1523
--- WS/TBX/DataIOWWW.cls.xml	(.../DataIOWWW.cls.xml)	(revision 1074)
+++ WS/TBX/DataIOWWW.cls.xml	(.../DataIOWWW.cls.xml)	(revision 1523)
@@ -4,7 +4,7 @@
 <Description>
 Web Service voor Import/Export van data
 Class WS.TBX.DataIOWWW Extends %VHSys.SOAP.WebService [ ProcedureBlock ]</Description>
-<IncludeCode>%VHMacro</IncludeCode>
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SOAP.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
Index: BL/EC/DynaPlug.cls.xml
===================================================================
diff -u -r1133 -r1523
--- BL/EC/DynaPlug.cls.xml	(.../DynaPlug.cls.xml)	(revision 1133)
+++ BL/EC/DynaPlug.cls.xml	(.../DynaPlug.cls.xml)	(revision 1523)
@@ -407,10 +407,11 @@
     If flagIgnored Set flagSave = $$$shHiddenByDynaPlug
     Else  Set flagSave = $$$shShownForKlant
     
-    Set Result = ( WSDataIO.UpdateWSOrdPropts(WSOrdID,$$$WSInternalSecureKey,"ShowInHist",flagSave) = "" )
-   
+    set resUpdateWSOrdPropts = WSDataIO.UpdateWSOrdPropts(WSOrdID,$$$WSInternalSecureKey,"ShowInHist",flagSave)
+    
+    Set Result = ( resUpdateWSOrdPropts = "" )
+    
     Set $ZTRAP=""
-
     Quit Result
 
 onSetWSOrdShowInHistory
Index: BL/EC/pxDynaPlug.cls.xml
===================================================================
diff -u -r1074 -r1523
--- BL/EC/pxDynaPlug.cls.xml	(.../pxDynaPlug.cls.xml)	(revision 1074)
+++ BL/EC/pxDynaPlug.cls.xml	(.../pxDynaPlug.cls.xml)	(revision 1523)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="BL.EC.pxDynaPlug">
-<IncludeCode>%VHMacro</IncludeCode>
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -24,6 +24,11 @@
 <Collection>list</Collection>
 </Property>
 
+<Property name="Klanten">
+<Type>BL.EC.sub.pxKlantInfo</Type>
+<Collection>list</Collection>
+</Property>
+
 <Property name="SessionID">
 <Type>%String</Type>
 </Property>
@@ -36,6 +41,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="MeerdereKlanten">
+<Type>%Boolean</Type>
+</Property>
+
 <Method name="Create">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Status,Omschrijving</FormalSpec>
@@ -50,16 +59,18 @@
 
 <Method name="TestFillDO">
 <Description>
-Test method for  ..FillTBXDesignOptions() </Description>
+Test method for  ..FillTBXDesignOptions() 
+do ##class(BL.EC.pxDynaPlug).TestFillDO()</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Taal:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	 d WLIP^vhDBG(97,"Start Test Fill DOpts")
-	 d WL^vhDBG("timer "_$$RestartTimer^vhLib())
-	Set pxDynaPlug=..Create("TEST","Test van Wim")
-	Set sc=pxDynaPlug.FillTBXDesignOptions(.Taal)
-	 d WL^vhDBG("time to fill DO's "_$$RestartTimer^vhLib())
-	 d ObjToXMLFile^vhLib(pxDynaPlug,"\\Notes01\DataWV\Temp\pxDynaplug.xml","DYNAPLUG")   ; d WX^vhDBG(pxDynaPlug)
+	 d WLIP^vhDBG(195,"Start Test Fill DOpts")
+	 d WLIP^vhDBG(195,"timer "_$$RestartTimer^vhLib())
+	 Set pxDynaPlug=..Create("TEST","Test van Wim")
+	 Set sc=pxDynaPlug.FillTBXDesignOptions(.Taal)
+	 d WLIP^vhDBG(195,"time to fill DO's "_$$RestartTimer^vhLib())
+	 d ObjToXMLFile^vhLib(pxDynaPlug,"\\Notes01\DataWV\Temp\pxDynaplug.xml","DYNAPLUG")   
+	 d WXIP^vhDBG(195,pxDynaPlug)
 	Quit
 ]]></Implementation>
 </Method>