Index: UI/MB/UGLYPicking/dlgOrderList.cls.xml
===================================================================
diff -u -r58126 -r73957
--- UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 58126)
+++ UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 73957)
@@ -11,6 +11,10 @@
 <Type>%Library.String</Type>
 </Property>
 
+<Property name="FilterVerzendwijze">
+<Type>%Library.String</Type>
+</Property>
+
 <Property name="Form">
 <Type>%Library.TMForm</Type>
 </Property>
@@ -298,23 +302,35 @@
  Do ..lbOrders.Items.Clear()
 
  ;Query doorlopen
- New ConsNr,DottedConsNr,OrderCnt,Magazijn,CheckMagazijn,VzwSpecial
+ New ConsNr,DottedConsNr,OrderCnt,Magazijn,CheckMagazijn,VzwSpecial,Verzendwijze,IsExportEnUrgent,IsRestGroep,IsDI2EnOD,IsDD1,IsDI1
  Set OrderCnt=0
  Set CheckMagazijn=(..FilterMagazijn'="")
+ Set CheckVerzendwijze=(..FilterVerzendwijze'="")
+ 
  For  Quit:'RS.Next()  Do
  . 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", "AFH", "SNT")
+ . 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 && ("REST"=..FilterVerzendwijze) && '('IsDI1 && 'IsDD1 && 'IsDI2EnOD && 'IsExportEnUrgent))
  . Set DottedConsNr=$$CEL^vhFMT(0,"ConsNr","N","L",8,0,"")
- . Set VzwSpecial=RS.Get("VerzendWijze")   ; Added by WimV on 03/03/2009
+ . Set VzwSpecial=Verzendwijze
  . ; volgende lijn wat aangepast, omdat vzw altijd getoond moet worden, behoud van bestaande omzettingen JoW, ICT-609
  . Set VzwSpecial=$S(VzwSpecial?1(1"AF".E):"AFH", VzwSpecial?1(1"EX",1"EXU"):"EX", VzwSpecial?1(1"SNT"):"SNT", VzwSpecial?1(1"TPO",1"TPU"):"TP", 1:VzwSpecial)
  . Do ..lbOrders.Items.Add($LB(DottedConsNr,Magazijn,RS.Get("TijdSmall"),RS.Get("AantalLijnen"),ConsNr,($$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")")||##class(APPS.MAG.UglyPickingService).%New().IsBonInGebruik(ConsNr)),RS.Get("KlantNaam"),(RS.Get("VerzendWijze")?1(1"AF".E,1"AFH")),(..GetShortDueOut(RS.Get("Tijd"))=0),VzwSpecial))
  . Set OrderCnt=OrderCnt+1
 
  Do ..lbOrders.Items.EndUpdate()
 
- Set ..Form.Caption="Order - Lijst"_$S(CheckMagazijn:" ["_..FilterMagazijn_"]",1:"")
+ Set ..Form.Caption="Order - Lijst"_$S(CheckMagazijn:" ["_..FilterMagazijn_$S(CheckVerzendwijze:" - "_..FilterVerzendwijze,1:"")_"]",1:"")
 
  ; --- finalisation ---
  Set ..btnCancel.Enabled="True"
@@ -524,6 +540,9 @@
 <Value name="30">
 <Value>FilterMagazijn</Value>
 </Value>
+<Value name="31">
+<Value>FilterVerzendwijze</Value>
+</Value>
 </Data>
 </Storage>
 </Class>