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>