Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1582 -r1586
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1582)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1586)
@@ -66,22 +66,16 @@
 		
 		Set Bon.AantalLijnen = 0
 		Set Bon.AantalActieveLijnen = 0		
-		Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
-		Set LijnIterator = ##class(TECH.ListIterator).%New(OrderHoofding.Lijnen)
-		While (LijnIterator.HasNext())
+		Set SublijnIterator = ##class(APPS.MAG.UGLYPicking.impl.SublijnInBonIterator).%New(BonNr)
+		While (SublijnIterator.HasNext())
 		{
-			Set Lijn = LijnIterator.Next()
-			Set SublijnIterator = ##class(TECH.ListIterator).%New(Lijn.Subs)
-			While (SublijnIterator.HasNext())
+			Set Sublijn = SublijnIterator.Next()
+			If (Sublijn.VerwerkingSoftware = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam))
 			{
-				Set Sublijn = SublijnIterator.Next()
-				If (Sublijn.VerwerkingSoftware = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam))
+				Set Bon.AantalLijnen = Bon.AantalLijnen + 1
+				If (Sublijn.StatusWMS="W")
 				{
-					Set Bon.AantalLijnen = Bon.AantalLijnen + 1
-					If (Sublijn.StatusWMS="W")
-					{
-						Set Bon.AantalActieveLijnen = Bon.AantalActieveLijnen + 1
-					}
+					Set Bon.AantalActieveLijnen = Bon.AantalActieveLijnen + 1
 				}
 			}
 		}
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1578 -r1586
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1578)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1586)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-07-01 15:41:54">
+<Project name="CSC Ugly Picking" LastModified="2011-07-04 11:04:04">
   <Items>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bon" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bonnen" type="CLS"/>
@@ -22,6 +22,7 @@
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.EventCatcher" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.Sessie" type="CLS"/>
+    <ProjectItem name="APPS.MAG.UGLYPicking.impl.SublijnInBonIterator" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.impl.UglyPickingService" type="CLS"/>
     <ProjectItem name="APPS.MAG.UglyPickingService" type="CLS"/>
     <ProjectItem name="BL.MB.UGLYPicking.Aventosbak.Aventosbak" type="CLS"/>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1578 -r1586
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1578)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1586)
@@ -16,7 +16,94 @@
 	Do $$$AssertTrue($IsObject(Magazijnen),"Een magazijnen object werd teruggegeven")
 	
 	Do $$$AssertEquals(Magazijnen.Lijst.Count(),5,"Er zijn 5 magazijnen")
+	
+	Set AantalBonnenInAventos = Magazijnen.Lijst.GetAt(5).AantalOrders
+	
+	Do ..MaakBon(1234)
+	
+	Do $$$AssertEquals(Service.GeefMagazijnen().Lijst.GetAt(5).AantalOrders,AantalBonnenInAventos+1,"Er is 1 bon meer na het aanmaken van de nieuwe hoofding")
+	
+	Do ..VerwijderBon(1234)
 ]]></Implementation>
 </Method>
+
+<Method name="TestGeefBon">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakBon(1234)
+	
+	Set Bon = Service.GeefBon(1234)
+	
+	Do $$$AssertTrue($IsObject(Bon),"De bon werd teruggegeven")
+	Do $$$AssertEquals(Bon.BonNr,1234,"De bon nummer")
+	Do $$$AssertEquals(Bon.DueOut,"2011-07-04 13:27:26","De dueout")
+	Do $$$AssertEquals(Bon.Land,"BE","Het land")
+	
+	Do ..VerwijderBon(1234)
+]]></Implementation>
+</Method>
+
+<Method name="TestGeefBonnen">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakBon(1234)
+	
+	Set Bonnen = Service.GeefBonnen(##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	
+	// Zoek onze bon
+	Set Iterator = ##class(TECH.ListIterator).%New(Bonnen.Lijst)
+	Set Bon = ""
+	While (Bon = "") && (Iterator.HasNext())
+	{
+		Set Bon = Iterator.Next()
+		If (Bon.BonNr '= 1234)
+		{
+			Set Bon = ""
+		}
+	}
+	
+	Do $$$AssertTrue($IsObject(Bon),"De bon werd teruggegeven")
+	
+	Do $$$AssertEquals(Bon.AantalLijnen,1,"Er is 1 lijn")
+	Do $$$AssertEquals(Bon.AantalActieveLijnen,1,"Er is 1 actieve lijn")
+	
+	Do ..VerwijderBon(1234)
+]]></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\\2\2\\\A\\200"
+	Set ^ORDW("D",ID,"D",119047,100,100) = "154599\W\2\2\\62210,53942\\\\00218051\\FVS\A\U"
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderBon">
+<FormalSpec>ID:%Integer</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Kill ^ORDW("D",ID)
+	Kill ^ORDW("IW",ID)
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/impl/SublijnInBonIterator.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/impl/SublijnInBonIterator.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/impl/SublijnInBonIterator.cls.xml	(revision 1586)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.impl.SublijnInBonIterator">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,TECH.Iterator</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="HoofdlijnIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SublijnIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Lijn">
+<Type>Flow.OrderWMS.Lijn</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BonNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
+	Set ..HoofdlijnIterator = ##class(TECH.ListIterator).%New(OrderHoofding.Lijnen)
+	If (..HoofdlijnIterator.HasNext())
+	{
+		Set ..Lijn = ..HoofdlijnIterator.Next()
+		Set ..SublijnIterator = ##class(TECH.ListIterator).%New(..Lijn.Subs)
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<Description>
+Returns true if the iteration has more elements.</Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $IsObject(..SublijnIterator) && (..SublijnIterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<Description>
+Returns the next element in the iteration.
+Only returns a valid element if HasNext() returns true
+Causes an error if HasNext() returns false</Description>
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	Set Sublijn = ..SublijnIterator.Next()
+	If ('..SublijnIterator.HasNext()) && (..HoofdlijnIterator.HasNext())
+	{
+		Set ..SublijnIterator = ..HoofdlijnIterator.Next()
+	}
+	Quit Sublijn
+]]></Implementation>
+</Method>
+</Class>
+</Export>