Index: CHUI/Flow/Cons/Transport.cls.xml
===================================================================
diff -u -r29059 -r50580
--- CHUI/Flow/Cons/Transport.cls.xml	(.../Transport.cls.xml)	(revision 29059)
+++ CHUI/Flow/Cons/Transport.cls.xml	(.../Transport.cls.xml)	(revision 50580)
@@ -386,8 +386,8 @@
 	If $D(^TRANSP("D",Transport,"D",Adres,"F")) Set TxtPop="EDIT"_$S(Type="F":"TRPFAKT",Type="Z":"TRPPROF",Type="O":"TRPORD",1:"TRPBON")_"ADRES"
 	Else  If $D(^TRANSP("D",Transport,"D",Adres,"Z")) Set TxtPop="EDIT"_$S(Type="Z":"TRPPROF",Type="F":"TRPFAKT",Type="O":"TRPORD",1:"TRPBON")_"ADRES"
 	Else  Set TxtPop="EDIT"_$S(Type="F":"FAKT",Type="Z":"PROF",Type="O":"ORD",1:"BON")_"ADRES"
-	Set EditAdres=$S(Transporteur=5036:"P",1:$$^vhTXTPOP("TRANSPORT",TxtPop,"",Object,Leverancier,Naam,Toenaam,StraatNrBus,Woonplaats,Land))
-	If Transporteur'=5036,EditAdres="P",Groeperen="S" Set EditAdres=$$^vhTXTPOP("TRANSPORT","EXPRESNEWADRES","",Leverancier,$$FMTDT^vhLib.DataTypes(TijdstipOphalingVoorzien))
+	Set EditAdres=$S(##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(Transporteur):"P",1:$$^vhTXTPOP("TRANSPORT",TxtPop,"",Object,Leverancier,Naam,Toenaam,StraatNrBus,Woonplaats,Land))
+	If '##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(Transporteur),EditAdres="P",Groeperen="S" Set EditAdres=$$^vhTXTPOP("TRANSPORT","EXPRESNEWADRES","",Leverancier,$$FMTDT^vhLib.DataTypes(TijdstipOphalingVoorzien))
 	Quit EditAdres
 ]]></Implementation>
 </Method>
@@ -581,7 +581,7 @@
 	. . Do STORE^vhTERMINA()
 	. . Set R=Detail(LD("SELECT")),Adres=$P(R,D),ContactType=$P(R,D,2),ContactRef=$P(R,D,3)
 	. . If ContactType="K",'$D(^KK1(Adres)) Do
-	. . . If TranspNr=5036,$D(^TRANSP("D",Transport,"D",Adres,"Q")) Do MODGRP^TRANSP(Transport,Adres) Quit  ; ABX
+	. . . If ##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr),$D(^TRANSP("D",Transport,"D",Adres,"Q")) Do MODGRP^TRANSP(Transport,Adres) Quit  ; ABX
 	. . . If $D(^TRANSP("D",Transport,"D",Adres,"O")) Do MODGRP^TRANSPXO(Transport,Adres) Quit  ; Order
 	. . . If $D(^TRANSP("D",Transport,"D",Adres,"F")) Do MODGRP^TRANSPXF(Transport,Adres) Quit  ; Factuur
 	. . . Do MODGRP^TRANSPX(Transport,Adres) ; Leveringsbon
@@ -690,8 +690,6 @@
 <IndexLocation>^CHUI.Flow.Cons.TransportI</IndexLocation>
 <StreamLocation>^CHUI.Flow.Cons.TransportS</StreamLocation>
 <Data name="TransportDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>