Index: AXimpl/FileWriter.cls.xml
===================================================================
diff -u -r46253 -r48463
--- AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 46253)
+++ AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 48463)
@@ -62,27 +62,29 @@
 </Method>
 
 <Method name="WriteXML">
-<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String=""</FormalSpec>
+<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String="",Command:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	do ..FileWriter.WriteXML(XMLObject,XMLExportOpties,TopTag)
 	
-	#dim From As %String = ""
-	#dim To As %String = ""
-	
-	set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
-	set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
-	
-	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
-	
-	set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"" action=""update"">"
-	set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" action=""update"" class=""entity"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">"	
+	If (##class(TECH.StringUtils).Equals(Command,"Customer/Upsert","Customer/UpdatePart1","Customer/UpdatePart2","Customer/Create","SalesInvoice/Create")) {
+		#dim From As %String = ""
+		#dim To As %String = ""
+		
+		set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
+		set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
+		
+		do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+		
+		set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"" action=""update"">"
+		set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" action=""update"" class=""entity"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">"	
 
-	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
-	
-	set From = "<Values>"
-	set To = "<Values xmlns=""http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"">"
-	
-	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+		do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+		
+		set From = "<Values>"
+		set To = "<Values xmlns=""http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"">"
+		
+		do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+	}
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r42601 -r48463
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42601)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48463)
@@ -38,6 +38,8 @@
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create",KlantId))
 	
+	w !,..GeefBestandLocatie()
+	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
 ]]></Implementation>
 </Method>
@@ -155,7 +157,7 @@
 	
 	set FileWriterMock = ##class(vhTest.Mock.AXimpl.FileWriter).%New()
 	do FileWriterMock.VerwachtMethodCall("Open",$$$ElkeWaarde).ExactAantalKeer(0)
-	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde).ExactAantalKeer(0)
+	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(0)
 	do FileWriterMock.VerwachtMethodCall("Close",$$$ElkeWaarde).ExactAantalKeer(0)
 	
 	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r48403 -r48463
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 48403)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 48463)
@@ -101,7 +101,7 @@
 		#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())
 
Index: vhTest/Mock/AXimpl/FileWriter.cls.xml
===================================================================
diff -u -r46256 -r48463
--- vhTest/Mock/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 46256)
+++ vhTest/Mock/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 48463)
@@ -62,8 +62,8 @@
 </Method>
 
 <Method name="WriteXML">
-<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String=""</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("WriteXML",XMLObject,XMLExportOpties,TopTag)
+<FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String="",Command:%String=""</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("WriteXML",XMLObject,XMLExportOpties,TopTag,Command)
 ]]></Implementation>
 </Method>
 </Class>