Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml
===================================================================
diff -u -r59067 -r59581
--- vhTest/Mock/AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml	(.../PakbonMagGeboektWorden.cls.xml)	(revision 59067)
+++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml	(.../PakbonMagGeboektWorden.cls.xml)	(revision 59581)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>EventRaiser:DOM.MAG.event.EventRaiser</FormalSpec>
+<FormalSpec>EventRaiser:DOM.MAG.event.EventRaiser,OrderApi:DOM.VKP.OrderAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: AXimpl/Dynamics/InventoryOut/EventHandler/PakbonMagGeboektWorden/AanduidenAxBerichtPakbonMagGeboektWordenVerzonden.cls.xml
===================================================================
diff -u -r59287 -r59581
--- AXimpl/Dynamics/InventoryOut/EventHandler/PakbonMagGeboektWorden/AanduidenAxBerichtPakbonMagGeboektWordenVerzonden.cls.xml	(.../AanduidenAxBerichtPakbonMagGeboektWordenVerzonden.cls.xml)	(revision 59287)
+++ AXimpl/Dynamics/InventoryOut/EventHandler/PakbonMagGeboektWorden/AanduidenAxBerichtPakbonMagGeboektWordenVerzonden.cls.xml	(.../AanduidenAxBerichtPakbonMagGeboektWordenVerzonden.cls.xml)	(revision 59581)
@@ -3,14 +3,35 @@
 <Class name="AXimpl.Dynamics.InventoryOut.EventHandler.PakbonMagGeboektWorden.AanduidenAxBerichtPakbonMagGeboektWordenVerzonden">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderApi = $$$Inject(OrderApi, ##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MarkerenAlsVerzonden">
 <FormalSpec>GeneratePickingCompleetResult:%Boolean,Bonnummer:%String</FormalSpec>
 <Implementation><![CDATA[
 	If (GeneratePickingCompleetResult)
 	{
-		#dim klant As %String = $Piece($Get(^KU1(Bonnummer,"F")),"\",1) 
+		#dim bon As DOM.VKP.Bon = ..OrderApi.GeefBon(Bonnummer)
 		
-		Set $Piece(^KUL(klant,"F",Bonnummer,1),"\",63) = $$$True
+		If ($IsObject(bon)){
+			#dim bonnr As %String = bon.GeefID()
+			#dim klant As %String = $Piece(bon.GeefKlantID(), "||",2)	
+			Do bon.ZetVlag(63, $$$True)
+		}
 	}
 ]]></Implementation>
 </Method>