Index: APPS/MAG/Inventaris/dto/BijladenProductInfo.cls.xml
===================================================================
diff -u
--- APPS/MAG/Inventaris/dto/BijladenProductInfo.cls.xml	(revision 0)
+++ APPS/MAG/Inventaris/dto/BijladenProductInfo.cls.xml	(revision 2359)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.Inventaris.dto.BijladenProductInfo">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="VroegsteDueOut">
+<Type>%TimeStamp</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="ProductID">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="ProductData">
+<Type>DOM.common.dto.ProductData</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="AantalTePicken">
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+</Property>
+
+<Property name="AantalPickbaar">
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+</Property>
+
+<Property name="PickbareLocaties">
+<Type>APPS.MAG.Inventaris.dto.ProductenOpPallet</Type>
+</Property>
+
+<Property name="NietPickbareLocaties">
+<Type>APPS.MAG.Inventaris.dto.ProductenOpPallet</Type>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/InventarisService.cls.xml
===================================================================
diff -u -r2142 -r2359
--- APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2142)
+++ APPS/MAG/InventarisService.cls.xml	(.../InventarisService.cls.xml)	(revision 2359)
@@ -253,15 +253,15 @@
 	
 	If ('##class(EWMS.ToReceive).PalletIsInToReceive(PalletID))
 	{
-		Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qty_pcs AS INT) as Aantal, I.loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id) as AantalSecties, T.Loc_Trans As LocatieID"
+		Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qty_pcs AS INT) as Aantal, I.loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id) as AantalSecties, T.Loc_Trans As LocatieID, T.Loc_IsPickbaar As IsPickbaar"
 							_" FROM EWMS.Inventory I"
 							_" JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id"
 							_" LEFT JOIN EWMS.TransLoc T ON T.loc_m  = L.loc_m AND T.loc_g = L.loc_g AND T.loc_x = L.loc_x AND T.loc_y = L.loc_y"
 							_" WHERE I.loc_id = ? AND I.loc_m < 5 AND I.Product <> 'EMPTY'")
 	}
 	Else
 	{
-		Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qtytoreceive AS INT) as Aantal, I.locm As loc_m, (SELECT count(1) FROM EWMS.ToReceive WHERE loc_id = I.locid) as AantalSecties, T.Loc_Trans As LocatieID"
+		Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qtytoreceive AS INT) as Aantal, I.locm As loc_m, (SELECT count(1) FROM EWMS.ToReceive WHERE loc_id = I.locid) as AantalSecties, T.Loc_Trans As LocatieID, T.Loc_IsPickbaar As IsPickbaar"
 								_" FROM EWMS.ToReceive I"
 								_" LEFT JOIN EWMS.Locations L ON I.locm = L.loc_m and I.locid = L.loc_id"
 								_" LEFT JOIN EWMS.TransLoc T ON T.loc_m  = L.loc_m AND T.loc_g = L.loc_g AND T.loc_x = L.loc_x AND T.loc_y = L.loc_y"
@@ -275,6 +275,7 @@
 		Set ProductOpPallet.Aantal = ResultSet.Data("Aantal")
 		Set ProductOpPallet.PalletID = PalletID
 		Set ProductOpPallet.LocatieID = ResultSet.Data("LocatieID")
+		Set ProductOpPallet.IsPickbaar = ResultSet.Data("IsPickbaar")
 		Set ProductOpPallet.MagazijnOmschrijving = ##class(Prod.Product).GetMagViaOpslagzone(ResultSet.Data("loc_m"))
 		Set ProductOpPallet.AantalSecties = ResultSet.Data("AantalSecties")
 		Do ProductenOpPallet.Insert(ProductOpPallet)
@@ -303,7 +304,7 @@
 	Set DataService = ##class(APPS.common.DataService).%New()
 	Set ResultSet = ##class(%ResultSet).%New()
 	
-	Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal, I.loc_id As PalletID, I.loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id GROUP BY loc_id) as AantalSecties, T.Loc_Trans As LocatieID"
+	Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal, I.loc_id As PalletID, I.loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id GROUP BY loc_id) as AantalSecties, T.Loc_Trans As LocatieID, T.Loc_IsPickbaar As IsPickbaar"
 							_" FROM EWMS.Inventory I"
 							_" JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id"
 							_" LEFT JOIN EWMS.TransLoc T ON T.loc_m  = L.loc_m AND T.loc_g = L.loc_g AND T.loc_x = L.loc_x AND T.loc_y = L.loc_y"
