Index: WS/TBX/Order.cls.xml
===================================================================
diff -u -r252 -r319
--- WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 252)
+++ WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 319)
@@ -5,20 +5,147 @@
 <IncludeCode>PRGACNTs,APPS.TBXWeb,TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <SqlTableName>WebOrder</SqlTableName>
-<Super>WS.TBX.OrderAbstract</Super>
+<Super>%Persistent,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Index name="PrimaryIndex">
+<IdKey>1</IdKey>
+<PrimaryKey>1</PrimaryKey>
+<Properties>mID</Properties>
+<Unique>1</Unique>
+</Index>
+
+<Index name="IndexKLNr">
+<Properties>KLNummer</Properties>
+</Index>
+
+<Index name="IndexWebDomain">
+<Properties>WebDomain</Properties>
+</Index>
+
 <Index name="IndexHist">
 <Properties>ShowInHist</Properties>
 </Index>
 
+<Property name="mID">
+<Description>
+ID van het object</Description>
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Parameter name="XMLNAME" value="ID"/>
+</Property>
+
+<Property name="Taal">
+<Description>
+Taal van de aanvrager</Description>
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="TAAL"/>
+</Property>
+
+<Property name="BonType">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="BONTYPE"/>
+</Property>
+
+<Property name="LeverTijd">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="LEVERTIJD"/>
+</Property>
+
+<Property name="LeverTijdID">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="LEVERTIJDID"/>
+</Property>
+
+<Property name="Commissie">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KLANTORDERREF"/>
+</Property>
+
+<Property name="IngaveTijdStip">
+<Type>%TimeStamp</Type>
+<Parameter name="XMLNAME" value="INGAVETIJDSTIP"/>
+</Property>
+
+<Property name="KLNaam">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="100"/>
+<Parameter name="TRUNCATE" value="1"/>
+<Parameter name="XMLNAME" value="KL_NAAM"/>
+</Property>
+
+<Property name="KLNummer">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_NUMMER"/>
+</Property>
+
+<Property name="KLStraatNrBus">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_STRAATNRBUS"/>
+</Property>
+
+<Property name="KLPostNr">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_POSTNR"/>
+</Property>
+
+<Property name="KLWoonPlaats">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_WOONPLAATS"/>
+</Property>
+
+<Property name="KLTelefoon">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_TELEFOON"/>
+</Property>
+
+<Property name="KLFax">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_FAX"/>
+</Property>
+
+<Property name="KLEMail">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_EMAIL"/>
+</Property>
+
+<Property name="KLPrijsKlasse">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_AFDRUKCODE"/>
+</Property>
+
+<Property name="KLKorting">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_KORTING"/>
+</Property>
+
+<Property name="KLBTWNr">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="KL_BTWNR"/>
+</Property>
+
 <Property name="Lijnen">
 <Type>WS.TBX.EM.OrderLijn</Type>
 <Collection>array</Collection>
 <Parameter name="XMLNAME" value="WEBLIJN"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
+<Property name="TotPrijs">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="TOTPRIJS"/>
+</Property>
+
+<Property name="TotAantal">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="TOTAANTAL"/>
+</Property>
+
+<Property name="WebDomain">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="WEBDOMAIN"/>
+</Property>
+
 <Property name="WebURL">
 <Type>%String</Type>
 <Parameter name="MAXLEN" value="500"/>
@@ -37,6 +164,17 @@
 <Parameter name="XMLNAME" value="EXTRA_TEKST"/>
 </Property>
 
+<Property name="OrderNr">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<Parameter name="XMLNAME" value="ORDERNR"/>
+</Property>
+
+<Property name="SubmitTS">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="SUBMITTS"/>
+</Property>
+
 <Property name="TransfStatus">
 <Type>%String</Type>
 <Parameter name="XMLNAME" value="TRANSFSTATUS"/>
@@ -60,6 +198,13 @@
 <Parameter name="XMLPROJECTION" value="NONE"/>
 </Property>
 
