Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt
===================================================================
diff -u -r72139 -r72585
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt	(.../WS.OBJT.WMSService.txt)	(revision 72139)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt	(.../WS.OBJT.WMSService.txt)	(revision 72585)
@@ -35,7 +35,7 @@
                     </s:sequence>
                 </s:complexType>
             </s:element>
-            <s:element name="PrintKlantEtiket">
+            <s:element name="GeefKlantEtiketBartenderData">
                 <s:complexType>
                     <s:sequence>
                         <s:element minOccurs="0" name="KlantEtiketRequest" type="s0:dtoKlantEtiketRequest"/>
@@ -55,6 +55,20 @@
                 </s:complexContent>
             </s:complexType>
             <s:complexType abstract="true" name="DataTransferObject"/>
+            <s:element name="GeefKlantEtiketBartenderDataResponse">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element name="GeefKlantEtiketBartenderDataResult" type="s:string"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+            <s:element name="PrintKlantEtiket">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element minOccurs="0" name="KlantEtiketRequest" type="s0:dtoKlantEtiketRequest"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
             <s:element name="PrintKlantEtiketResponse">
                 <s:complexType>
                     <s:sequence>
@@ -165,6 +179,12 @@
     <message name="AfmeldenPickingSoapOut">
         <part name="parameters" element="s0:AfmeldenPickingResponse"/>
     </message>
+    <message name="GeefKlantEtiketBartenderDataSoapIn">
+        <part name="parameters" element="s0:GeefKlantEtiketBartenderData"/>
+    </message>
+    <message name="GeefKlantEtiketBartenderDataSoapOut">
+        <part name="parameters" element="s0:GeefKlantEtiketBartenderDataResponse"/>
+    </message>
     <message name="PrintKlantEtiketSoapIn">
         <part name="parameters" element="s0:PrintKlantEtiket"/>
     </message>
@@ -194,6 +214,10 @@
             <input message="s0:AfmeldenPickingSoapIn"/>
             <output message="s0:AfmeldenPickingSoapOut"/>
         </operation>
+        <operation name="GeefKlantEtiketBartenderData">
+            <input message="s0:GeefKlantEtiketBartenderDataSoapIn"/>
+            <output message="s0:GeefKlantEtiketBartenderDataSoapOut"/>
+        </operation>
         <operation name="PrintKlantEtiket">
             <input message="s0:PrintKlantEtiketSoapIn"/>
             <output message="s0:PrintKlantEtiketSoapOut"/>
@@ -222,6 +246,15 @@
                 <soap:body use="literal"/>
             </output>
         </operation>
+        <operation name="GeefKlantEtiketBartenderData">
+            <soap:operation soapAction="http://cache01.vanhoecke.be/objt/WS.OBJT.WMSService.GeefKlantEtiketBartenderData" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
         <operation name="PrintKlantEtiket">
             <soap:operation soapAction="http://cache01.vanhoecke.be/objt/WS.OBJT.WMSService.PrintKlantEtiket" style="document"/>
             <input>
