Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59682 -r59689
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59689)
@@ -20,32 +20,36 @@
 </Method>
 
 <Method name="IsActief">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="SetSSLConfiguration">
+<FormalSpec>SSLConfiguration:%String</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVerzendDataID">
+<FormalSpec>VerzendDataID:%String</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="ZetAuthenticationHeader">
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="MaakEtikettenLijst">
-<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<FormalSpec>VerzendData:WS.Transsmart.tns.getDocsResponse</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
-<Method name="SetSSLConfiguration">
-<FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
-</Method>
-
 <Method name="VerwerkRequest">
 <FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
 <ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
-
-<Method name="ZetAuthenticationHeader">
-<Implementation><![CDATA[]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59682 -r59689
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59689)
@@ -9,16 +9,16 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort=""</FormalSpec>
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="GeeftShipmentInfoReference">
+<Method name="GeefEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeeftShipmentInfoReference",Levering)
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEtiketten",Levering)
 ]]></Implementation>
 </Method>
 
@@ -27,23 +27,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MaakEtikettenLijst">
-<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
-<ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakEtikettenLijst",VerzendData)
-]]></Implementation>
-</Method>
-
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("SetSSLConfiguration",SSLConfiguration)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkRequest">
-<FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
-<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("VerwerkRequest",Request)
+<Method name="VerwerkVerzendDataID">
+<FormalSpec>VerzendDataID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVerzendDataID",VerzendDataID)
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/Etiket.cls.xml
===================================================================
diff -u -r59682 -r59689
--- APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59682)
+++ APPS/TRANSP/Transsmart/impl/Etiket.cls.xml	(.../Etiket.cls.xml)	(revision 59689)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.Transsmart.impl.Etiket">
-<Super>APPS.TRANSP.Transsmart.impl.CommunicatieService.Template</Super>
+<Super>APPS.TRANSP.Transsmart.impl.CommunicatieService.Template,TECH.Mockable</Super>
 
 <Property name="Zbl">
 <Type>%String</Type>
@@ -17,9 +17,9 @@
 	#dim ShipmentInfoReference As %String = GeefShipmentInfoReference(Levering)
 	#dim Request as WS.Transsmart.tns.getDocs = ..RequestBouwer.MaakgetDocsRequest(ShipmentInfoReference)
 	
-	#dim ResponseVerzendData As APPS.TRANSP.Transsmart.data.VerzendData = ..VerwerkRequest(Request)
+	#dim Response As WS.Transsmart.tns.getDocsResponse = ..GeefDocs(Request)
 	
-	#dim ZlpEtiketten As %ListOfObjects = ..MaakEtikettenLijst(ResponseVerzendData)
+	#dim ZlpEtiketten As %ListOfObjects = ..MaakEtikettenLijst(Response)
 	
 	Quit ZlpEtiketten
 ]]></Implementation>
@@ -40,53 +40,32 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkRequest">
+<Method name="GeefDocs">
 <FormalSpec>Request:WS.Transsmart.tns.getDocs</FormalSpec>
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocsResponse</ReturnType>
 <Implementation><![CDATA[
-	#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefVerzendData(Request.GeefVerzendDataID())
-	
-	#dim IsNieuweVerzendData As %Boolean = ( VerzendData.%Id() = "" )
-	if IsNieuweVerzendData {
-		set VerzendData.Reference = ..BepaalReference(Request)
-	}
-	// TODO Nodig
-	//set VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Annulatie()
-	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
-	do VerzendData.Save()
-
 	Try {
-		#dim Response As WS.Transsmart.tns.getStatusResponse = ..VerzendBericht(Request)
+		do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,Request.%ClassName(1))
+		#dim Response As WS.Transsmart.tns.getDocsResponse = ..TranssmartWSClient.getDocs(Request)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
 		Set Error =##class(APPS.TRANSP.Transsmart.Error).%New("VH99",Exception.GeefOmschrijving())
-		do ..ThrowError(Error,VerzendData)
+		do ..ThrowError(Error)
 	}
-
-	set VerzendData.Response = Response
-	
-	If ..ResponseControleur.ResponseBevatFout(Response) {
-		set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Failed()
-		do VerzendData.Save()
-		Set Error = ..ResponseControleur.GeefFoutInResponse(Response)
-		do ..ThrowError(Error, VerzendData)
-	}
 		
-	set VerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Finished()
-	do VerzendData.Save()
-	quit VerzendData
+	quit Response
 ]]></Implementation>
 </Method>
 
 <Method name="MaakEtikettenLijst">
-<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<FormalSpec>Response:WS.Transsmart.tns.getDocsResponse</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Set ZlpEtiketten = ##class(%ListOfObjects).%New()
-	set itLijstPackages = ##class(TECH.ListIterator).%New(VerzendData.Response.packages) // opgelet packages is lowercase dus zo behouden
+	set itLijstPackages = ##class(TECH.ListIterator).%New(Response.packages) // opgelet packages is lowercase dus zo behouden
 	
 	Do ##class(Tools.Wlip).%New(43).String("count ZlpEtiketten " _ ZlpEtiketten.Count())
 	
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59646 -r59689
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59646)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59689)
@@ -9,8 +9,7 @@
 
 <Method name="PrintEtikettenVoorLevering">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r59682 -r59689
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59682)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 59689)
@@ -136,7 +136,6 @@
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,Request.%ClassName(1))
 	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.doBooking") ..TranssmartWSClient.doBooking(Request)
 	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.doDelete") ..TranssmartWSClient.doDelete(Request)
-	Quit:(Request.%ClassName(1) = "WS.Transsmart.tns.getDocs") ..TranssmartWSClient.getDocs(Request)
 	;invalid requesttype
 ]]></Implementation>
 </Method>