+<Property name="Opmerking1">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="500"/>
+<Parameter name="TRUNCATE" value="1"/>
+<Parameter name="XMLNAME" value="OPMERKING1"/>
+</Property>
+
 <Property name="NietMeeleveren">
 <Description>
 De optie Niet Meeleveren wordt toegepast op alle lijnen van het order.  Vandaar als propt. van de hoofding i.p.v. de lijnen 
@@ -79,6 +224,15 @@
 <Parameter name="XMLNAME" value="NIETMEE_OMS"/>
 </Property>
 
+<Property name="Munt">
+<Description>
+Waarde wordt on-the-flight berekend en ingevuld (proxy) </Description>
+<Type>%String</Type>
+<Transient>1</Transient>
+<Parameter name="XMLIO" value="OUT"/>
+<Parameter name="XMLNAME" value="MUNT"/>
+</Property>
+
 <Property name="MeldingOfferteGeldig">
 <Description>
 Waarde wordt on-the-flight berekend en ingevuld (proxy) </Description>
@@ -104,7 +258,7 @@
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%Library.Status</ReturnType>
 <Implementation><![CDATA[
-#define StorageIndexNode ^WS.TBX.OrderAbstractD
+#define StorageIndexNode ^WS.TBX.OrderD
  Set:(IsNew)||(..IngaveTijdStip="") ..IngaveTijdStip=$ZDT($H,3)
  Set id=+..mID
  If 'id Set id=$INCREMENT($$$StorageIndexNode)
@@ -913,6 +1067,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OrderNrGet">
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..OrderNrCalc(..mID)
+]]></Implementation>
+</Method>
+
+<Method name="OrderNrCalc">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Nr:%String</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set:($G(Nr,0)=0) Nr=""   ; %this.mID
+	Quit $S($IsValidNum(Nr):1000000+Nr , 1:Nr)
+]]></Implementation>
+</Method>
+
 <Method name="IDViaEDINr">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>EDINr:%String,blnCheckID:%Boolean=1</FormalSpec>
@@ -961,45 +1133,113 @@
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
+<DataLocation>^WS.TBX.OrderD</DataLocation>
 <DefaultData>OrderDefaultData</DefaultData>
+<IdLocation>^WS.TBX.OrderD</IdLocation>
+<IndexLocation>^WS.TBX.OrderI</IndexLocation>
+<StreamLocation>^WS.TBX.OrderS</StreamLocation>
 <Data name="Lijnen">
 <Attribute>Lijnen</Attribute>
 <Structure>subnode</Structure>
-<Subscript>"Lijnen"</Subscript>
+<Subscript>"LN"</Subscript>
 </Data>
 <Data name="OrderDefaultData">
-<Structure>listnode</Structure>
-<Subscript>"Order"</Subscript>
 <Value name="1">
-<Value>ActieCodesList</Value>
+<Value>%%CLASSNAME</Value>
 </Value>
 <Value name="2">
-<Value>NietMeeleveren</Value>
+<Value>BonType</Value>
 </Value>
 <Value name="3">
-<Value>ShowInHist</Value>
+<Value>Commissie</Value>
 </Value>
 <Value name="4">
-<Value>SubmitToVHLog</Value>
+<Value>IngaveTijdStip</Value>
 </Value>
 <Value name="5">
-<Value>TotAantal</Value>
+<Value>KLFax</Value>
 </Value>
 <Value name="6">
-<Value>TotPrijs</Value>
+<Value>KLNaam</Value>
 </Value>
 <Value name="7">
-<Value>TransfStatus</Value>
+<Value>KLNummer</Value>
 </Value>
 <Value name="8">
-<Value>TransferLog</Value>
+<Value>KLPostNr</Value>
 </Value>
 <Value name="9">
-<Value>WebQSData</Value>
+<Value>KLStraatNrBus</Value>
 </Value>
 <Value name="10">
