Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml
===================================================================
diff -u -r60393 -r60532
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 60393)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 60532)
@@ -25,7 +25,7 @@
 <Implementation><![CDATA[
 	quit:$$$Not(..IsActief())	
 	
-	#dim Request as WS.Transsmart.tns.doBooking = ..RequestBouwer.MaakdoBookingRequest(..LeveringInfo,..Rit) // moet de reference gaan bepalen.
+	#dim Request as WS.Transsmart.tns.doBooking = ..RequestBouwer.MaakdoBookingRequest(..LeveringInfo,..Rit)
 	do ..ControleerLevering()
 	
 	do ..VerwerkRequest(Request)
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml
===================================================================
diff -u -r60397 -r60532
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml	(.../AnnuleerLevering.cls.xml)	(revision 60397)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/AnnuleerLevering.cls.xml	(.../AnnuleerLevering.cls.xml)	(revision 60532)
@@ -10,7 +10,7 @@
 	Set itLijstVerzendData = ##class(TECH.ListIterator).%New(..VerzendDataLijst)
 	While itLijstVerzendData.HasNext() {
 		#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData = itLijstVerzendData.Next()
-		#dim Request as WS.Transsmart.tns.doDeleteBooking = ..RequestBouwer.MaakdoDeleteRequest(VerzendData) // moet de reference gaan bepalen.
+		#dim Request as WS.Transsmart.tns.doDeleteBooking = ..RequestBouwer.MaakdoDeleteRequest(VerzendData)
 		Do ..VerwerkRequest(Request)
 		Do ..Levering.VerwijderEnBewaarDistributeurDataID(VerzendData.GeefID())
 	}
Index: APPS/TRANSP/Transsmart/enu/VerzendStatus.cls.xml
===================================================================
diff -u -r59653 -r60532
--- APPS/TRANSP/Transsmart/enu/VerzendStatus.cls.xml	(.../VerzendStatus.cls.xml)	(revision 59653)
+++ APPS/TRANSP/Transsmart/enu/VerzendStatus.cls.xml	(.../VerzendStatus.cls.xml)	(revision 60532)
@@ -14,21 +14,21 @@
 <Method name="Started">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.VerzendStatus</ReturnType>
-<Implementation><![CDATA[	quit "Started"
+<Implementation><![CDATA[	Quit "Started"
 ]]></Implementation>
 </Method>
 
 <Method name="Finished">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.VerzendStatus</ReturnType>
-<Implementation><![CDATA[	quit "Finished"
+<Implementation><![CDATA[	Quit "Finished"
 ]]></Implementation>
 </Method>
 
 <Method name="Failed">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.VerzendStatus</ReturnType>
-<Implementation><![CDATA[	quit "Failed"
+<Implementation><![CDATA[	Quit "Failed"
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/Transsmart/enu/RequestType.cls.xml
===================================================================
diff -u -r59651 -r60532
--- APPS/TRANSP/Transsmart/enu/RequestType.cls.xml	(.../RequestType.cls.xml)	(revision 59651)
+++ APPS/TRANSP/Transsmart/enu/RequestType.cls.xml	(.../RequestType.cls.xml)	(revision 60532)
@@ -14,14 +14,14 @@
 <Method name="Registratie">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.RequestType</ReturnType>
-<Implementation><![CDATA[	quit "Registratie"
+<Implementation><![CDATA[	Quit "Registratie"
 ]]></Implementation>
 </Method>
 
 <Method name="Annulatie">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.RequestType</ReturnType>
-<Implementation><![CDATA[	quit "Annulatie"
+<Implementation><![CDATA[	Quit "Annulatie"
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r60393 -r60532
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 60393)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 60532)
@@ -47,8 +47,8 @@
 		Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
 		Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	}
-	else {
-		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
+	Else {
+		If ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
 		{ 
 			Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
 			Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
@@ -100,22 +100,6 @@
 		
 		Set BerichtVoorGebruiker = Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_"Gelieve zelf of via OV actie te ondernemen."
 		Do ##class(vhLib.Logger).%New("Transsmart").Warning(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-	/*		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).FoutmeldingTeMeldenAanGebruiker()){
-
-		Set BerichtVoorGebruiker = Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_"Gelieve zelf of via OV actie te ondernemen."
-		Do ##class(vhLib.Logger).%New("GLS").Warning(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).InterneWaarschuwing()){
-		
-		Set BerichtVoorGebruiker = Error.Niveau_$C(13,10)_"Dit is enkel een waarschuwing. Code en data zijn correct."
-		Do ##class(vhLib.Logger).%New("GLS").WarningMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-		
-	}ElseIf(Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).PleaseRetryError()){
-		
-		Set BerichtVoorGebruiker = "Niet gelukt. Gelieve opnieuw te proberen."
-		Do ##class(vhLib.Logger).%New("GLS").WarningMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
-	*/	
 	}Else{
 		Set BerichtVoorGebruiker = Error.Niveau_$$$CRLF_"Dit probleem moet door ICT opgelost worden."		
 		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail(CallingMethod,(BerichtVoorGebruiker_..GeefBerichtVoorICT(Error)))
@@ -144,7 +128,6 @@
 		Do Exception.Rethrow()
 	}	
 	Quit Response
-	; todo invalid requesttype opvangen
 ]]></Implementation>
 </Method>
 
@@ -154,12 +137,10 @@
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
 <Implementation><![CDATA[
-	#Dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData
-	if $length(ID) {
-		;set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).OpenId(ID)
+	#dim VerzendData As APPS.TRANSP.Transsmart.data.VerzendData
+	If $length(ID) {
 		Set VerzendData = ..VerzendDataRepository.GeefViaID(ID)
-	} else {
-	  	;set VerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()		
+	} Else {
 	  	Set VerzendData = ..VerzendDataRepository.Maak()
 	}
 	Quit VerzendData
@@ -170,9 +151,7 @@
 <FormalSpec>Error:APPS.TRANSP.Transsmart.Error</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#Dim BerichtVoorICT As %String = $$$CRLF_Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_$$$CRLF
-	Quit BerichtVoorICT
+<Implementation><![CDATA[	Quit $$$CRLF_Error.ErrorCode_": "_Error.Omschrijving_$$$CRLF_$$$CRLF
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml
===================================================================
diff -u -r59862 -r60532
--- APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml	(.../ResponseControleur.cls.xml)	(revision 59862)
+++ APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml	(.../ResponseControleur.cls.xml)	(revision 60532)
@@ -31,7 +31,7 @@
 		Set Fout.ErrorCode = Response.statusResponseInfo.requestType _":"_ Response.statusResponseInfo.status
 		Set Fout.Omschrijving = ##class(TECH.StringUtils).Replace(Response.statusResponseInfo.description,"""] [","""]"_$$$CRLF_"[")	
 	} else {
-		Set Fout.ErrorCode = "TBD" ;TODO
+		Set Fout.ErrorCode = "TBD"
 		Set Fout.Omschrijving = "Shipment status code is "_	Response.shipmentStatus.shipmentStatusCode
 	}
 	
@@ -44,7 +44,6 @@
 <Private>1</Private>
 <ReturnType>TECH.Exceptions.enu.Niveau</ReturnType>
 <Implementation><![CDATA[
-	; Nog verder te detailleren ifv Errorcode -> try again stuff
 	
 	Quit ##class(TECH.Exceptions.enu.Niveau).Waarschuwing()
 ]]></Implementation>
Index: APPS/TRANSP/Transsmart/enu/ShipmentStatusCode.cls.xml
===================================================================
diff -u -r59652 -r60532
--- APPS/TRANSP/Transsmart/enu/ShipmentStatusCode.cls.xml	(.../ShipmentStatusCode.cls.xml)	(revision 59652)
+++ APPS/TRANSP/Transsmart/enu/ShipmentStatusCode.cls.xml	(.../ShipmentStatusCode.cls.xml)	(revision 60532)
@@ -14,77 +14,77 @@
 <Method name="New">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "NEW"
+<Implementation><![CDATA[	Quit "NEW"
 ]]></Implementation>
 </Method>
 
 <Method name="Book">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "BOOK"
+<Implementation><![CDATA[	Quit "BOOK"
 ]]></Implementation>
 </Method>
 
 <Method name="Refu">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "REFU"
+<Implementation><![CDATA[	Quit "REFU"
 ]]></Implementation>
 </Method>
 
 <Method name="Labl">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "LABL"
+<Implementation><![CDATA[	Quit "LABL"
 ]]></Implementation>
 </Method>
 
 <Method name="Mani">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "MANI"
+<Implementation><![CDATA[	Quit "MANI"
 ]]></Implementation>
 </Method>
 
 <Method name="Accep">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "ACCEP"
+<Implementation><![CDATA[	Quit "ACCEP"
 ]]></Implementation>
 </Method>
 
 <Method name="Trns">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "TRNS"
+<Implementation><![CDATA[	Quit "TRNS"
 ]]></Implementation>
 </Method>
 
 <Method name="Done">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "DONE"
+<Implementation><![CDATA[	Quit "DONE"
 ]]></Implementation>
 </Method>
 
 <Method name="Err">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "ERR"
+<Implementation><![CDATA[	Quit "ERR"
 ]]></Implementation>
 </Method>
 
 <Method name="Del">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "DEL"
+<Implementation><![CDATA[	Quit "DEL"
 ]]></Implementation>
 </Method>
 
 <Method name="Apod">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.Transsmart.enu.ShipmentStatusCode</ReturnType>
-<Implementation><![CDATA[	quit "APOD"
+<Implementation><![CDATA[	Quit "APOD"
 ]]></Implementation>
 </Method>
 </Class>