Index: AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml
===================================================================
diff -u -r59067 -r59106
--- AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml	(.../PakbonMagGeboektWorden.cls.xml)	(revision 59067)
+++ AXimpl/Dynamics/InventoryOut/EventHandler/PickingCompleet/PakbonMagGeboektWorden.cls.xml	(.../PakbonMagGeboektWorden.cls.xml)	(revision 59106)
@@ -8,6 +8,18 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>EventRaiser:DOM.MAG.event.EventRaiser</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..EventRaiser = $$$Inject(EventRaiser, ##class(DOM.MAG.event.EventRaiser).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="RaisePakbonMagGeboektWordenEvent">
 <FormalSpec>GeneratePickingCompleetResult:%Boolean,CONSNr:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -20,18 +32,6 @@
 	Quit $$$False
 ]]></Implementation>
 </Method>
-
-<Method name="%OnNew">
-<FormalSpec>EventRaiser:DOM.MAG.event.EventRaiser</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..EventRaiser = $$$Inject(EventRaiser, ##class(DOM.MAG.event.EventRaiser).%New())
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PakbonMagGeboektWorden/Convert/Test.cls.xml
===================================================================
diff -u -r59102 -r59106
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PakbonMagGeboektWorden/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 59102)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PakbonMagGeboektWorden/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 59106)
@@ -3,44 +3,6 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.Converter.PakbonMagGeboektWorden.Convert.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="MaakInventSyncAntwoord">
-<FormalSpec>AantalInventSync:%Integer</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.Inventory.MessageParts</ReturnType>
-<Implementation><![CDATA[
-	Set Antwoord = ##class(AXif.Dynamics.Inventory.MessageParts).%New()
-	Set MessagePart = ##class(AXif.Dynamics.Inventory.MessageParts.AxdADUMsgOutboundInQuery).%New()
-	Set InventSync = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync).%New()
-	Set Header = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityHeader).%New()
-	
-	#dim ii As %Integer
-	For ii=1:1:AantalInventSync {
-		Do Header.InventSync.Insert(InventSync)
-	}
-	Do MessagePart.Header.Insert(Header)
-	Set Antwoord.MessagePart = MessagePart
-	
-	Quit Antwoord
-]]></Implementation>
-</Method>
-
-<Method name="MaakProductApiStub">
-<FormalSpec>AantalProducten:%Integer</FormalSpec>
-<Private>1</Private>
-<ReturnType>vhTest.Mock.DOM.PM.ProductAPI</ReturnType>
-<Implementation><![CDATA[
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	
-	#dim ii As %Integer
-	For ii=1:1:AantalProducten {
-		Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductApiStub.IndienMethodCall("GeefProduct","100"_ii).DanReturn(ProductStub)
-	}
-	
-	Quit ProductApiStub
-]]></Implementation>
-</Method>
-
 <Method name="Test: PakbonMagGeboektWorden returns pick object met lege Qty en InventTransId - PickId en ShippingData ingevuld">
 <Implementation><![CDATA[
 	#dim AntwoordPickId As %String = "123456"
@@ -126,6 +88,44 @@
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),0)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakInventSyncAntwoord">
+<FormalSpec>AantalInventSync:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.Inventory.MessageParts</ReturnType>
+<Implementation><![CDATA[
+	Set Antwoord = ##class(AXif.Dynamics.Inventory.MessageParts).%New()
+	Set MessagePart = ##class(AXif.Dynamics.Inventory.MessageParts.AxdADUMsgOutboundInQuery).%New()
+	Set InventSync = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync).%New()
+	Set Header = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityHeader).%New()
+	
+	#dim ii As %Integer
+	For ii=1:1:AantalInventSync {
+		Do Header.InventSync.Insert(InventSync)
+	}
+	Do MessagePart.Header.Insert(Header)
+	Set Antwoord.MessagePart = MessagePart
+	
+	Quit Antwoord
+]]></Implementation>
+</Method>
+
+<Method name="MaakProductApiStub">
+<FormalSpec>AantalProducten:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.PM.ProductAPI</ReturnType>
+<Implementation><![CDATA[
+	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	
+	#dim ii As %Integer
+	For ii=1:1:AantalProducten {
+		Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+		Do ProductApiStub.IndienMethodCall("GeefProduct","100"_ii).DanReturn(ProductStub)
+	}
+	
+	Quit ProductApiStub
+]]></Implementation>
+</Method>
 </Class>