Index: TRANSP.mac.rou =================================================================== diff -u -r50564 -r50584 --- TRANSP.mac.rou (.../TRANSP.mac.rou) (revision 50564) +++ TRANSP.mac.rou (.../TRANSP.mac.rou) (revision 50584) @@ -33,7 +33,7 @@ If $L($G(VervRef)) Set R=^TRANSP("D",VervRef),TranspNr=$P(R,D) Else Set R=$$SELVERV(,"N"),TranspNr=$P(R,";"),VervRef=$P(R,";",2) Do:$L($G(VervRef)) - .Do:((TranspNr=5036)||(TranspNr=6612)) CHKVERZW(.BONNrs) + .Do:##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr) CHKVERZW(.BONNrs) .Set Labels=0 .Set GroepNr=$O(@BONNrs@("")) .Quit:'$$LOCK(VervRef,GroepNr) @@ -326,8 +326,8 @@ ..If '$$CHKMENU(Menu,Type,"O"),'$$CHKMENU(Menu,Type,"T") Set Ok=0 .Else Do ..Set VervRef=$P(R,D,21),TranspNr=$P(R,D),Status=$P(R,D,2),R=$G(^TRANSP("T",TranspNr)),Items=$P(R,D,4) - ..If Type="F",Status="T",Aktie="VR",(TranspNr=5036)||(TranspNr=6612) Quit ; Herprint vervoerlijst ABX - ..If Type="F",Status="T",Aktie="RS",(TranspNr=5036)||(TranspNr=6612) Quit ; Herzenden vervoerlijst ABX + ..If Type="F",Status="T",Aktie="VR",##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr) Quit ; Herprint vervoerlijst ABX + ..If Type="F",Status="T",Aktie="RS",##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr) Quit ; Herzenden vervoerlijst ABX ..Set:Items="" Items="O#T#E" Set Items="#"_Items_"#" ..Set:Ophalen Items=$P(Items,"O#")_$P(Items,"O#",2) Set:Transfer Items=$P(Items,"T#")_$P(Items,"T#",2) ..If Items[("#"_Aktie_"#") Quit:Aktie'="E" Quit:'$$ISPRINT^TRANSPL(VervRef) @@ -336,7 +336,7 @@ .Set R=$G(^HULP(%J,SelClose("SELECT"))) .If R="" Set Ok=0 Quit .Set VervRef=$P(R,D,21),TranspNr=$P(R,D),Status=$P(R,D,2),R=$G(^TRANSP("T",TranspNr)),Items=$P(R,D,4) - .If Type="F",Status="T",Aktie="VRX",TranspNr'=5036 Quit ; Herprint vervoerlijst andere dan ABX + .If Type="F",Status="T",Aktie="VRX",'##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr) Quit ; Herprint vervoerlijst andere dan ABX .Set Ok=0 Quit Ok ; @@ -494,7 +494,7 @@ New R,VervRef,GroepNr,TranspNr Set R=$$GETREFS(BONNr),VervRef=$P(R,";"),GroepNr=$P(R,";",2) Set R=^TRANSP("D",VervRef),TranspNr=$P(R,D) - Do @("RPLGRP"_$S(TranspNr=5036:"",1:"^TRANSPX")_"(VervRef,GroepNr)") + Do @("RPLGRP"_$S(##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr):"",1:"^TRANSPX")_"(VervRef,GroepNr)") Quit ; LOCK(VervRef,GroepNr) @@ -779,4 +779,3 @@ Quit '$$IsBonMetEigenLeveradres(Node3VanBon) && (+$P(Node3VanBon,D)>=1) ; - Index: TRANSPXZ.mac.rou =================================================================== diff -u -r29059 -r50584 --- TRANSPXZ.mac.rou (.../TRANSPXZ.mac.rou) (revision 29059) +++ TRANSPXZ.mac.rou (.../TRANSPXZ.mac.rou) (revision 50584) @@ -144,7 +144,7 @@ If VervRef,GroepNr Else Set R=$$GETREFS(PROFNr),VervRef=$P(R,";"),GroepNr=$P(R,";",2) Set R=^TRANSP("D",VervRef),TranspNr=$P(R,D) - Do @("RPLGRP"_$S(TranspNr'=5036:"",1:"^TRANSP")_"(VervRef,GroepNr,PROFNr)") + Do @("RPLGRP"_$S('##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr):"",1:"^TRANSP")_"(VervRef,GroepNr,PROFNr)") Quit ; LOCK(VervRef,GroepNr) Index: TRANSPXF.mac.rou =================================================================== diff -u -r29059 -r50584 --- TRANSPXF.mac.rou (.../TRANSPXF.mac.rou) (revision 29059) +++ TRANSPXF.mac.rou (.../TRANSPXF.mac.rou) (revision 50584) @@ -143,7 +143,7 @@ If VervRef,GroepNr Else Set R=$$GETREFS(FANr),VervRef=$P(R,";"),GroepNr=$P(R,";",2) Set R=^TRANSP("D",VervRef),TranspNr=$P(R,D) - Do @("RPLGRP"_$S(TranspNr'=5036:"",1:"^TRANSP")_"(VervRef,GroepNr,FANr)") + Do @("RPLGRP"_$S('##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr):"",1:"^TRANSP")_"(VervRef,GroepNr,FANr)") Quit ; LOCK(VervRef,GroepNr) Index: TRANSPXO.mac.rou =================================================================== diff -u -r29059 -r50584 --- TRANSPXO.mac.rou (.../TRANSPXO.mac.rou) (revision 29059) +++ TRANSPXO.mac.rou (.../TRANSPXO.mac.rou) (revision 50584) @@ -136,7 +136,7 @@ New R,VervRef,GroepNr,TranspNr Set R=$$GETREFS(ORDNr),VervRef=$P(R,";"),GroepNr=$P(R,";",2) Set R=^TRANSP("D",VervRef),TranspNr=$P(R,D) - Do @("RPLGRP"_$S(TranspNr'=5036:"",1:"^TRANSP")_"(VervRef,GroepNr)") + Do @("RPLGRP"_$S('##class(DOM.TRANSP.impl.DataM.DataMTransportAPI).%New().IsGLS(TranspNr):"",1:"^TRANSP")_"(VervRef,GroepNr)") Quit ; LOCK(VervRef,GroepNr)