+<Value>KLTelefoon</Value>
+</Value>
+<Value name="11">
+<Value>KLWoonPlaats</Value>
+</Value>
+<Value name="12">
+<Value>LeverTijd</Value>
+</Value>
+<Value name="13">
+<Value>Taal</Value>
+</Value>
+<Value name="14">
+<Value>TotPrijs</Value>
+</Value>
+<Value name="15">
+<Value>TotAantal</Value>
+</Value>
+<Value name="16">
+<Value>KLEMail</Value>
+</Value>
+<Value name="17">
+<Value>StdLade</Value>
+</Value>
+<Value name="18">
+<Value>WebDomain</Value>
+</Value>
+<Value name="19">
 <Value>WebURL</Value>
 </Value>
+<Value name="20">
+<Value>WebQSData</Value>
+</Value>
+<Value name="21">
+<Value>KLPrijsKlasse</Value>
+</Value>
+<Value name="22">
+<Value>SubmitTS</Value>
+</Value>
+<Value name="23">
+<Value>KLKorting</Value>
+</Value>
+<Value name="24">
+<Value>KLBTWNr</Value>
+</Value>
+<Value name="25">
+<Value>TransferLog</Value>
+</Value>
+<Value name="26">
+<Value>SubmitToVHLog</Value>
+</Value>
+<Value name="27">
+<Value>LeverTijdID</Value>
+</Value>
+<Value name="28">
+<Value>Opmerking1</Value>
+</Value>
+<Value name="29">
+<Value>NietMeeleveren</Value>
+</Value>
+<Value name="30">
+<Value>ShowInHist</Value>
+</Value>
+<Value name="31">
+<Value>TransfStatus</Value>
+</Value>
+<Value name="32">
+<Value>ActieCodesList</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
FishEye: Tag 319 refers to a dead (removed) revision in file `vhUnitTest/APPS/TBXWeb/TestOrderVerwerkService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 319 refers to a dead (removed) revision in file `APPS/TBXWeb/OrderVerwerkService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r283 -r319
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 283)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 319)
@@ -927,15 +927,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkWebOrder">
+<Method name="WSOrdToAdmin">
 <Description>
 Transfer van een WSOrder naar ADMIN via WEB-SERVICE. Creëert daar een Flow.Offerte.Hoofding+Lijnen
 Geeft $LB(oHfd.ID,"info...") terug.</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>wsID:%String,OFFToAdmin:%String</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%List</ReturnType>
-<Implementation><![CDATA[	Quit $$VerwerkWebOrder^cspBasis.GAProdTBox.tmpDev(.wsID,.OFFToAdmin)
+<Implementation><![CDATA[	Quit $$WSOrdToAdmin^cspBasis.GAProdTBox.tmpDev(.wsID,.OFFToAdmin)
 ]]></Implementation>
 </Method>
 
FishEye: Tag 319 refers to a dead (removed) revision in file `vhUnitTest/APPS/TBXWeb/OrderVerwerkServiceMock.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 319 refers to a dead (removed) revision in file `vhDeploy/JCL/Deploy20120924CopyMakenVanTBXOrder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r296 -r319
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 296)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 319)
@@ -585,7 +585,7 @@
 	. Set %session.Data("TransfStatus")="ACTIVE"
 	. Set scStatus=##class(WS.TBX.Order).TransfStatusSetByID(wsID,"ACTIVE")
 	. ;d WL^vhDBG("Start  WSOrdToAdmin().  Status: "_$G(%session.Data("TransfStatus")))
-	. Set lbResult=##class(cspBasis.GAProdTBox).VerwerkWebOrder(wsID,$G(OFFToAdmin))   ; $LB("",$$$ERROR($$$GeneralError,"MyMessage"))   ; 
+	. Set lbResult=##class(cspBasis.GAProdTBox).WSOrdToAdmin(wsID,$G(OFFToAdmin))   ; $LB("",$$$ERROR($$$GeneralError,"MyMessage"))   ; 
 	. Set %session.Data("TransfStatus")="DONE"
 	. Set scStatus=##class(WS.TBX.Order).TransfStatusSetByID(wsID,"")
 	. ;d WL^vhDBG("Finished  WSOrdToAdmin().  Status: "_$G(%session.Data("TransfStatus")))