@@ -316,6 +317,7 @@
 		Set ProductOpPallet.Aantal = ResultSet.Data("Aantal")
 		Set ProductOpPallet.PalletID = ResultSet.Data("PalletID")
 		Set ProductOpPallet.LocatieID = ResultSet.Data("LocatieID")
+		Set ProductOpPallet.IsPickbaar = ResultSet.Data("IsPickbaar")
 		Set ProductOpPallet.MagazijnOmschrijving = ##class(Prod.Product).GetMagViaOpslagzone(ResultSet.Data("loc_m"))
 		Set ProductOpPallet.AantalSecties = ResultSet.Data("AantalSecties")
 		Do ProductenOpPallet.Insert(ProductOpPallet)
@@ -557,5 +559,118 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefBijTeLadenProducten">
+<Description>
+Geeft lijst met APPS.MAG.Inventaris.dto.BijladenProductInfo </Description>
+<FormalSpec>BijladenTotTimeStamp:%TimeStamp</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	
+	Set InventarisService = ##class(APPS.MAG.InventarisService).%New()
+	Set ProductenBijTeLaden = ##class(%ListOfObjects).%New()
+	
+	Set TePickenProducten = ..GeefTePickenProductInfo(BijladenTotTimeStamp)
+	Set arAantalPickbaar = ..GeefAantalPickbaar()
+	
+	Set TePickenProductenIt = ##class(TECH.ListIterator).%New(TePickenProducten)
+	While TePickenProductenIt.HasNext() 
+	{
+		Set TePickenProduct = TePickenProductenIt.Next()
+		Set ProductID = TePickenProduct.ProductID
+		
+		/// Als er geen data is dat het product pickbaar is
+		/// OF
+		/// Als het aantal gevraagde items groter is dan het aantal pickbare.
+		If ( ('arAantalPickbaar.IsDefined(ProductID)) || (TePickenProduct.AantalTePicken > arAantalPickbaar.GetAt(ProductID))){		
+			If ((arAantalPickbaar.GetAt(ProductID))>0){
+				Set TePickenProduct.AantalPickbaar = arAantalPickbaar.GetAt(ProductID)
+			}Else{
+				Set TePickenProduct.AantalPickbaar = 0
+			}
+			
+			/// Pickbare en niet pickbare locaties instellen.
+			Set ProductOpPalletIt = ##class(TECH.ListIterator).%New(InventarisService.GeefPallettenMetProduct(ProductID))
+			While ProductOpPalletIt.HasNext() 
+			{
+				Set ProductOpPallet	= ProductOpPalletIt.Next()
+				Set TePickenProduct.ProductData = ProductOpPallet.ProductData
+				If ProductOpPallet.IsPickbaar {
+					Do TePickenProduct.PickbareLocaties.Insert(ProductOpPallet)
+				}Else {
+					Do TePickenProduct.NietPickbareLocaties.Insert(ProductOpPallet)
+				}
+			}
+			Do ProductenBijTeLaden.Insert(TePickenProduct)
+		}
+	} 
+	
+	Quit ProductenBijTeLaden
+]]></Implementation>
+</Method>
+
+<Method name="GeefTePickenProductInfo">
+<Description>
+Een lijst met BijladenProductInfo objecten.
+Deze lijst is gesorteerd op vroegste due out time ascending.</Description>
+<FormalSpec>TimeStamp:%TimeStamp</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set TePickenProducten = ##class(%ListOfObjects).%New()	
+	
+	Set ResultSet = ##class(%ResultSet).%New()	
+	Do ResultSet.Prepare("SELECT sum(AantalGevraagd) As Aantal, Product As ProductID, MIN(TECH.DateTime_HorologToTimeStamp(Lijn->Hoofding->DueOutTime)) As VroegsteDueOut"
+						_" FROM Flow_OrderWMS.Sub"
+						_" WHERE StatusWMS = ""W"" AND TECH.DateTime_HorologToTimeStamp(Lijn->Hoofding->DueOutTime) < ?"
+						_" GROUP BY Product"
+						_" ORDER BY VroegsteDueOut ASC")
+	Set Status = ResultSet.Execute(TimeStamp)
+	If $$$ISERR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon de aantal gevraagde producten niet ophalen.",Status))
+	While ResultSet.Next()
+	{
+		Set BijladenProductInfo = ##class(APPS.MAG.Inventaris.dto.BijladenProductInfo).%New()
+		Set BijladenProductInfo.VroegsteDueOut = ResultSet.Data("VroegsteDueOut")
+		Set BijladenProductInfo.ProductID = $ZSTRIP(ResultSet.Data("ProductID"),"<>W")
+		Set BijladenProductInfo.AantalTePicken = ResultSet.Data("Aantal")
+		Do TePickenProducten.Insert(BijladenProductInfo)		
+	}
+	Do ResultSet.%Close()
+	Set ResultSet = ""
+	
+	Quit TePickenProducten
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalPickbaar">
+<Description>
+Een array met ProductID als key en AantalPickbaar als value</Description>
+<FormalSpec>IsPickbaar:%Boolean=1</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set arAantalPickbaar = ##class(%ArrayOfDataTypes).%New()	
+	
+	Set ResultSet = ##class(%ResultSet).%New()	
+	Do ResultSet.Prepare("SELECT I.Product As ProductID, SUM(CAST(qty_pcs AS INT)) as Aantal"
+							 _" FROM EWMS.Inventory I"
+							 _" JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id"
+							 _" LEFT JOIN EWMS.TransLoc T ON T.loc_m  = L.loc_m AND T.loc_g = L.loc_g AND T.loc_x = L.loc_x AND T.loc_y = L.loc_y"
+							 _" GROUP BY I.Product,T.Loc_ispickbaar, I.loc_m"
+							 _" HAVING T.loc_ispickbaar = ? AND I.loc_m < 5")
+	Set Status = ResultSet.Execute(IsPickbaar)
+	If $$$ISERR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon de aantal pickbare producten niet ophalen.",Status))
+	While ResultSet.Next()
+	{
+		Set ProductID = $ZSTRIP(ResultSet.Data("ProductID"),"<>W")
+		Set Aantal = ResultSet.Data("Aantal")
+		Do arAantalPickbaar.SetAt(Aantal, ProductID)
+	}
+	Do ResultSet.%Close()
+	Set ResultSet = ""
+	
+	Quit arAantalPickbaar
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml
===================================================================
diff -u -r2142 -r2359
--- APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml	(.../ProductOpPallet.cls.xml)	(revision 2142)
+++ APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml	(.../ProductOpPallet.cls.xml)	(revision 2359)
@@ -17,6 +17,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="IsPickbaar">
+<Type>%Boolean</Type>
+</Property>
+
 <Property name="ProductData">
 <Type>DOM.common.dto.ProductData</Type>
 </Property>
