Index: ULTOER.mac.rou
===================================================================
diff -u -r67253 -r73084
--- ULTOER.mac.rou	(.../ULTOER.mac.rou)	(revision 67253)
+++ ULTOER.mac.rou	(.../ULTOER.mac.rou)	(revision 73084)
@@ -259,7 +259,7 @@
  Else  Do
  . Set DefaultVerzW=$$DefaultVerzW()
  . If (DefaultVerzW="DI1") ||(DefaultVerzW="DD1") Do
- . . Set Kriteria=D_$$CALCDATE^vhLib.DataTypes(,"A","+1")_"\\T\Z\"_$$CALCDATE^vhLib.DataTypes(,"A","+10")_"\L"
+ . . Set Kriteria=D_$$CALCDATE^vhLib.DataTypes(,"A","+1")_"\\T\Z\"_$$CALCDATE^vhLib.DataTypes(,"A","+1")_"\L"
  . Else  Do
  . . Set Kriteria=D_$$CALCDATE^vhLib.DataTypes(,"A","+1")_"\\O\Z\"_$$CALCDATE^vhLib.DataTypes(,"A","+1")
  . Set $P(Kriteria,D,3)=DefaultVerzW
@@ -527,6 +527,12 @@
 			 Set VerpakkingAantalDeel2 = $Piece(VerpakkingAantal,";",2) + $Piece(BijkomendeVerpakkingAantal,";",2)
 			 Set VerpakkingAantal = VerpakkingAantalDeel1_";"_VerpakkingAantalDeel2
 			 Set $Piece(Verpakking,"\",Index) = VerpakkingAantal
+		 }ElseIf ($Length(VerpakkingAantal,";") = 3){
+			 Set VerpakkingAantalDeel1 = $Piece(VerpakkingAantal,";",1) + $Piece(BijkomendeVerpakkingAantal,";",1)
+			 Set VerpakkingAantalDeel2 = $Piece(VerpakkingAantal,";",2) + $Piece(BijkomendeVerpakkingAantal,";",2)
+			 Set VerpakkingAantalDeel3 = $Piece(VerpakkingAantal,";",3) + $Piece(BijkomendeVerpakkingAantal,";",3)			 
+			 Set VerpakkingAantal = VerpakkingAantalDeel1_";"_VerpakkingAantalDeel2_";"_VerpakkingAantalDeel3
+			 Set $Piece(Verpakking,"\",Index) = VerpakkingAantal
 		 }
 	 } 
  }Else{
@@ -556,14 +562,15 @@
 HaalOpDataHeaderGLS(RitID)
  New Rit
  #dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
- Set Pallet = Rit.GeefAantalEuroPalletten() + Rit.GeefAantalWegwerpPalletten()
+ Set Pallet = Rit.GeefAantalEuroPalletten() _";"_ Rit.GeefAantalWegwerpPalletten()
  Set Collo = Rit.GeefAantalColli()
  Set LangGoed = Rit.GeefAantalLanggoed()
  Set KleinPallet = Rit.GeefAantalHalveEuroPalletten()
  Set BuitenmaatsPallet = Rit.GeefAantalBuitenmaatsePalletten()
  Quit
  
 RefreshHeader()
+    Do REMATTR^vhScherm("ABX","H","H")
 	Do REMATTR^vhScherm("PALLET","H","H")
  	Do REMATTR^vhScherm("COLLO","H","H")
  	Do REMATTR^vhScherm("LANGGOED","H","H")