Index: UI/MB/UGLYPicking/dlgOrderList.cls.xml
===================================================================
diff -u -r1074 -r8070
--- UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 1074)
+++ UI/MB/UGLYPicking/dlgOrderList.cls.xml	(.../dlgOrderList.cls.xml)	(revision 8070)
@@ -5,6 +5,7 @@
 <IncludeCode>UglyPickingCNTs,KeyCodesCNTs</IncludeCode>
 <StorageStrategy>Default</StorageStrategy>
 <Super>%Library.TMFormClass</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="FilterMagazijn">
 <Type>%Library.String</Type>
@@ -244,7 +245,7 @@
  New ConsNr,DottedConsNr
  Set ConsNr=$LI(Text,..#pConsNr)
  Set DottedConsNr=$LI(Text,..#pDottedConsNr)
- If $$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")") Do  Quit
+ If $$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")") || ##class(APPS.MAG.UglyPickingService).%New().IsBonInGebruik(ConsNr) Do  Quit
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Order "_DottedConsNr_" is momenteel in gebruik. Probeer later eens opnieuw.",$$$MBICONINFORMATION)
 
  ;Exists?
@@ -307,7 +308,7 @@
  . Set DottedConsNr=$$CEL^vhFMT(0,"ConsNr","N","L",8,0,"")
  . Set VzwSpecial=RS.Get("VerzendWijze")   ; Added by WimV on 03/03/2009
  . Set VzwSpecial=$S(VzwSpecial?1(1"AFH"):"AFH", VzwSpecial?1(1"EX",1"EXU"):"EX", VzwSpecial?1(1"SNT"):"SNT", VzwSpecial?1(1"TPO",1"TPU"):"TP", 1:"")
- . Do ..lbOrders.Items.Add($LB(DottedConsNr,Magazijn,RS.Get("TijdSmall"),RS.Get("AantalLijnen"),ConsNr,$$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")"),RS.Get("KlantNaam"),(RS.Get("VerzendWijze")?1(1"AF",1"AFH")),(..GetShortDueOut(RS.Get("Tijd"))=0),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",1"AFH")),(..GetShortDueOut(RS.Get("Tijd"))=0),VzwSpecial))
  . Set OrderCnt=OrderCnt+1
 
  Do ..lbOrders.Items.EndUpdate()
Index: EWMS/Inventory.cls.xml
===================================================================
diff -u -r5060 -r8070
--- EWMS/Inventory.cls.xml	(.../Inventory.cls.xml)	(revision 5060)
+++ EWMS/Inventory.cls.xml	(.../Inventory.cls.xml)	(revision 8070)
@@ -1373,6 +1373,7 @@
 	For  Quit:('RS.Next())  Do
 	. Set ConsNr=RS.Get("ConsolidatieNr")
 	. Quit:($$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")"))   //Indien locked: nu actief, niet meetellen
+	. Quit:##class(APPS.MAG.UglyPickingService).%New().IsBonInGebruik(ConsNr)
 	. Set ConsStr=$S(ConsStr="":"",1:ConsStr_",")_$$FormatNumber^vhLib(".",ConsNr)   // '.': Thousand Sep
 
 	Quit ConsStr
Index: UI/MB/UGLYPicking/dlgOrderSel.cls.xml
===================================================================
diff -u -r1074 -r8070
--- UI/MB/UGLYPicking/dlgOrderSel.cls.xml	(.../dlgOrderSel.cls.xml)	(revision 1074)
+++ UI/MB/UGLYPicking/dlgOrderSel.cls.xml	(.../dlgOrderSel.cls.xml)	(revision 8070)
@@ -845,7 +845,7 @@
  For  Quit:'RS.Next()  Do
  . Set ConsNr=RS.Get("ConsolidatieNr")
  . Quit:((ViaConsNr'="") && (ViaConsNr'=ConsNr))
- . If $$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")") Do  Quit
+ . If $$IsLocked^vhLib("^UGLYOrderPick("_ConsNr_")") || ##class(APPS.MAG.UglyPickingService).%New().IsBonInGebruik(ConsNr) Do  Quit
  ..  Set:('$LF(LockedConsNrs,ConsNr)) LockedConsNrs=LockedConsNrs_$LB(ConsNr)
  . Set Magazijn=RS.Get("Magazijn")
  . If '$LF(..lbMagazijnen,Magazijn) Do  Quit