FishEye: Tag 319 refers to a dead (removed) revision in file `WS/TBX/GroepOrder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 319 refers to a dead (removed) revision in file `WS/TBX/OrderCopy.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: BL/PR/GA/TandemBox.cls.xml
===================================================================
diff -u -r296 -r319
--- BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 296)
+++ BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 319)
@@ -1838,6 +1838,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="WSOrdToAdmin">
+<Description>
+Omzetten van WSOrder data naar Offerte.Hoofding+Lijnen 
+Geeft als resultaat $LB(OffID,"") terug
+De Kenmerken en enkele properties zijn reeds ingevuld, maar de producten (GAData+KPR) zijn nog NIET berekend.</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>WSOrder:%String,Opties:%String,ClientAddress:%String</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+ Set:('$D(%ClientIP)) %ClientIP="192.168.1.97"
+ $$$blFlowOfferte
+ Set oHfd=##class(BL.EC.EDI).WSOrd2Offerte("",WSOrder)
+ Quit:('$IsObject(oHfd)) $LB("","No OffHoofd")
+ Do %blFlowOfferte.GenerateAll()
+ Set sc=%blFlowOfferte.SetOfferteStatus("W")
+ Set sc=%blFlowOfferte.Save()   ; oHfd.%Save()
+ Set lbResult=$S($$$ISERR(sc):$LB("",sc), 1:$LB(oHfd.%Id(),""))   ; $LB("",$$ParseStatus^vhLib(sc))
+ Quit lbResult
+]]></Implementation>
+</Method>
+
 <Method name="WSOrdToWWW">
 <Description>
 WSOrdToWWW stuurt een WS.TBX.Order object naar de server.
