Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59700 -r59827
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59827)
@@ -149,10 +149,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ConcatineerSymboolReference As %String = "X"
 	#dim RitID As %String = $$$Trim(Levering.GeefRitID())
-	#dim Uitlevering As %String = $$$Trim(Levering.GeefID())
-	#dim Reference As %String = RitID_ConcatineerSymboolReference_Uitlevering
+	#dim Uitlevering As %String = $Extract($$$Trim(Levering.GeefID()),*-4,*)
+	#dim Reference As %String = RitID_Uitlevering
 	Quit Reference
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml
===================================================================
diff -u -r56666 -r59827
--- vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 56666)
+++ vhUnitTest/APPS/TRANSP/TransportService/GeefLeveringInfo/BasisGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 59827)
@@ -17,12 +17,18 @@
 <Default>2</Default>
 </Parameter>
 
+<Property name="ProjectSettingsAPI">
+<Type>vhTest.Mock.DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestname:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestname)
 	Do ##class(DOM.DomeinContext).Instance().PushPartijAPIClassName("vhUnitTest.APPS.TRANSP.PARTIJAPIMock")
 	Do ##class(DOM.DomeinContext).Instance().PushTransportAPIClassName("vhTest.Mock.DOM.TRANSP.TransportAPI")
+	Set ..ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
 ]]></Implementation>
 </Method>
 
@@ -40,6 +46,8 @@
 	#define NettoGewicht 				60.7
 	#define VoorzieneOphaalTimeStamp    "2013-06-14 16:00:00"
 	
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$False)
+	
 	set VerpakkingEenheden = ##class(%ListOfObjects).%New()
 	do VerpakkingEenheden.Insert(##class(vhUnitTest.APPS.TRANSP.VerpakkingEenheidMock).%New(##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()))
 	
@@ -64,9 +72,11 @@
 	do TransportStub.IndienMethodCall("GeefRit",..#RitID).DanReturn(RitStub)
 
 	; Act 
-	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New().GeefLeveringInfo(..#RitID,..#LeveringID)
+	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New(,,..ProjectSettingsAPI).GeefLeveringInfo(..#RitID,..#LeveringID)
 	
 	; Assert
+	
+	do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertEquals(LeveringInfo.Gewicht,$$$NettoGewicht)
 	Do $$$AssertEquals(LeveringInfo.OphaalTijdstip,$$$VoorzieneOphaalTimeStamp)
 	Do $$$AssertEquals(LeveringInfo.Referentie,"1X2")
@@ -83,6 +93,8 @@
 	; Arrange
 	#define NettoGewicht 				60.7
 	#define VoorzieneOphaalTimeStamp    "2013-06-14 16:00:00"
+
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$False)
 	
 	set VerpakkingEenheden = ##class(%ListOfObjects).%New()
 	do VerpakkingEenheden.Insert(##class(vhUnitTest.APPS.TRANSP.VerpakkingEenheidMock).%New(##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()))
@@ -108,9 +120,10 @@
 	do TransportStub.IndienMethodCall("GeefRit",..#RitID).DanReturn(RitStub)
 
 	; Act 
-	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New().GeefLeveringInfo(..#RitID,..#LeveringID)
+	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New(,,..ProjectSettingsAPI).GeefLeveringInfo(..#RitID,..#LeveringID)
 	
 	; Assert
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertEquals(LeveringInfo.Gewicht,$$$NettoGewicht)
 	Do $$$AssertEquals(LeveringInfo.OphaalTijdstip,$$$VoorzieneOphaalTimeStamp)
 	Do $$$AssertEquals(LeveringInfo.Referentie,"1X2")
@@ -127,6 +140,8 @@
 	; Arrange
 	#define NettoGewicht 				60.7
 	#define VoorzieneOphaalTimeStamp    "2013-06-14 16:00:00"
+
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$False)
 	
 	set VerpakkingEenheden = ##class(%ListOfObjects).%New()
 	do VerpakkingEenheden.Insert(##class(vhUnitTest.APPS.TRANSP.VerpakkingEenheidMock).%New(##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()))
@@ -152,9 +167,10 @@
 	do TransportStub.IndienMethodCall("GeefRit",..#RitID).DanReturn(RitStub)
 
 	; Act 
-	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New().GeefLeveringInfo(..#RitID,..#LeveringID)
+	#dim LeveringInfo As APPS.TRANSP.dto.LeveringInfo = ##class(APPS.TRANSP.impl.TransportService).%New(,,..ProjectSettingsAPI).GeefLeveringInfo(..#RitID,..#LeveringID)
 	
 	; Assert
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertEquals(LeveringInfo.Gewicht,$$$NettoGewicht)
 	Do $$$AssertEquals(LeveringInfo.OphaalTijdstip,$$$VoorzieneOphaalTimeStamp)
 	Do $$$AssertEquals(LeveringInfo.Referentie,"1X2")
Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r59666 -r59827
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 59666)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 59827)
@@ -13,15 +13,22 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProjectSettingsAPI">
+<Type>DOM.common.impl.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory</FormalSpec>
+<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..EmailVoorBevestigingBepaler = $$$Implementation(EmailVoorBevestigingBepaler,##class(APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler).%New())
 	Set ..VerpakkingEenheidFactory = $$$Inject(VerpakkingEenheidFactory, ##class(APPS.TRANSP.impl.VerpakkingEenheidFactory).%New())
+	Set ..ProjectSettingsAPI = $$$Inject(ProjectSettingsAPI, ##class(DOM.common.impl.ProjectSettingsAPI).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -77,7 +84,12 @@
 	Set LeveringInfo.OphaalTijdstip = Rit.GeefVoorzieneOphaalTimeStamp()
 	Set LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Levering.GeefGeleverdAanKlantID())
 	Set LeveringInfo.Telefoon = Levering.GeefAdres().GeefTelefoon()
-	Set LeveringInfo.Referentie = RitID _ "X" _ LeveringID
+	
+	If ..ProjectSettingsAPI.IsTranssmartActive(){
+		Set LeveringInfo.Referentie = RitID _ $Extract(LeveringID,*-4,*)
+	} else {
+		Set LeveringInfo.Referentie = RitID _ "X" _ LeveringID
+	}
 	Set LeveringInfo.EmailVoorBevestiging = ..EmailVoorBevestigingBepaler.GeefEmailVoorBevestiging(Levering.GeefGeleverdAanKlantID())
 	Set LeveringInfo.AantalVerpakkingEenhedenTotaal = (Levering.GeefAantalColli() + Levering.GeefAantalEuroPalletten() + Levering.GeefAantalHalveEuroPalletten() + Levering.GeefAantalBuitenmaatsPalletten() + Levering.GeefAantalLanggoed())
 	Set LeveringInfo.AantalVerpakkingEenhedenReedsVerdeeld = Levering.GeefAantalLanggoed()