Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r48403 -r61028
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 48403)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 61028)
@@ -92,16 +92,27 @@
 
 <Method name="Generate">
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim Result as %Boolean = $$$True
 	try {
 		#dim RequestEnvelope As %CacheString = ..RequestComposer.Compose(Request)
 	
 		#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_OUT_RequestPath"),..ConfigOut.GetSubPath(Request))
-		#dim Filename As %String = $replace(Request.Command,"/","-")_" "_..GeefSubject(Request.SubjectId)_" "_" - "_RequestEnvelope.Header.Company_" - "_..FileWriter.GetTimeStamp()_".xml"
+		
+		// [ICT-1078] Fase 2 sturen bericht dat pakbon mag geboekt worden
+		// Deze hardcoded voorzien, aangezien in AX het PakbonMagGeboektWorden bericht afgehandeld wordt door dezelfde verwerker als het PickingCompleet bericht.
+		// Daarom moet ook de naam van de file aangepast worden naar PickingCompleet i.p.v. PakbonMagGeboektWorden, anders zal de file niet correct verwerkt worden.
+		#dim RequestCommandForFileName As %String = Request.Command
+		If (RequestCommandForFileName = "Inventory/PakbonMagGeboektWorden") {
+			Set RequestCommandForFileName  = "Inventory/PickingCompleet"
+		}	
+		
+		#dim Filename As %String = $replace(RequestCommandForFileName,"/","-")_" "_..GeefSubject(Request.SubjectId)_" "_" - "_RequestEnvelope.Header.Company_" - "_..FileWriter.GetTimeStamp()_".xml"
 		#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)
 		
 		do ..FileWriter.Open(FullFilename,$$$True)
-		do ..FileWriter.WriteXML(RequestEnvelope)
+		do ..FileWriter.WriteXML(RequestEnvelope,,,Request.Command)
 	
 		do ..EventRaiser.RaiseRequestSendEvent(Request.Command,Request.SubjectId,RequestEnvelope,..FileWriter.GetStream())
 
@@ -111,8 +122,10 @@
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		If $$$Not(Exceptie.%ClassName(1) = ##class(AXimpl.NoConversionNeededException).%ClassName(1)) {
 			Do ##class(vhLib.Logger).LogExceptie(Exceptie)
+			Set Result = $$$False
 		}	
 	}
+	Quit Result
 ]]></Implementation>
 </Method>