Index: BL/Flow/Levering/Label.cls.xml
===================================================================
diff -u -r71669 -r72585
--- BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 71669)
+++ BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 72585)
@@ -129,11 +129,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="PrintLabelKlantAdres">
-<Description>
-Afdruk van een label voor een klantpallet</Description>
-<FormalSpec>Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="",LPNMOP:%String=""</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Method name="HaalopLabelKlantAdresData">
+<FormalSpec>Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="",LPNMOP:%String="",ReturnDtoOnly:%Boolean=$$$False</FormalSpec>
 <Implementation><![CDATA[
     If ..BONNr="" Quit $$$ERROR($$$GeneralError,"BONNr is leeg")
     If Printer="" Quit $$$ERROR($$$GeneralError,"Printer is niet ingevuld")
@@ -219,7 +216,6 @@
     
    	If Printer["\\" Set ..pxLabelKlant.Device=Printer  ;als het UNC-pad van de printer wordt doorgegeven vul je het rechstreeks in
    	Else  Set ..pxLabelKlant.Device=##class(BL.Sys.LabelPrinter).FullDevicePad(Printer)
-	
 	Try {
 		Set ..pxLabelKlant.VerzendwijzeExtraInfo = ..ExtraInfoVoorSubmagazijnBepaler.GeefExtraInfoVoorBon(..BONNr)
 	} Catch {
@@ -230,14 +226,22 @@
 		
 		Set ..pxLabelKlant.VerzendwijzeExtraInfo = ""
 	}
+]]></Implementation>
+</Method>
+
+<Method name="PrintLabelKlantAdres">
+<FormalSpec>Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="",LPNMOP:%String=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..HaalopLabelKlantAdresData(Printer,Aantal,MagazijnID,MagazijnID,UserIdPicker,LPNMOP)
 	
     Set blPrint = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter("EWMSKlant",Printer)
     If $$$ISERR(blPrint)||('$IsObject(blPrint)) Do  Quit $$$ERROR($$$GeneralError,"Afdruk mislukt: Toepassing niet geregistreerd")
     . Do ..Logger.ErrorMail("PrintLabelKlantAdres - GetPrinter","Failed : "_$$ParseStatus^vhLib(blPrint))
 
     Do blPrint.AddLabel(..pxLabelKlant)
     Do ..Logger.Debug("PrintLabelKlantAdres",
-    	"Klantnaam='" _ ..pxLabelKlant.KlantNaam _ "' KLNr='" _ KLNr _" gekozen logo:'" _ ..pxLabelKlant.Logo)
+    	"Klantnaam='" _ ..pxLabelKlant.KlantNaam _" gekozen logo:'" _ ..pxLabelKlant.Logo)
     Set stPrint = blPrint.PrintLabels()
     If $$$ISERR(stPrint) Do  Quit stPrint
     . Do ..Logger.ErrorMail("PrintLabelKlantAdres - PrintLabels",$$ParseStatus^vhLib(stPrint))
@@ -246,6 +250,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlantLabelBartenderData">
+<FormalSpec>Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="",LPNMOP:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do ..HaalopLabelKlantAdresData(Printer,Aantal,MagazijnID,MagazijnID,UserIdPicker,LPNMOP)
+    Set blPrint = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter("EWMSKlant",Printer)
+    If $$$ISERR(blPrint)||('$IsObject(blPrint)) Do  Quit $$$ERROR($$$GeneralError,"Afdruk mislukt: Toepassing niet geregistreerd")
+    . Do ..Logger.ErrorMail("PrintLabelKlantAdres - GetPrinter","Failed : "_$$ParseStatus^vhLib(blPrint))
+	
+    Do blPrint.AddLabel(..pxLabelKlant)
+    
+    Do ..Logger.Debug("PrintLabelKlantAdres","Klantnaam='" _ ..pxLabelKlant.KlantNaam _" gekozen logo:'" _ ..pxLabelKlant.Logo)
+    Quit blPrint.GeefLabelData()
+]]></Implementation>
+</Method>
+
 <Method name="PrintProductLabel">
 <Description>
 Afdruk van een productlabel</Description>
Index: APPS/common/Print/impl/BartenderPrinter.cls.xml
===================================================================
diff -u -r41597 -r72585
--- APPS/common/Print/impl/BartenderPrinter.cls.xml	(.../BartenderPrinter.cls.xml)	(revision 41597)
+++ APPS/common/Print/impl/BartenderPrinter.cls.xml	(.../BartenderPrinter.cls.xml)	(revision 72585)
@@ -41,6 +41,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLabelData">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..LabelPrinter.GeefBartenderLabelData()
+]]></Implementation>
+</Method>
+
 <Method name="AddLabel">
 <FormalSpec>pxLabel:APPS.common.Print.AbstractLabel</FormalSpec>
 <ReturnType>%Status</ReturnType>
