Index: EWPAL.mac.rou
===================================================================
diff -u -r61990 -r62600
--- EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 61990)
+++ EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 62600)
@@ -384,7 +384,7 @@
  New MPRNr,CPPL,MPRNrs
  Set Dir=$P("1\-1",D,$G(Dir)+1),Serie=$G(Serie),MPRNr=""
  For  Set MPRNr=$O(^PRLINK("IKM",KPRNr,MPRNr)) Quit:MPRNr=""  Do
- .Set CPPL=$P($$PRIJSGEG^KPRIJS(MPRNr),D,6)
+ .Set CPPL=$$CifPPL^KPRIJS(MPRNr)
  .Set CPPL(+CPPL,MPRNr)=""
  Set (CPPL,MPRNrs)=""
  If Serie Do
@@ -542,15 +542,15 @@
  . Set $P(Rec,D,6)=$G(Result.Data("LocX"))
  . Set $P(Rec,D,7)=$G(Result.Data("LocY"))
  . Set $P(Rec,D,8,9)=D,R=$G(Result.Data("InvTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,8)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,9)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set $P(Rec,D,10,11)=D,R=$G(Result.Data("LocTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,10)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,11)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set R=$G(Result.Data("LastCCTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,12)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,13)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set $P(Rec,D,14)=$G(Result.Data("AutoCCFlag"))
@@ -560,9 +560,12 @@
  ;De vertalling moet achteraf gebeuren omdat 2 geneste SQL queries niet werken over de SQL gateway
  For I=1:1:Count Do
  . Set Rec=^HULP(%J,I)
- . Set $P(Rec,D,16)=##class(EWMS.TransLoc).GetTransLocation(+$P(Rec,D,4),+$P(Rec,D,5),+$P(Rec,D,6),+$P(Rec,D,7))
- . If $P(Rec,D,16)="" Do ; geen transloc
- . . Set $P(Rec,D,16)=$E(100+$P(Rec,D,5),2,3)_" "_$E(100+$P(Rec,D,6),2,3)_" "_$E(100+$P(Rec,D,7),2,3)
+ . If ($P(Rec,D,4)=4) && ($P(Rec,D,5)=2) Do
+ . . Set $P(Rec,D,16)="HALUX"
+ . Else  Do
+ . . Set $P(Rec,D,16)=##class(EWMS.TransLoc).GetTransLocation(+$P(Rec,D,4),+$P(Rec,D,5),+$P(Rec,D,6),+$P(Rec,D,7))
+ . . If $P(Rec,D,16)="" Do ; geen transloc
+ . . . Set $P(Rec,D,16)=$E(100+$P(Rec,D,5),2,3)_" "_$E(100+$P(Rec,D,6),2,3)_" "_$E(100+$P(Rec,D,7),2,3)
  . Set ^HULP(%J,I)=Rec
  Quit