Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1608 -r1615
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1608)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1615)
@@ -232,6 +232,8 @@
 <FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
 <Implementation><![CDATA[
+	Do ##class(vhLib.OldSchool).InitVars()
+	
 	Set ProductLijnen = ##class(APPS.MAG.UGLYPicking.dto.ProductLijnen).%New()
 	Set Magazijn = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnID)
 	
@@ -246,7 +248,7 @@
 	
 	For i=1:1:$LL(KennisIDLb)
 	{
-		Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb))
+		Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb,i))
 		Do ProductLijnen.KennisAnkers.Insert(Kennis.Msg)
 	}
 	
@@ -258,8 +260,7 @@
 	}
 	
 	Set Status = ##class(BL.MB.UGLYPicking.OrderReservatie).ProcessUnFinishedZeroPalletIDs(BonNr,Magazijn)
-	// Hier nog no alloc dinges checken als status een error is.
-	
+
  	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	
 	If ($$$ISERR(Status))
@@ -311,7 +312,7 @@
 		Set KennisIDLb=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(OrderHoofding.KlantGetObjectId(),.Error,$LB("MAG:PICK"),$LB(ResultSet.Data("Product")),,"UGLY Picking Product",ResultSet.Data("Product"),1,1,0)
 		For i=1:1:$LL(KennisIDLb)
 		{
-			Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb))
+			Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(KennisIDLb,i))
 			Do ProductLijn.KennisAnkers.Insert(Kennis.Msg)
 		}
 		
@@ -348,13 +349,30 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_BonNr_" bestaat niet."))
 	}
 	
