Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1759 -r1779
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1759)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1779)
@@ -502,6 +502,20 @@
 <ReturnType>%Status</ReturnType>
 </Method>
 
+<Method name="PrintPalletEtiket">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<Implementation><![CDATA[
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
+	
+	If ('$IsObject(OrderHoofding))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bon met nummer "_BonNr_" bestaat niet."))
+	}
+		
+	Do EXTERN^FLOWBON4(BonNr,##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnID))
+]]></Implementation>
+</Method>
+
 <Method name="PalletOpvragenAutoMagazijn">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -557,6 +571,46 @@
 <Method name="StopHuidigeBon">
 <Implementation><![CDATA[
 	Set Sessie = ..GeefSessie()
+	Set BonNr = Sessie.GeefGebruiktBonNr()
+	
+	If (BonNr = "")
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Er is geen huidige bon om te stoppen"))
+	}
+	
+	Set MagazijnenArray = ##class(%ArrayOfDataTypes).%New()
+	
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Prepare("SELECT AantalTePicken,Inventory,Magazijn FROM Flow_OrderWMS.PalletReservatie WHERE (ConsolidatieNr = ?) AND (ReservationIsDone = 1) AND (PalletID <> 0)")
+	Do ResultSet.Execute(BonNr)
+	
+	While (ResultSet.Next())
+	{
+		Set InventoryID = ResultSet.Data("Inventory")
+		Set AantalGereserveerd = ResultSet.Data("AantalTePicken")
+		Do MagazijnenArray.SetAt("",ResultSet.Data("Magazijn"))
+		Set Result = ##class(EWMS.Inventory).RollbackReservation(InventoryID,AantalGereserveerd)
+		If (Result '= "")
+		{
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kon de huidige bon niet stoppen, probleem bij het terugdraaien van de reservaties in de EWMS databank: "_Result))
+		}
+	}
+	
+	Do ResultSet.Close()
+	
+	Set MagazijnenIterator = ##class(TECH.ListIterator).%New(MagazijnenArray)
+	While (MagazijnenIterator.HasNext())
+	{
+		Do MagazijnenIterator.Next()
+		Set Magazijn = MagazijnenIterator.Key()
+		Set Status=##class(Flow.OrderWMS.PalletReservatie).DeleteReservation(BonNr,Magazijn)
+		If $$$ISERR(Status)
+		{
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kon de huidige bon niet stoppen, probleem bij het terugdraaien van de palletreservaties: "_$$ParseStatus^vhLib(Status)))
+		}
+	}
+	
+	
 	Do Sessie.ZetGebruiktBonNr("")
 	Set Status = Sessie.%Save()
 	
Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1759 -r1779
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1759)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1779)
@@ -66,6 +66,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PrintPalletEtiket">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Do ##class(APPS.MAG.UglyPickingService).%New().PrintPalletEtiket(BonNr, MagazijnID)
+]]></Implementation>
+</Method>
+
 <Method name="StartBon">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <WebMethod>1</WebMethod>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1759 -r1779
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1759)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1779)
@@ -79,6 +79,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="PrintPalletEtiket">
+<FormalSpec>BonNr:%Integer,MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
+<Implementation><![CDATA[	Do ..Service.PrintPalletEtiket(BonNr, MagazijnID)
+]]></Implementation>
+</Method>
+
 <Method name="PalletOpvragenAutoMagazijn">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn</FormalSpec>
 <ReturnType>%Status</ReturnType>