Index: BL/Flow/Levering/Label.cls.xml
===================================================================
diff -u -r1074 -r2523
--- BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 1074)
+++ BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 2523)
@@ -113,23 +113,44 @@
 <Method name="PrintLabelKlantAdres">
 <Description>
 Afdruk van een label voor een klantpallet</Description>
-<FormalSpec>Printer:%String="0",Aantal:%Numeric=1</FormalSpec>
+<FormalSpec>Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set UserIDPicker = ""
     If ..BONNr="" Quit $$$ERROR($$$GeneralError,"BONNr is leeg")
     If Printer="" Quit $$$ERROR($$$GeneralError,"Printer is niet ingevuld")
-	If $D(^ORDW("D",..BONNr)) Do 
-	. Set xCons=$G(^ORDW("D",..BONNr))
-    . If xCons="" Set KLNr="" Quit
-    . Set xAdres=$G(^ORDW("D",..BONNr,"A"))
-    . Set Verzw=$P(xCons,"\",2)
-    Else  Do
-    . Set KLNr=$P(^KU1(..BONNr,"F"),"\")
-    . Set FacSoort=$$NODE^FLOWBON(..BONNr)
-	. Set Rec=^KUL(KLNr,FacSoort,..BONNr,1)
-    . Set xHeader=$G(^KUL(KLNr,FacSoort,..BONNr,1))
-    . Set xAdres=$G(^KUL(KLNr,FacSoort,..BONNr,3))    
-    . set Verzw=$P($P($P(xHeader,"\",7),"#")," ")
+	If $D(^ORDW("D",..BONNr))
+	{ 
+		Set xCons=$G(^ORDW("D",..BONNr))
+    	If xCons="" Set KLNr="" Quit
+    	Set xAdres=$G(^ORDW("D",..BONNr,"A"))
+    	Set Verzw=$P(xCons,"\",2)
+    	If (MagazijnID '= "")
+    	{
+	    	Set SublijnInBonIterator = ##class(APPS.MAG.UGLYPicking.impl.SublijnInBonIterator).%New(..BONNr)
+	    	If (SublijnInBonIterator.HasNext())
+	    	{
+		    	Set Sublijn = SublijnInBonIterator.Next()
+		    	While (Sublijn.VerwerkingSoftware '= MagazijnID) && (SublijnInBonIterator.HasNext())
+		    	{
+			    	Set Sublijn = SublijnInBonIterator.Next()
+		    	}
+		    	If (Sublijn.VerwerkingSoftware = MagazijnID)
+		    	{
+			    	Set UserIDPicker = Sublijn.UserID
+		    	}
+	    	}
+    	}
+	}
+    Else
+    {
+    	Set KLNr=$P(^KU1(..BONNr,"F"),"\")
+    	Set FacSoort=$$NODE^FLOWBON(..BONNr)
+		Set Rec=^KUL(KLNr,FacSoort,..BONNr,1)
+    	Set xHeader=$G(^KUL(KLNr,FacSoort,..BONNr,1))
+    	Set xAdres=$G(^KUL(KLNr,FacSoort,..BONNr,3))    
+    	set Verzw=$P($P($P(xHeader,"\",7),"#")," ")
+    }
     Set KLNr=..GetAfzender(..BONNr)
     If KLNr="" Quit $$$ERROR($$$GeneralError,"Verkeerd bonnummer "_..BONNr_": geen data in de global.")
     Set ..pxLabelKlant=##class(BL.Flow.Levering.sub.pxKlantPallet).Create()
@@ -147,10 +168,11 @@
     Set ..pxLabelKlant.Verzendwijze=Verzw_$S($$ISORGAL^FLOW("L",..BONNr):"+",1:"")
     Set ..pxLabelKlant.KlantnaamBIG=$Piece(xAdres,"\",2)
     Set ..pxLabelKlant.CommRef=..CommissieRef(KLNr,..BONNr)
+    Set ..pxLabelKlant.UserIDPicker = UserIDPicker
+    Set ..pxLabelKlant.MagazijnID = MagazijnID
     ; inherited properties
     Set ..pxLabelKlant.Taal=$Piece(^KKL(^KK1(KLNr),0),"\",9)
     Set ..pxLabelKlant.Aantal=Aantal
-    
     Set ..pxLabelKlant.Layout = ..blLabelPrinter.LayoutTemplate(Printer,"KLANT_ADRES")
     
     //Set ..pxLabelKlant.Device=Printer
Index: BL/Flow/Levering/sub/pxKlantPallet.cls.xml
===================================================================
diff -u -r1074 -r2523
--- BL/Flow/Levering/sub/pxKlantPallet.cls.xml	(.../pxKlantPallet.cls.xml)	(revision 1074)
+++ BL/Flow/Levering/sub/pxKlantPallet.cls.xml	(.../pxKlantPallet.cls.xml)	(revision 2523)
@@ -58,10 +58,18 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="MagazijnID">
+<Type>%String</Type>
+</Property>
+
+<Property name="UserIDPicker">
+<Type>%String</Type>
+</Property>
+
 <Method name="WriteRow">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Write ..Logo,*9,..KlantNaam,*9,..Toenaam,*9,..StraatNaamNr,*9,..Gemeente,*9,..Bonnr,*9,..Verzendwijze,*9,..KlantnaamBIG,*9,..CommRef,*9,..PalID
+	Write ..Logo,*9,..KlantNaam,*9,..Toenaam,*9,..StraatNaamNr,*9,..Gemeente,*9,..Bonnr,*9,..Verzendwijze,*9,..KlantnaamBIG,*9,..CommRef,*9,..PalID,*9,..MagazijnID,*9,..UserIDPicker
 	Write $C(13,10)
 	Quit $$$OK
 ]]></Implementation>
Index: FLOWBON4.mac.rou
===================================================================
diff -u -r734 -r2523
--- FLOWBON4.mac.rou	(.../FLOWBON4.mac.rou)	(revision 734)
+++ FLOWBON4.mac.rou	(.../FLOWBON4.mac.rou)	(revision 2523)
@@ -191,15 +191,15 @@
  Set Magazijn = $G(Magazijn)
  If '$L(Magazijn) Set Printer = $$SelectPrinter    // indien geen magazijn opgegeven vragen naar printer
  If ($L(Magazijn))||('$L(Printer)) Set Printer = ##class(BL.Sys.LabelPrinter).DefaultDevice("KLANT_ADRES",Magazijn)  // indien magazijn of geen printer gekozen default printer ophalen 
- do PrintLabel(BONNr,Printer)
+ do PrintLabel(BONNr,Printer,1,MagazijnID)
  Quit
  
-PrintLabel(BONNR,Printer,Aantal)
+PrintLabel(BONNR,Printer,Aantal,MagazijnID)
  Set Aantal = $G(Aantal,1)
  new blLabel 
  Set blLabel=##class(BL.Flow.Levering.Label).Instantiate()
  Do blLabel.Init(BONNr)
- Do blLabel.PrintLabelKlantAdres(Printer,Aantal)
+ Do blLabel.PrintLabelKlantAdres(Printer,Aantal,.MagazijnID)
  Quit