+	Set DueOutTimeStamp = ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
+	
 	If (UitstelOptie = ##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).VijftienMinutenUitstellen())
 	{
-		Do ##class(Flow.OrderWMS.Hoofding).DelayDueOut(BonNr,15)
+		Set DueOutTimeStamp = ##class(TECH.DateTime).TimeStampBereken(DueOutTimeStamp,15,##class(TECH.enu.DatePart).Minuut())
 	}
+	ElseIf (UitstelOptie = ##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).NaSpoor())
+	{
+		Set DueOutTimeStamp = $Piece(DueOutTimeStamp," ",1)_" "_"14:31:00"
+	}
+	ElseIf (UitstelOptie = ##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).NaDiensten())
+	{
+		Set DueOutTimeStamp = $Piece(DueOutTimeStamp," ",1)_" "_"17:01:00"
+	}
 	
-	Do OrderHoofding.%Reload()
+	Set OrderHoofding.DueOutTime = ##class(TECH.DateTime).TimeStampToHorolog(DueOutTimeStamp)
 	
+	Set Status = OrderHoofding.%Save()
+	
+	If ($$$ISERR(Status))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"Orderhoofding kon niet worden opgeslagen na het wijzigen van de dueout",Status))
+	}
+	
 	Quit ##class(TECH.DateTime).HorologToTimeStamp(OrderHoofding.DueOutTime)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1594 -r1615
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1594)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1615)
@@ -94,6 +94,55 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefProductLijnen">
+<Implementation><![CDATA[
+	Do ..MaakBon(1234)
+	
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	Set ProductLijnen = Service.GeefProductLijnen(1234,##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,2,"Het aantal producten te picken")
+	Do $$$AssertEquals(ProductLijn.ProductID,154599,"Het te picken product")
+	Do $$$AssertEquals(ProductLijn.MagazijnID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos(),"Aventos magazijn")
+	Do $$$AssertTrue($Length(ProductLijn.Korttekst),"De korttekst is ingevuld")
+	Do $$$AssertTrue($Length(ProductLijn.Langtekst),"De langtekst is ingevuld")
+	Do $$$AssertTrue($Length(ProductLijn.PalletID),"De pallet id is ingevuld")
+	Do $$$AssertTrue($Length(ProductLijn.LocatieID),"De locatie id is ingevuld")
+	
+	Do ..VerwijderBon(1234)
+]]></Implementation>
+</Method>
+
+<Method name="TestStelUit">
+<Implementation><![CDATA[
+	Do ..MaakBon(1234)
+	
+	Set Hoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(1234,0)
+	
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Set DueOut = Hoofding.DueOutTime
+	Do Service.StelUit(1234,##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).VijftienMinutenUitstellen())
+	
+	Set DueOutVerwacht = $Piece(DueOut,",",1)_","_($Piece(DueOut,",",2)+900) // 900 = 15 minuten extra
+	Do $$$AssertEquals(DueOutVerwacht,Hoofding.DueOutTime,"De tijd is 15 minuten later")
+	
+	Set DueOutVerwacht = $Piece(DueOut,",",1)_",52260" // 14:31
+	Do Service.StelUit(1234,##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).NaSpoor())
+	Do $$$AssertEquals(DueOutVerwacht,Hoofding.DueOutTime,"De tijd werd ingesteld op 14:31")
+	
+	Set DueOutVerwacht = $Piece(DueOut,",",1)_",61260" // 17:01
+	Do Service.StelUit(1234,##class(APPS.MAG.UGLYPicking.enu.UitstelOptie).NaDiensten())
+	Do $$$AssertEquals(DueOutVerwacht,Hoofding.DueOutTime,"De tijd werd ingesteld op 14:31")
+	
+	Do ..VerwijderBon(1234)
+]]></Implementation>
+</Method>
+
 <Method name="MaakPalletReservatie">
 <Implementation><![CDATA[
 	set PalletReservatie = ##class(Flow.OrderWMS.PalletReservatie).%New()
@@ -220,8 +269,8 @@
 	
 	Set ^ORDW("D",ID,"S","A") = "" // Markeren dat deze voorkomt in het Avento
 	
-	Set ^ORDW("D",ID,"D",119047,100) = "154599\B\\2\2\\\A\\200"
-	Set ^ORDW("D",ID,"D",119047,100,100) = "154599\W\2\2\\62210,53942\\\\00218051\\FVS\A\U"
+	Set ^ORDW("D",ID,"D",119047,100) = "154599\B\\2\0\\\A\\200"
+	Set ^ORDW("D",ID,"D",119047,100,100) = "154599\W\2\0\\62210,53942\\\\00218051\\FVS\A\U"
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -233,6 +282,8 @@
 <Implementation><![CDATA[
 	Kill ^ORDW("D",ID)
 	Kill ^ORDW("IW",ID)
+	Do ##class(BL.MB.UGLYPicking.OrderReservatie).RollbackReservations(ID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: APPS/MAG/UGLYPicking/enu/UitstelOptie.cls.xml
===================================================================
diff -u -r1576 -r1615
--- APPS/MAG/UGLYPicking/enu/UitstelOptie.cls.xml	(.../UitstelOptie.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/enu/UitstelOptie.cls.xml	(.../UitstelOptie.cls.xml)	(revision 1615)
@@ -1,19 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="APPS.MAG.UGLYPicking.enu.UitstelOptie">
+<ClassType>datatype</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="VijftienMinutenUitstellen">
-<Type>%Integer</Type>
-</Property>
+<Parameter name="VALUELIST">
+<Default>;VijftienMinutenUitstellen;NaDiensten;NaSpoor</Default>
+</Parameter>
 
-<Property name="NaDiensten">
-<Type>%Integer</Type>
-</Property>
+<Parameter name="DISPLAYLIST">
+<Default>;15 minuten uitstellen;Na diensten;Na spoor</Default>
+</Parameter>
 
-<Property name="NaSpoor">
-<Type>%Integer</Type>
-</Property>
+<Method name="VijftienMinutenUitstellen">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.UitstelOptie</ReturnType>
+<Implementation><![CDATA[	Quit "VijftienMinutenUitstellen"
+]]></Implementation>
+</Method>
+
+<Method name="NaDiensten">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.UitstelOptie</ReturnType>
+<Implementation><![CDATA[	Quit "NaDiensten"
+]]></Implementation>
+</Method>
+
+<Method name="NaSpoor">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.MAG.UGLYPicking.enu.UitstelOptie</ReturnType>
+<Implementation><![CDATA[	Quit "NaSpoor"
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/DateTime.cls.xml
===================================================================
diff -u -r1603 -r1615
--- TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1603)
+++ TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1615)
@@ -45,6 +45,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TimeStampToHorolog">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TimeStamp:%TimeStamp</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $zdth(TimeStamp,3)
+]]></Implementation>
+</Method>
+
 <Method name="DateToTimestamp">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Date:%Date</FormalSpec>