Index: APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml
===================================================================
diff -u -r1578 -r1594
--- APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1578)
+++ APPS/MAG/UGLYPicking/enu/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1594)
@@ -16,37 +16,37 @@
 
 <Method name="Halux">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit "HALUX"
+<Implementation><![CDATA[	Quit "H"
 ]]></Implementation>
 </Method>
 
 <Method name="Orgalux">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit "ORGALUX"
+<Implementation><![CDATA[	Quit "O"
 ]]></Implementation>
 </Method>
 
 <Method name="Ugly">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit "UGLY"
+<Implementation><![CDATA[	Quit "U"
 ]]></Implementation>
 </Method>
 
 <Method name="LangGoed">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit "LANG"
+<Implementation><![CDATA[	Quit "L"
 ]]></Implementation>
 </Method>
 
 <Method name="TandemAventos">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit "TANDEM/AVENT"
+<Implementation><![CDATA[	Quit "A"
 ]]></Implementation>
 </Method>
 
 <Method name="GeefMagazijnen">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[	Quit ..#DISPLAYLIST
+<Implementation><![CDATA[	Quit ..#VALUELIST
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml
===================================================================
diff -u -r1581 -r1594
--- APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml	(.../BonInMagazijnIterator.cls.xml)	(revision 1581)
+++ APPS/MAG/UGLYPicking/impl/BonInMagazijnIterator.cls.xml	(.../BonInMagazijnIterator.cls.xml)	(revision 1594)
@@ -5,7 +5,7 @@
 <Super>%RegisteredObject,TECH.Iterator</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Magazijn">
+<Property name="MagazijnID">
 <Type>APPS.MAG.UGLYPicking.enu.Magazijn</Type>
 <Private>1</Private>
 </Property>
@@ -16,12 +16,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Magazijn = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam)
+	Set ..MagazijnID = MagazijnID
 	Do ..BepaalVolgende()
 	Quit $$$OK
 ]]></Implementation>
@@ -67,7 +67,7 @@
 	
 	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonNr,0)
 	
-	If (OrderHoofding.VerwerkingSoftware [ ..Magazijn) && ((OrderHoofding.StatusWMS = "W") || (OrderHoofding.StatusWMS = "P"))
+	If (OrderHoofding.VerwerkingSoftware [ ..MagazijnID) && ((OrderHoofding.StatusWMS = "W") || (OrderHoofding.StatusWMS = "P"))
 	{
 		Set LijnIterator = ##class(TECH.ListIterator).%New(OrderHoofding.Lijnen)
 		While ('BevatActieveLijnen) && (LijnIterator.HasNext())
@@ -77,7 +77,7 @@
 			While ('BevatActieveLijnen) && (SublijnIterator.HasNext())
 			{
 				Set Sublijn = SublijnIterator.Next()
-				Set BevatActieveLijnen = (Sublijn.StatusWMS="W") && (Sublijn.VerwerkingSoftware = ..Magazijn)
+				Set BevatActieveLijnen = (Sublijn.StatusWMS="W") && (Sublijn.VerwerkingSoftware = ..MagazijnID)
 			}
 		}
 	}
Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1578 -r1594
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1578)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1594)
@@ -13,18 +13,11 @@
 <Default>http://www.vanhoecke.be/MAG/UGLYPicking</Default>
 </Parameter>
 
-<Method name="GeefMagazijnen">
-<ReturnType>APPS.MAG.UGLYPicking.dto.Magazijnen</ReturnType>
-<WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefMagazijnen()
-]]></Implementation>
-</Method>
-
 <Method name="GeefBonnen">
-<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefBonnen(MagazijnNaam)
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefBonnen(MagazijnID)
 ]]></Implementation>
 </Method>
 
@@ -35,5 +28,20 @@
 <Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefBon(BonNr)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductLijnen">
+<FormalSpec>BonNr:%Integer</FormalSpec>
+<ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefProductLijnen(BonNr)
+]]></Implementation>
+</Method>
+
+<Method name="GeefMagazijnen">
+<ReturnType>APPS.MAG.UGLYPicking.dto.Magazijnen</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefMagazijnen()
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1590 -r1594
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1590)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1594)
@@ -28,9 +28,9 @@
 </Method>
 
 <Method name="GeefBonnen">