FishEye: Tag 253 refers to a dead (removed) revision in file `WS/TBX/CalcSoap/WSOrdToAdmin.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml
===================================================================
diff -u -r253 -r319
--- BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml	(.../pxEDIOrder.cls.xml)	(revision 253)
+++ BL/Prod/GAData/TBXLadeXML/pxEDIOrder.cls.xml	(.../pxEDIOrder.cls.xml)	(revision 319)
@@ -179,5 +179,29 @@
 <Parameter name="XMLITEMNAME" value="ACTIONCODE"/>
 <Parameter name="XMLNAME" value="ACTIONCODES"/>
 </Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Property LeverTijdID As %String(XMLNAME = "DELIVERY_ID");
+
+Property KLPrijsKlasse As %String(XMLNAME = "KL_AFDRUKCODE");
+
+Property ShowInHist As %Integer(XMLNAME = "VISIBLE_IN_HIST");
+
+Property WebDomain As %String(XMLNAME = "WEBDOMAIN");
+
+Property WebURL As %String(MAXLEN = 500, XMLNAME = "WEBURL");
+
+Property WebQSData As %String(MAXLEN = 500, XMLNAME = "WEBQSDATA");
+
+/// Logt de WSOrdToAdmin() acties: 
+/// Format: $LB($LB($H,OffID,info),$LB(prev $H, prev OffID,...), ...)
+/// Bij een nieuwe transfer wordt de log steeds vooraan toegevoegd. Gebruik hiervoor de method AddToTransferLog()
+Property TransferLog As %List(XMLPROJECTION = "NONE");
+
+*/
+]]></Content>
+</UDLText>
 </Class>
 </Export>
Index: WS/TBX/CalcSoap.cls.xml
===================================================================
diff -u -r253 -r319
--- WS/TBX/CalcSoap.cls.xml	(.../CalcSoap.cls.xml)	(revision 253)
+++ WS/TBX/CalcSoap.cls.xml	(.../CalcSoap.cls.xml)	(revision 319)
@@ -27,26 +27,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkWebOrder">
+<Method name="WSOrdToAdmin">
 <Description>
 WSOrder To Admin</Description>
-<FormalSpec>WebOrder:WS.TBX.Order</FormalSpec>
-<ReturnType>%String</ReturnType>
+<FormalSpec>WSOrd:WS.TBX.Order,Opties:%String,ClientAddress:%String</FormalSpec>
+<ReturnType>%List</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[ Quit ..WebMethod("VerwerkWebOrder").Invoke(##this,"http://tempuri.org/WS.TBX.Calc.VerwerkWebOrder",.WebOrder)
+<Implementation><![CDATA[ Quit ..WebMethod("WSOrdToAdmin").Invoke(##this,"http://tempuri.org/WS.TBX.Calc.WSOrdToAdmin",.WSOrd, .Opties, .ClientAddress)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkWebGroepOrder">
-<Description>
-WSOrder To Admin</Description>
-<FormalSpec>WebGroepOrder:WS.TBX.GroepOrder</FormalSpec>
-<ReturnType>%String</ReturnType>
-<WebMethod>1</WebMethod>
-<Implementation><![CDATA[ Quit ..WebMethod("VerwerkWebGroepOrder").Invoke(##this,"http://tempuri.org/WS.TBX.Calc.VerwerkWebGroepOrder",.WebGroepOrder)
-]]></Implementation>
-</Method>
-
 <Method name="PeekServer">
 <Final>1</Final>
 <ReturnType>%String</ReturnType>
@@ -70,14 +60,29 @@
 ]]></Implementation>
 </Method>
 
-<Method name="PrepareVerwerkWebOrder">
+<Method name="PrepareWSOrdToAdmin">
 <FormalSpec><![CDATA[&lbLocations:%String,&locNdx:%Integer,blnPeekServer:%Boolean,TimeOut:%Integer]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+#define SoapLoc      "cache01\ADMIN1"	
+#define SoapLocDEV   "cache02\DEV-ADMIN1"	
+
+	/*
+
+	;Set blnPeekServer=1
+	;Set MailParamType="TBX_ERR"
+	Set lbLocations=..GetLocations($LB($$$SoapLoc))
+	;Set lbLocations=..GetLocations($S(%RemoteIP="192.168.1.97":$LB($$$SoapLocDEV), 1:$LB($$$SoapLoc)))
+	Set locNdx=1   ; =..PeekSOAPServer(lbLocations,1,MailParamType)
+	Do ..SetLocation($LG(lbLocations,locNdx))
+	Do ..SetTimeOut(60)   ; Default
+	Quit $S(locNdx<0:0, 1:1)
+	*/
+	
 	Set WebServiceRoot = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_ProductieWebServiceLocation")
 	Set Location = ##class(TECH.Files).AppendFile(WebServiceRoot,"WS.TBX.Calc.cls")
-	Set lbLocations = $listbuild(Location)
-	Set locNdx = 1
+	Set lbLocations=$LB(Location)
+	Set locNdx=1
 	Do ..SetLocation(Location)
 	Do ..SetTimeOut(60)   ; Default
 	Quit $$$True
Index: BL/Prod/GAData/TBXLadeXML/pxPrintOrder.cls.xml
===================================================================
diff -u -r253 -r319
--- BL/Prod/GAData/TBXLadeXML/pxPrintOrder.cls.xml	(.../pxPrintOrder.cls.xml)	(revision 253)
+++ BL/Prod/GAData/TBXLadeXML/pxPrintOrder.cls.xml	(.../pxPrintOrder.cls.xml)	(revision 319)
@@ -151,5 +151,34 @@
 <Parameter name="XMLNAME" value="WEBLIJN"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Property KLPrijsKlasse As %String(XMLNAME = "KL_AFDRUKCODE");
+
+Property KLKorting As %String(XMLNAME = "KL_KORTING");
+
+Property WebDomain As %String(XMLNAME = "WEBDOMAIN");
+
+Property WebURL As %String(MAXLEN = 500, XMLNAME = "WEBURL");
+
+Property WebQSData As %String(MAXLEN = 500, XMLNAME = "WEBQSDATA");
+
+Property SubmitTS As %String(XMLNAME = "SUBMITTS");
+
+/// Logt de WSOrdToAdmin() acties: 
+/// Format: $LB($LB($H,OffID,info),$LB(prev $H, prev OffID,...), ...)
+/// Bij een nieuwe transfer wordt de log steeds vooraan toegevoegd. Gebruik hiervoor de method AddToTransferLog()
+Property TransferLog As %List(XMLPROJECTION = "NONE");
+
+/// Logt de SubmitToVHEPN acties: 
+/// Format: $LB($LB($H,info),$LB(prev $H, ...), ...)
+/// Bij een nieuwe SubmitToVHEPN wordt de log steeds vooraan toegevoegd. Gebruik hiervoor de method AddToSubmitToVHLog()
+Property SubmitToVHLog As %List(XMLPROJECTION = "NONE");
+
+*/
+]]></Content>
+</UDLText>
 </Class>
 </Export>
Index: WS/EC/WebShopClient.cls.xml
===================================================================
diff -u -r232 -r319
--- WS/EC/WebShopClient.cls.xml	(.../WebShopClient.cls.xml)	(revision 232)
+++ WS/EC/WebShopClient.cls.xml	(.../WebShopClient.cls.xml)	(revision 319)
@@ -113,22 +113,6 @@
 </Method>
 
 <Method name="CancelAll">
-<Description><![CDATA[
-This method is used internally by Cach&eacute;. You should not make direct
-use of it within your applications. There is no guarantee made about either
-the behavior or future operation of this method.		
-Execute the Web Method represented by the descriptor class on
-the server.  If an error is detected, a ztrap "SOAP" will be issued with
-%objlasterror containing the error %Status.  If is the responsibilty of the
-caller of the proxy method to set an error trap and test for $ZE["&lt;ZSOAP&gt;".
-Note that if a SOAP fault is received, then the error is $$$SOAPFaultReceived.
-
-If MethodName argument is "", then this is an internal call to send the XML body.
-In this case proxy is the character stream containing the body.
-
-This method is used internally by Cach&eacute;. You should not make direct
-use of it within your applications. There is no guarantee made about either
-the behavior or future operation of this method.		]]></Description>
 <Final>1</Final>
 <FormalSpec>SessionID:%String,pxDynaPlug:BL.EC.pxDynaPlug</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
Index: cspBasis/GAProdTBox/tmpDev.mac.rou
===================================================================
diff -u -r253 -r319
--- cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 253)
+++ cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 319)
@@ -151,9 +151,10 @@
  */
  
  
-VerwerkWebOrder(wsID,OFFToAdmin)
+WSOrdToAdmin(wsID,OFFToAdmin)
 	#define SoapMethod   1
- 	#define SoapLoc      "cache02\DEV-ADMIN1"
+ ;	#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"))
@@ -167,38 +168,55 @@
 	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
-	set lbResult = $$otaTransferWS()
+	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 $lb(Result)
+	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()
+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","VerwerkWebOrder")
+	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.PrepareVerwerkWebOrder(.lbLocations,.locNdx) ; No PeekServer, only one location
+	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 Result = Client.VerwerkWebOrder(WSOrd)
+	Set lbResult=Client.WSOrdToAdmin(WSOrd,.Opties,$G(%RemoteIP))
 	Set $ZTRAP=""
 	Quit
 otaSoapAddToLog
@@ -210,6 +228,7 @@
 	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)))
@@ -218,7 +237,7 @@
 	Set CustomMsg="WSOrd:  ID="_wsID_"  : TransferToADMIN Failed."
 	Do SOAPErrorMail^cspBasis.SOAPlib("TBX_ERR",,CustomMsg,,Client)
 	Set $ZE=""
-	Quit $lb("","Een error has occured")
+	Quit
 otaAddToLog
 	Do oxxAddToLog("TRANSF")
 	Quit
@@ -236,6 +255,7 @@
 	. 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
  
  
FishEye: Tag 319 refers to a dead (removed) revision in file `WS/TBX/OrderAbstract.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?