Index: vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml
===================================================================
diff -u -r29059 -r40477
--- vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 40477)
@@ -70,7 +70,7 @@
 	Do $$$AssertEquals(LeveringInfo.Gewicht,$$$NettoGewicht)
 	Do $$$AssertEquals(LeveringInfo.OphaalTijdstip,$$$VoorzieneOphaalTimeStamp)
 	Do $$$AssertEquals(LeveringInfo.Referentie,"1X2")
-	Do $$$AssertEquals(LeveringInfo.GeleverdAanKlantID,"K||1000")
+	Do $$$AssertEquals(LeveringInfo.GeleverdAanKlantNummer,"1000")
 	Do $$$AssertEquals(LeveringInfo.Telefoon,"UnitTest_Telefoon")
 			
 	Do ..AssertAdres("VAN HOECKE nv" ,LeveringInfo.AfzenderAdres,"","BE","9100","EUROPARK - NOORD 9","HOECKE","SINT-NIKLAAS")	
Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r29059 -r40477
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 29059)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 40477)
@@ -62,7 +62,7 @@
 	Set LeveringInfo.AfzenderAdres = ..GeefAfzenderAdres(Levering.GeefGeleverdAanKlantID())
 	Set LeveringInfo.BedragRembours = Levering.GeefBedragRembours()
 	Set LeveringInfo.OphaalTijdstip = Rit.GeefVoorzieneOphaalTimeStamp()
-	Set LeveringInfo.GeleverdAanKlantID = Levering.GeefGeleverdAanKlantID()
+	Set LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Levering.GeefGeleverdAanKlantID())
 	Set LeveringInfo.Telefoon = Levering.GeefAdres().GeefTelefoon()
 	Set LeveringInfo.Referentie = RitID _ "X" _ LeveringID
 	Set LeveringInfo.EmailVoorBevestiging = ..EmailVoorBevestigingBepaler.GeefEmailVoorBevestiging(Levering.GeefGeleverdAanKlantID())
Index: APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r40367 -r40477
--- APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40367)
+++ APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40477)
@@ -217,7 +217,7 @@
 <Implementation><![CDATA[
 	#dim GLSEigenschappen As APPS.TRANSP.GLS.GLSEigenschappen = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen()	
 	
-	Set Request.T852 = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(LeveringInfo.GeleverdAanKlantID)
+	Set Request.T852 = LeveringInfo.GeleverdAanKlantNummer
 	Set Request.T758 = $Translate(LeveringInfo.Telefoon,"/\.- ")
 	
 	#dim LeveringAdres As APPS.TRANSP.dto.LeveringAdres = LeveringInfo.LeverAdres
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml
===================================================================
diff -u -r40367 -r40477
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 40477)
@@ -101,7 +101,7 @@
 	
 	Set LeveringData.OphaalTijdstip = ##class(TECH.DateTime).CurrentTimeStamp()
 	Set LeveringData.Referentie = ..#Referentie
-	Set LeveringData.GeleverdAanKlantID = "K||1000"
+	Set LeveringData.GeleverdAanKlantNummer = "1000"
 	Set LeveringData.Telefoon = "09/99\9-99.9 9"
 	
 	Set LeveringData.AfzenderAdres = ..GeefAfzenderAdres()
Index: APPS/TRANSP/dto/LeveringInfo.cls.xml
===================================================================
diff -u -r29059 -r40477
--- APPS/TRANSP/dto/LeveringInfo.cls.xml	(.../LeveringInfo.cls.xml)	(revision 29059)
+++ APPS/TRANSP/dto/LeveringInfo.cls.xml	(.../LeveringInfo.cls.xml)	(revision 40477)
@@ -13,8 +13,8 @@
 <Required>1</Required>
 </Property>
 
-<Property name="GeleverdAanKlantID">
-<Type>DOM.common.PartijID</Type>
+<Property name="GeleverdAanKlantNummer">
+<Type>%String</Type>
 <Required>1</Required>
 </Property>
 
Index: APPS/TRANSP/GLS/GLSv1/Bericht/impl/ParcelServiceTypeBepaler.cls.xml
===================================================================
diff -u -r40367 -r40477
--- APPS/TRANSP/GLS/GLSv1/Bericht/impl/ParcelServiceTypeBepaler.cls.xml	(.../ParcelServiceTypeBepaler.cls.xml)	(revision 40367)
+++ APPS/TRANSP/GLS/GLSv1/Bericht/impl/ParcelServiceTypeBepaler.cls.xml	(.../ParcelServiceTypeBepaler.cls.xml)	(revision 40477)
@@ -23,7 +23,7 @@
 	#dim TotaalGewicht As %Decimal = ..LeveringInfo.Gewicht
 	#dim GemiddeldGewicht As %Decimal = (TotaalGewicht/..LeveringInfo.AantalVerpakkingEenhedenTotaal)
 	#dim VerpakkingEenheidIt As TECH.Iterator = ##class(TECH.ListIterator).%New(..LeveringInfo.VerpakkingEenheden)
-	#dim LeveringInfoString As %String = "Info : "_..LeveringInfo.Referentie_" voor klant "_..LeveringInfo.GeleverdAanKlantID_" : "_..LeveringInfo.LeverAdres.Naam
+	#dim LeveringInfoString As %String = "Info : "_..LeveringInfo.Referentie_" voor klant "_..LeveringInfo.GeleverdAanKlantNummer_" : "_..LeveringInfo.LeverAdres.Naam
 	
 	While VerpakkingEenheidIt.HasNext(){
 		#dim VerpakkingEenheid As APPS.TRANSP.dto.VerpakkingEenheid = VerpakkingEenheidIt.Next()