Index: FLOWBON4.mac.rou
===================================================================
diff -u -r71371 -r72585
--- FLOWBON4.mac.rou	(.../FLOWBON4.mac.rou)	(revision 71371)
+++ FLOWBON4.mac.rou	(.../FLOWBON4.mac.rou)	(revision 72585)
@@ -166,7 +166,7 @@
  do PrintLabel(BONNr,Printer,1,##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(Magazijn),LPN,UserIdPicker,LPNMOP)
  Quit
  
-PrintLabel(BONNR,Printer,Aantal,MagazijnID,LPN,UserIdPicker,LPNMOP)
+PrintLabel(BONNr,Printer,Aantal,MagazijnID,LPN,UserIdPicker,LPNMOP)
  Set Aantal = $G(Aantal,1)
  Set LPN = $Get(LPN)
  Set UserIdPicker=$Get(UserIdPicker)
@@ -177,8 +177,16 @@
  Do blLabel.PrintLabelKlantAdres(Printer,Aantal,.MagazijnID,UserIdPicker,LPNMOP)
  Quit
  
- 
- 
+GEEFLABELDATA(BONNr,MagazijnID,LPN,UserIdPicker)
+ Set Aantal = $G(Aantal,1)
+ Set LPN = $Get(LPN)
+ Set UserIdPicker=$Get(UserIdPicker)
+ Set Printer = ##class(BL.Sys.LabelPrinter).DefaultDevice("KLANT_ADRES",MagazijnID)
+ new blLabel 
+ Set blLabel=##class(BL.Flow.Levering.Label).Instantiate()
+ Do blLabel.Init(BONNr,,LPN)
+ Quit blLabel.GeefKlantLabelBartenderData(Printer,Aantal,.MagazijnID,UserIdPicker)
+  
  New C
  ;Set:'$L($G(Dev)) Dev=$$DEV^vhPRINTER("lbl Uitvoer EWMS") ; Device labelprinter : \\REQ DATKON\Generic / Text Only 
  If '$D(^RES("LABELPRINTER","PI","DEVICE","D",Dev)) Set Dev=""
Index: WS/OBJT/WMSService.cls.xml
===================================================================
diff -u -r71371 -r72585
--- WS/OBJT/WMSService.cls.xml	(.../WMSService.cls.xml)	(revision 71371)
+++ WS/OBJT/WMSService.cls.xml	(.../WMSService.cls.xml)	(revision 72585)
@@ -77,6 +77,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlantEtiketBartenderData">
+<FormalSpec>KlantEtiketRequest:OBJTimpl.WMSOrder.dtoKlantEtiketRequest</FormalSpec>
+<ReturnType>%String</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(OBJTimpl.WMSOrder.PrintKlantEtiket).%New().GeefKlantEtiketBartenderData(KlantEtiketRequest)
+]]></Implementation>
+</Method>
+
 <Method name="PrintKlantEtiketMOP">
 <FormalSpec>KlantEtiketRequestMOP:OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOP</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: BL/Sys/LabelPrinter.cls.xml
===================================================================
diff -u -r63610 -r72585
--- BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 63610)
+++ BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 72585)
@@ -349,6 +349,45 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBartenderLabelData">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DataToQuit as %String = ""
+  	#dim BartDevice As %String = $O(..Data(""))
+	While BartDevice '= "" 
+	{
+		#dim BartLayout As %String = $O(..Data(BartDevice,""))
+		While BartLayout '= "" 
+		{
+			Set DataToQuit = ..GeefBartenderLabelDataWithLayout(BartDevice,BartLayout)
+			Set BartLayout = $O(..Data(BartDevice,BartLayout))
+		}
+		Set BartDevice = $O(..Data(BartDevice))
+	}
+	Quit DataToQuit
+]]></Implementation>
+</Method>
+
+<Method name="GeefBartenderLabelDataWithLayout">
+<FormalSpec>BartDevice:%String,BartLayout:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Io as TECH.IO = ##class(TECH.IO).%New()
+	Do Io.Redirect()
+	#dim File As %String = Io.GeefLocatie()
+	; Set File = ..CreateFile(BartDevice,BartLayout)
+	Write "%BTW% /AF="""_BartLayout_".btw"" /PRN="""_BartDevice_""""_" /R=3 /P  /D=<Trigger File Name> /CLOSE",$C(13,10)
+	Write "%END%",$C(13,10)	
+
+	Do ..WriteFile(File,BartDevice,BartLayout)
+	Do Io.Reset()
+	#dim Result as %String = Io.GeefStream().Read()
+	Do Io.KuisOp()
+	Quit Result
+]]></Implementation>
+</Method>
+
 <Method name="WriteFile">
 <FormalSpec>FileName:%String,BartDevice:%String,BartLayout:%String</FormalSpec>
 <Private>1</Private>
Index: OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml
===================================================================
diff -u -r72507 -r72585
--- OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 72507)
+++ OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 72585)
@@ -50,6 +50,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlantEtiketBartenderData">
+<FormalSpec>KlantEtiketRequest:OBJTimpl.WMSOrder.dtoKlantEtiketRequest</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim PickerUserId = ..PickerUserIdOphaler.GeefUserIdPickerVanLPN(KlantEtiketRequest.ConsNr,KlantEtiketRequest.LPN)
+	Do ..StoreLPN(KlantEtiketRequest.ConsNr,KlantEtiketRequest.Vertrekplaats,KlantEtiketRequest.LPN, PickerUserId)
+	
+	Quit $$GEEFLABELDATA^FLOWBON4($e($TR(KlantEtiketRequest.ConsNr,"b"),5,10), ..ConverteerVertrekplaats(KlantEtiketRequest.Vertrekplaats),KlantEtiketRequest.LPN,PickerUserId)
+]]></Implementation>
+</Method>
+
 <Method name="PrintKlantEtiketMOP">
 <FormalSpec>KlantEtiketRequestMOP:OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOP</FormalSpec>
 <ReturnType>%String</ReturnType>