Index: APPS/MAG/Inventaris/impl/BijladenProductInfoComparator.cls.xml
===================================================================
diff -u
--- APPS/MAG/Inventaris/impl/BijladenProductInfoComparator.cls.xml	(revision 0)
+++ APPS/MAG/Inventaris/impl/BijladenProductInfoComparator.cls.xml	(revision 2359)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.Inventaris.impl.BijladenProductInfoComparator">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,TECH.Comparator.IComparator</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="IsKleinerDan">
+<FormalSpec>Waarde1:APPS.MAG.Inventaris.dto.BijladenProductInfo,Waarde2:APPS.MAG.Inventaris.dto.BijladenProductInfo</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit Waarde2.VroegsteDueOut ] Waarde1.VroegsteDueOut
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml
===================================================================
diff -u -r2142 -r2359
--- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2142)
+++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2359)
@@ -7,6 +7,29 @@
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Property name="RuntimeContext">
+<Type>TECH.Context.RuntimeContext</Type>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	do ##class(APPS.MAG.UGLYPicking.impl.Sessie).%DeleteId(..RuntimeContext.GeefComputerNaam())
+	set sc= ..VerwijderBestaandeReservaties()
+	if '$$$ISERR(sc) Set %TECHContextRuntimeContext = ##class(vhUnitTest.APPS.MAG.UGLYPicking.RuntimeContextMock).%New()
+ 	Quit sc
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set %TECHContextRuntimeContext = ..RuntimeContext
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefProductenOpPallet">
 <Implementation><![CDATA[
 	Set Service = ##class(APPS.MAG.InventarisService).%New()
@@ -319,6 +342,53 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefBijTeLadenProducten">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.InventarisService).%New()
+	
+	Set TransLoc1 = "98D98C98"
+	Set TransLoc2 = "99D99C99"
+	Set ProductID = 154599
+	
+	Set KlantID = 1000
+	Set BonID = 1234
+	Do ..MaakBon(BonID)
+	
+	Do ##class(EWMS.TransLoc).ZetIsPickbaar(TransLoc1,1)
+	Do ##class(EWMS.TransLoc).ZetIsPickbaar(TransLoc2,0)
+	
+	
+	Set UglyService = ##class(APPS.MAG.UglyPickingService).%New()
+	Do UglyService.StartBon(BonID)
+	
+	Set ProductGevonden = 0
+	
+	Set BijTeLadenProducten = Service.GeefBijTeLadenProducten(##class(TECH.DateTime).CurrentTimeStamp())
+	Set BijTeLadenProductenIt = ##class(TECH.ListIterator).%New(BijTeLadenProducten)
+	While BijTeLadenProductenIt.HasNext() {
+		Set BijTeLadenProduct = BijTeLadenProductenIt.Next()	
+		If BijTeLadenProduct.ProductID = ProductID {
+			Set ProductGevonden = 1	
+			
+			Do $$$AssertEquals(BijTeLadenProduct.AantalTePicken,5002,"Aantal producten te picken is OK.")
+			Do $$$AssertEquals(BijTeLadenProduct.AantalPickbaar,895,"Aantal producten die pickbaar zijn, is OK.")
+		}
+	}
+	
+	Do $$$AssertTrue(ProductGevonden,"Product "_ProductID_" is in bij te laden producten gevonden.")
+	
+	Set ProductLijnen = UglyService.GeefProductLijnen(BonID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	
+	Do $$$AssertEquals(ProductLijnen.Lijst.Count(),1,"Er is 1 productlijn te picken")
+	
+	Set ProductLijn = ProductLijnen.Lijst.GetAt(1)
+	
+	Do $$$AssertEquals(ProductLijn.Aantal,5000,"Het aantal producten te picken")
+	
+	Do UglyService.StopHuidigeBon()
+]]></Implementation>
+</Method>
+
 <Method name="MaakToReceivePallet">
 <Implementation><![CDATA[
 	Set ^RCP("D",1234) = ""
@@ -358,6 +428,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="MaakBon">
+<FormalSpec>ID:%Integer</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ^ORDW("IW",ID) = ""
+	
+	Set ^ORDW("D",ID) = ""
+	
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(ID)
+	Set OrderHoofding.StatusWMS = "P"
+	Do OrderHoofding.KlantSetObjectId(1000)
+	Set OrderHoofding.DueOutTime = "62276,48446"
+	Do OrderHoofding.%Save()
+	
+	Set ^ORDW("D",ID,"S","A") = "" // Markeren dat deze voorkomt in het Avento
+	
+	Set ^ORDW("D",ID,"D",119047,100) = "154599\B\\5000\0\\\A\\200"
+	Set ^ORDW("D",ID,"D",119047,100,100) = "154599\W\5000\0\\62210,53942\\\\00218051\\FVS\A\U"
+	
+	Set Pickbaar = 1
+	Do ##class(EWMS.TransLoc).ZetIsPickbaar("04B25A03",Pickbaar)
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderInventory">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
@@ -465,5 +561,18 @@
 	Quit $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderBestaandeReservaties">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+
+	set rsPalletReservatie = ##class(%ResultSet).%New("")
+	set sc = rsPalletReservatie.Prepare("DELETE FROM Flow_OrderWMS.PalletReservatie")
+	if 'sc { 
+		set sc = rsPalletReservatie.Execute()
+	}
+	quit sc
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhDeploy/JBL/Deploy20111013x1443.cls.xml
===================================================================
diff -u
--- vhDeploy/JBL/Deploy20111013x1443.cls.xml	(revision 0)
+++ vhDeploy/JBL/Deploy20111013x1443.cls.xml	(revision 2359)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JBL.Deploy20111013x1443">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Bijladen niet pickbare producten.</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	/// LijstDefinitie instellen
+	Do ##class(CHUI.MAG.Inventaris.LijstDefinities.BijladenProductLijst).MaakDocument()	
+	
+	/// Menu item instellen	
+	Set ^KBA("MENU",20,37)= "Bij te laden producten\21\43\##class(CHUI.MAG.Inventaris.LijstNietPickbareLocaties).Start()\D\##class(CHUI.MAG.Inventaris.LijstNietPickbareLocaties).Start()\\\\\\\\\JBL\13.10.11\14 u 49"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: CHUI/MAG/Inventaris/LijstDefinities/BijladenProductLijst.cls.xml
===================================================================
diff -u
--- CHUI/MAG/Inventaris/LijstDefinities/BijladenProductLijst.cls.xml	(revision 0)
+++ CHUI/MAG/Inventaris/LijstDefinities/BijladenProductLijst.cls.xml	(revision 2359)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="CHUI.MAG.Inventaris.LijstDefinities.BijladenProductLijst">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="MaakDocument">
+<Description>
+d ##class(CHUI.MAG.Inventaris.LijstDefinities.BijladenProductLijst).MaakDocument()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	// maakt een document
+	Set DocumentType = ##class(TECH.Print.Kolommen.DocumentType).%New("APPS.MAG.Inventaris.BijladenProductLijst")
+	
+	// maak kolommen aan
+	Set Kolom1 = ##class(TECH.Print.Kolommen.KolomDefinitie).%New("Korttekst               ",,##class(TECH.Print.Kolommen.TekstType).String(),##class(TECH.Print.Kolommen.TekstUitlijning).Rechts())
+	Set Kolom2 = ##class(TECH.Print.Kolommen.KolomDefinitie).%New("IdentNr   ",,##class(TECH.Print.Kolommen.TekstType).String(),##class(TECH.Print.Kolommen.TekstUitlijning).Links())
+	Set Kolom3 = ##class(TECH.Print.Kolommen.KolomDefinitie).%New("DueOut    ",,##class(TECH.Print.Kolommen.TekstType).String(),##class(TECH.Print.Kolommen.TekstUitlijning).Links())
+	Set Kolom4 = ##class(TECH.Print.Kolommen.KolomDefinitie).%New("#   ",,##class(TECH.Print.Kolommen.TekstType).String(),##class(TECH.Print.Kolommen.TekstUitlijning).Rechts())
+	Set Kolom5 = ##class(TECH.Print.Kolommen.KolomDefinitie).%New("Locatie  ",,##class(TECH.Print.Kolommen.TekstType).String(),##class(TECH.Print.Kolommen.TekstUitlijning).Links())
+	
+	// verwijdert eventuele oude definities
+	Do DocumentType.ClearDocument()
+	
+	// voeg de kolommen toe aan het documenttype
+	Do DocumentType.VoegKolomDefinitieToe(Kolom1)
+	Do DocumentType.VoegKolomDefinitieToe(Kolom2)
+	Do DocumentType.VoegKolomDefinitieToe(Kolom3)
+	Do DocumentType.VoegKolomDefinitieToe(Kolom4)
+	Do DocumentType.VoegKolomDefinitieToe(Kolom5)
+	
+	// sla het documenttype op
+	Do DocumentType.SaveDocument()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: CHUI/MAG/Inventaris/LijstNietPickbareLocaties.cls.xml
===================================================================
diff -u
--- CHUI/MAG/Inventaris/LijstNietPickbareLocaties.cls.xml	(revision 0)
+++ CHUI/MAG/Inventaris/LijstNietPickbareLocaties.cls.xml	(revision 2359)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="CHUI.MAG.Inventaris.LijstNietPickbareLocaties">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="Start">
+<ClassMethod>1</ClassMethod>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	New Date,Time,Tijdstip,Input,%INT,%EXT,%TC
+	Write @F11,@F1,@FMTI," Lijst niet pickbare locaties - ",QN," ",@FMTi
+	Set Tijdstip=$$CALCTIME^vhDTyp(,"H","+1"),Date=$P(Tijdstip,","),Time=$P(Tijdstip,",",2)
+	Set:Time<28800 Time=32400
+	Set:Time>61200 Date=$$CALCDATE^vhDTyp(Date,"A","+1"),Time=32400
+	Set Tijdstip=Date_","_Time,Input=""
+	While Input="" {
+		Set FP=1801
+		Write @F,@F1
+		Set Input=$$ASK^vhINP(" Tijdstip : ",14,$$FormatDateTime^vhLib("dd-mm-yy hh:nn",Tijdstip)," Alle producten waarvan tot dit tijdstip meer moet gepicked worden dan er op"," pickbare lokaties staan")
+		Quit:Input="-"
+		Set Date=$P(Input," "),Time=$P(Input," ",2)
+		Do VALDATE^vhDTyp(Date)
+		If %TC Set Date=%INT
+		Else  Set Input=""
+		Do VALTIME^vhDTyp(Time)
+		If %TC Set Time=%INT
+		Else  Set Input=""
+	}
+	If Input="-" Set Tijdstip="-"
+	Else  Set Tijdstip=##class(TECH.DateTime).HorologToTimeStamp(Date_","_Time)
+	
+	Do ..ToonLijst(Tijdstip)
+]]></Implementation>
+</Method>
+
+<Method name="ToonLijst">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BijladenTotTimeStamp:%TimeStamp</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set InventarisService = ##class(APPS.MAG.InventarisService).%New()
+	Set Document = ##class(TECH.Print.Kolommen.Document).%New("APPS.MAG.Inventaris.BijladenProductLijst","Bij te laden producten","Tot "_BijladenTotTimeStamp)
+	
+	Set BijladenProducutenInfo = InventarisService.GeefBijTeLadenProducten(BijladenTotTimeStamp)
+	Set BijladenProductInfoIt = ##class(TECH.ListIterator).%New(BijladenProducutenInfo)
+	While BijladenProductInfoIt.HasNext(){
+		Set BijladenProductInfo = BijladenProductInfoIt.Next()
+		
+		Set VroegsteDueOutView = ##class(TECH.StringUtils).Replace($zdt($ZDATETIMEH(BijladenProductInfo.VroegsteDueOut,7),4),"/2011","")
+		Set VroegsteDueOutView = $P(VroegsteDueOutView,":",1)_":"_$P(VroegsteDueOutView,":",2)
+		/// ProductLijn toevoegen
+			Set Lijn = BijladenProductInfo.ProductData.Code
+						_"\"_BijladenProductInfo.ProductData.IdentNr
+						_"\"_VroegsteDueOutView
+						_"\"_BijladenProductInfo.AantalTePicken
+						_"\"
+			Do Document.VoegLijnToe(Lijn,"\")	
+			
+		/// Pickbare locaties toevoegen
+			Set PickbareIt = ##class(TECH.ListIterator).%New(BijladenProductInfo.PickbareLocaties)
+			While PickbareIt.HasNext()
+			{
+				Set PickbareLocatie = PickbareIt.Next()
+				Do Document.VoegLijnToe("\\Pickbaar\"_PickbareLocatie.Aantal_"\"_PickbareLocatie.LocatieID,"\")
+			}
+		/// Niet pickbare locaties toevoegen
+			Set Teller = 1
+			Set NietPickbareIt = ##class(TECH.ListIterator).%New(BijladenProductInfo.NietPickbareLocaties)
+			While (NietPickbareIt.HasNext() && (Teller <= 2)) 
+			{
+				Set Teller = Teller + 1
+				Set NietPickbareLocatie = NietPickbareIt.Next()
+				Do Document.VoegLijnToe("\\Overstock\"_NietPickbareLocatie.Aantal_"\   "_NietPickbareLocatie.LocatieID,"\")
+			}
+	}
+	
+	/// Tonen op scherm of printen
+	Do Document.PrintDocument("Magazijn",##class(TECH.Config.ConfigMgr).Instance().GetBoolean("PrintLijstenOpScherm"))
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r2322 -r2359
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 2322)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 2359)
@@ -15,7 +15,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
-	
+	do ##class(APPS.MAG.UGLYPicking.impl.Sessie).%DeleteId(..RuntimeContext.GeefComputerNaam())
 	set sc= ..VerwijderBestaandeReservaties()
 	if '$$$ISERR(sc) Set %TECHContextRuntimeContext = ##class(vhUnitTest.APPS.MAG.UGLYPicking.RuntimeContextMock).%New()
  	Quit sc
FishEye: Tag 2359 refers to a dead (removed) revision in file `CHUI/MAG/UGLYPicking/LijstNietPickbareLocaties.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?