-<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
-<Implementation><![CDATA[	Quit ..Service.GeefBonnen(MagazijnNaam)
+<Implementation><![CDATA[	Quit ..Service.GeefBonnen(MagazijnID)
 ]]></Implementation>
 </Method>
 
@@ -57,7 +57,8 @@
 <Method name="GeefProductLijnen">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Quit ..Service.GeefProductLijnen(BonNr)
+]]></Implementation>
 </Method>
 
 <Method name="NeemSessieOver">
@@ -81,7 +82,6 @@
 <Method name="StelUit">
 <FormalSpec>Bon:APPS.MAG.UGLYPicking.dto.Bon,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VoerPickingUit">
Index: APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml
===================================================================
diff -u -r1578 -r1594
--- APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1578)
+++ APPS/MAG/UGLYPicking/dto/Magazijn.cls.xml	(.../Magazijn.cls.xml)	(revision 1594)
@@ -5,6 +5,16 @@
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Parameter name="XMLTYPE">
+<Description>
+XMLTYPE nodig wegens overlappende naam met de enu</Description>
+<Default>dto.Magazijn</Default>
+</Parameter>
+
+<Property name="MagazijnID">
+<Type>%String</Type>
+</Property>
+
 <Property name="AantalOrders">
 <Type>%Integer</Type>
 </Property>
Index: APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml
===================================================================
diff -u -r1576 -r1594
--- APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml	(.../ProductLijnen.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/ProductLijnen.cls.xml	(.../ProductLijnen.cls.xml)	(revision 1594)
@@ -3,11 +3,17 @@
 <Class name="APPS.MAG.UGLYPicking.dto.ProductLijnen">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="KennisAnker">
+<Property name="BonNr">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="KennisAnkers">
 <Description>
 Dit is een kennisanker dat moet gelezen worden voor er gestart wordt met picken.</Description>
 <Type>%String</Type>
+<Collection>list</Collection>
 </Property>
 
 <Property name="ProductLijnen">
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1591 -r1594
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1591)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1594)
@@ -15,13 +15,13 @@
 	
 	Do $$$AssertTrue($IsObject(Magazijnen),"Een magazijnen object werd teruggegeven")
 	
-	Do $$$AssertEquals(Magazijnen.Lijst.Count(),5,"Er zijn 5 magazijnen")
+	Do $$$AssertEquals(Magazijnen.Count(),5,"Er zijn 5 magazijnen")
 	
