Index: UI/MB/UGLYPicking/dlgOrderList.cls.xml
===================================================================
diff -u -r74639 -r74947
--- UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 74639)
+++ UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 74947)
@@ -302,7 +302,7 @@
  Do ..lbOrders.Items.Clear()
 
  ;Query doorlopen
- New ConsNr,DottedConsNr,OrderCnt,Magazijn,CheckMagazijn,VzwSpecial,Verzendwijze,IsExportEnUrgent,IsRestGroep,IsDI2EnOD,IsDD1,IsDI1
+ New ConsNr,DottedConsNr,OrderCnt,Magazijn,CheckMagazijn,VzwSpecial,Verzendwijze,IsExport,IsRestGroep,IsDI2EnOD,IsDD1,IsDI1
  Set OrderCnt=0
  Set CheckMagazijn=(..FilterMagazijn'="")
  Set CheckVerzendwijze=(..FilterVerzendwijze'="")
@@ -311,16 +311,16 @@
  . Set ConsNr=RS.Get("ConsolidatieNr")
  . Set Magazijn=RS.Get("Magazijn")
  . Set Verzendwijze=RS.Get("VerzendWijze")
- . Set IsExportEnUrgent=##class(TECH.StringUtils).Equals(Verzendwijze, "HD", "HD1", "HD2", "HD3", "HD4", "HD5", "HD6", "HD7", "HW", "HW3", "DA", "DA1", "DA2", "DA3", "DA4", "DA5", "DA6", "DA7", "DA8", "DA9", "DAX", "BS", "BS3", "DO", "DO3", "DO4", "U01", "U02", "U03", "U04", "U05", "U06", "U07", "U08", "U09", "U10", "U11", "E01", "E02", "E03", "E04", "E05", "E06", "E07", "E08", "E09", "E10", "E11", "E12", "EX", "EXU", "SFS", "T01", "T02", "T03", "T04", "T05", "T06", "T07", "T08", "HA1", "HA2", "HA3", "HA4", "SNT")
+ . Set IsExport=##class(TECH.StringUtils).Equals(Verzendwijze, "HD", "HD1", "HD2", "HD3", "HD4", "HD5", "HD6", "HD7", "HW", "HW3", "DA", "DA1", "DA2", "DA3", "DA4", "DA5", "DA6", "DA7", "DA8", "DA9", "DAX", "BS", "BS3", "DO", "DO3", "DO4", "U01", "U02", "U03", "U04", "U05", "U06", "U07", "U08", "U09", "U10", "U11", "E01", "E02", "E03", "E04", "E05", "E06", "E07", "E08", "E09", "E10", "E11", "E12", "EX", "EXU", "SFS", "T01", "T02", "T03", "T04", "T05", "T06", "T07", "T08", "HA1", "HA2", "HA3", "HA4", "SNT", "HS")
  . Set IsDI2EnOD=##class(TECH.StringUtils).Equals(Verzendwijze,"DI2", "OD", "OD1", "OD2", "OD3", "OD4", "OD5")
  . Set IsDD1=##class(TECH.StringUtils).Equals(Verzendwijze,"DD1")
  . Set IsDI1=##class(TECH.StringUtils).Equals(Verzendwijze,"DI1")
  . Quit:(CheckMagazijn && (Magazijn'=..FilterMagazijn))
  . Quit:(CheckVerzendwijze && ("DI1"=..FilterVerzendwijze) && '(IsDI1))
  . Quit:(CheckVerzendwijze && ("DD1"=..FilterVerzendwijze) && '(IsDD1))
  . Quit:(CheckVerzendwijze && ("DI2 + OD"=..FilterVerzendwijze) && '(IsDI2EnOD))
- . Quit:(CheckVerzendwijze && ("EXPORT + URGENT"=..FilterVerzendwijze) && '(IsExportEnUrgent))
- . Quit:(CheckVerzendwijze && ("AFH + REST"=..FilterVerzendwijze) && '('IsDI1 && 'IsDD1 && 'IsDI2EnOD && 'IsExportEnUrgent))
+ . Quit:(CheckVerzendwijze && ("EXPORT"=..FilterVerzendwijze) && '(IsExport))
+ . Quit:(CheckVerzendwijze && ("AFH + REST"=..FilterVerzendwijze) && '('IsDI1 && 'IsDD1 && 'IsDI2EnOD && 'IsExport))
  . Set DottedConsNr=$$CEL^vhFMT(0,"ConsNr","N","L",8,0,"")
  . Set VzwSpecial=Verzendwijze
  . ; volgende lijn wat aangepast, omdat vzw altijd getoond moet worden, behoud van bestaande omzettingen JoW, ICT-609
Index: UI/MB/UGLYPicking/dlgOrderListDeliverySelection.cls.xml
===================================================================
diff -u -r74639 -r74947
--- UI/MB/UGLYPicking/dlgOrderListDeliverySelection.cls.xml	(.../dlgOrderListDeliverySelection.cls.xml)	(revision 74639)
+++ UI/MB/UGLYPicking/dlgOrderListDeliverySelection.cls.xml	(.../dlgOrderListDeliverySelection.cls.xml)	(revision 74947)
@@ -77,7 +77,7 @@
 
 <Property name="lbVerzendwijzes">
 <Type>%Library.List</Type>
-<InitialExpression>$LB("DD1","DI1","DI2 + OD","EXPORT + URGENT","AFH + REST")</InitialExpression>
+<InitialExpression>$LB("DD1","DI1","DI2 + OD","EXPORT","AFH + REST")</InitialExpression>
 </Property>
 
 <Property name="lblExtraInfo">
@@ -818,7 +818,7 @@
  . Set Verzendwijze=RS.Get("VerzendWijze")
  . Set Magazijn=RS.Get("Magazijn")
  . Quit:(CheckMagazijn && (Magazijn'=..FilterMagazijn))
- . Set:(##class(TECH.StringUtils).Equals(Verzendwijze, "HD", "HD1", "HD2", "HD3", "HD4", "HD5", "HD6", "HD7", "HW", "HW3", "DA", "DA1", "DA2", "DA3", "DA4", "DA5", "DA6", "DA7", "DA8", "DA9", "DAX", "BS", "BS3", "DO", "DO3", "DO4", "U01", "U02", "U03", "U04", "U05", "U06", "U07", "U08", "U09", "U10", "U11", "E01", "E02", "E03", "E04", "E05", "E06", "E07", "E08", "E09", "E10", "E11", "E12", "EX", "EXU", "SFS", "T01", "T02", "T03", "T04", "T05", "T06", "T07", "T08", "HA1", "HA2", "HA3", "HA4", "SNT")) Verzendwijze = "EXPORT + URGENT"
+ . Set:(##class(TECH.StringUtils).Equals(Verzendwijze, "HD", "HD1", "HD2", "HD3", "HD4", "HD5", "HD6", "HD7", "HW", "HW3", "DA", "DA1", "DA2", "DA3", "DA4", "DA5", "DA6", "DA7", "DA8", "DA9", "DAX", "BS", "BS3", "DO", "DO3", "DO4", "U01", "U02", "U03", "U04", "U05", "U06", "U07", "U08", "U09", "U10", "U11", "E01", "E02", "E03", "E04", "E05", "E06", "E07", "E08", "E09", "E10", "E11", "E12", "EX", "EXU", "SFS", "T01", "T02", "T03", "T04", "T05", "T06", "T07", "T08", "HA1", "HA2", "HA3", "HA4", "SNT", "HS")) Verzendwijze = "EXPORT"
  . Set:(##class(TECH.StringUtils).Equals(Verzendwijze,"DI2", "OD", "OD1", "OD2", "OD3", "OD4", "OD5")) Verzendwijze = "DI2 + OD"
  . Set:(##class(TECH.StringUtils).Equals(Verzendwijze,"DD1")) Verzendwijze = "DD1"
  . Set:(##class(TECH.StringUtils).Equals(Verzendwijze,"DI1")) Verzendwijze = "DI1"
@@ -907,7 +907,7 @@
  Else  Do
  . Set:(ViaConsNr'="") ..Form.Caption="Orders - selectie - "_$$CEL^vhFMT(0,"ViaConsNr","N","L",8,0,"")
  */
- Set ^testPVR(1) = OrderCnt
+ 
  Quit OrderCnt
 ]]></Implementation>
 </Method>