-	Set AantalBonnenInAventos = Magazijnen.Lijst.GetAt(5).AantalOrders
+	Set AantalBonnenInAventos = Magazijnen.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 $$$AssertEquals(Service.GeefMagazijnen().GetAt(5).AantalOrders,AantalBonnenInAventos+1,"Er is 1 bon meer na het aanmaken van de nieuwe hoofding")
 	
 	Do ..VerwijderBon(1234)
 ]]></Implementation>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1590 -r1594
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1590)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1594)
@@ -35,6 +35,7 @@
 		If (##class(APPS.MAG.UGLYPicking.enu.Magazijn).IsValidDT(MagazijnLetter))
 		{
 			Set Magazijn = ##class(APPS.MAG.UGLYPicking.dto.Magazijn).%New()
+			Set Magazijn.MagazijnID = MagazijnLetter
 			Set Magazijn.Naam = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(MagazijnLetter)
 			Do Bon.Magazijnen.Insert(Magazijn)
 		}
@@ -45,12 +46,12 @@
 </Method>
 
 <Method name="GeefBonnen">
-<FormalSpec>MagazijnNaam:%String</FormalSpec>
+<FormalSpec>MagazijnID:APPS.MAG.UGLYPicking.enu.Magazijn</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Bonnen</ReturnType>
 <Implementation><![CDATA[
 	Set Bonnen = ##class(APPS.MAG.UGLYPicking.dto.Bonnen).%New()
 	
-	Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(MagazijnNaam)
+	Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(MagazijnID)
 	While (Iterator.HasNext())
 	{
 		Set BonNr = Iterator.Next()
@@ -70,7 +71,7 @@
 		While (SublijnIterator.HasNext())
 		{
 			Set Sublijn = SublijnIterator.Next()
-			If (Sublijn.VerwerkingSoftware = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(MagazijnNaam))
+			If (Sublijn.VerwerkingSoftware = MagazijnID)
 			{
 				Set Bon.AantalLijnen = Bon.AantalLijnen + 1
 				If (Sublijn.StatusWMS="W")
@@ -125,11 +126,12 @@
 	{
 		Set Magazijn = ##class(APPS.MAG.UGLYPicking.dto.Magazijn).%New()
 		
-		Set Magazijn.Naam = MagazijnNaamIterator.Next()
+		Set Magazijn.MagazijnID = MagazijnNaamIterator.Next()
+		Set Magazijn.Naam = ##class(APPS.MAG.UGLYPicking.enu.Magazijn).LogicalToDisplay(Magazijn.MagazijnID)
 		Set Magazijn.AantalOrders = 0
 		
 		Set Status = ""
-		Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(Magazijn.Naam)
+		Set Iterator = ##class(APPS.MAG.UGLYPicking.impl.BonInMagazijnIterator).%New(Magazijn.MagazijnID)
 		While (Iterator.HasNext())
 		{
 			Set BonNr = Iterator.Next()
@@ -153,7 +155,7 @@
 		
 		Set Magazijn.Status = Status
 		
-		Do Magazijnen.Lijst.Insert(Magazijn)
+		Do Magazijnen.Insert(Magazijn)
 	}
 	
 	Quit Magazijnen
@@ -229,6 +231,21 @@
 <Method name="GeefProductLijnen">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
+<Implementation><![CDATA[
+	Set ProductLijnen = ##class(APPS.MAG.UGLYPicking.dto.ProductLijnen).%New()
+	
+	Set ProductLijnen.BonNr = BonNr
+	
+	Set lbKennisID=##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(1000,.Error,$LB("MAG:PICK"),,,"UGLY Picking Klant",1000,1,4,0)
+	
+	For i=1:1:$LL(lbKennisID)
+	{
+		Set Kennis = ##class(Derde.Kennis.Kennis).%OpenId($LI(lbKennisID))
+		Do ProductLijnen.KennisAnkers.Insert(Kennis.Msg)
+	}
+	
+	Quit ProductLijnen
+]]></Implementation>
 </Method>
 
 <Method name="NeemSessieOver">
Index: APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml
===================================================================
diff -u -r1578 -r1594
--- APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml	(.../Magazijnen.cls.xml)	(revision 1578)
+++ APPS/MAG/UGLYPicking/dto/Magazijnen.cls.xml	(.../Magazijnen.cls.xml)	(revision 1594)
@@ -2,12 +2,18 @@
 <Export generator="Cache" version="9">
 <Class name="APPS.MAG.UGLYPicking.dto.Magazijnen">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,%XML.Adaptor</Super>
+<Super>%ListOfObjects,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Lijst">
-<Type>APPS.MAG.UGLYPicking.dto.Magazijn</Type>
-<Collection>list</Collection>
-</Property>
+<Parameter name="ELEMENTTYPE">
+<Default>APPS.MAG.UGLYPicking.dto.Magazijn</Default>
+</Parameter>
+
+<UDLText name="T">
+<Content><![CDATA[
+//Property Lijst As APPS.MAG.UGLYPicking.dto.Magazijn [ Collection = list ];
+
+]]></Content>
+</UDLText>
 </Class>
 </Export>
Index: APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml
===================================================================
diff -u -r1576 -r1594
--- APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml	(.../ProductLijn.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/ProductLijn.cls.xml	(.../ProductLijn.cls.xml)	(revision 1594)
@@ -3,15 +3,12 @@
 <Class name="APPS.MAG.UGLYPicking.dto.ProductLijn">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Aantal">
 <Type>%Integer</Type>
 </Property>
 
-<Property name="BonNr">
-<Type>%Integer</Type>
-</Property>
-
 <Property name="HeeftChargeNr">
 <Type>%Boolean</Type>
 </Property>
Index: CSC Ugly Picking.prj.xml
===================================================================
diff -u -r1586 -r1594
--- CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1586)
+++ CSC Ugly Picking.prj.xml	(.../CSC Ugly Picking.prj.xml)	(revision 1594)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC Ugly Picking" LastModified="2011-07-04 11:04:04">
+<Project name="CSC Ugly Picking" LastModified="2011-07-05 09:51:35">
   <Items>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bon" type="CLS"/>
     <ProjectItem name="APPS.MAG.UGLYPicking.dto.Bonnen" type="CLS"/>