Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35472 -r35503
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35472)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35503)
@@ -3,18 +3,181 @@
 <Class name="AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="CustomerCreator">
+<Type>AXimpl.AifMessage.Converter.CustomerCreateConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ObjectConverter">
+<Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>CustomerCreator:AXimpl.AifMessage.Converter.CustomerCreateConverter</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..CustomerCreator = $$$Inject(CustomerCreator,##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New())
+	set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.MessageParts</ReturnType>
 <Implementation><![CDATA[
-	#dim MessageParts As AXaif.Message.MessageParts = Command.Message.Body.MessageParts.%ConstructClone($$$true)
+	#dim MessagePartsRead As AXaif.Message.MessageParts = Command.Message.Body.MessageParts.%ConstructClone($$$true)
 	
-	do ..RemoveDefaultDimension(MessageParts)
+	set CreateCommand = ##class(AXimpl.AifMessage.Request).%New("Customer/Create",Command.SubjectId)
+	#dim MessagePartsCreate As AXaif.Message.MessageParts = ..CustomerCreator.Convert(Command)
 	
-	quit MessageParts
+	#dim MessagePartsUpdate = ..Merge(MessagePartsRead,MessagePartsCreate)
+	
+	do ..RemoveDefaultDimension(.MessagePartsUpdate)
+	
+	quit MessagePartsUpdate
 ]]></Implementation>
 </Method>
 
+<Method name="Merge">
+<FormalSpec>MessagePartsRead:AXaif.Message.MessageParts,MessagePartsCreate:AXaif.Message.MessageParts</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim MessagePartsUpdate As AXaif.Message.MessageParts = MessagePartsRead.%ConstructClone()
+
+	do ..MergeCustables(MessagePartsCreate,.MessagePartsUpdate)
+
+	quit MessagePartsUpdate
+]]></Implementation>
+</Method>
+
+<Method name="MergeCustables">
+<FormalSpec><![CDATA[MessagePartsCreate:AXaif.Message.MessageParts,&MessagePartsUpdate:AXaif.Message.MessageParts]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set CustTableUpdateIterator = ##class(TECH.ListIterator).%New(MessagePartsUpdate.Customer.CustTable)
+	while CustTableUpdateIterator.HasNext() {
+		#dim CustTableUpdate As AXaif.Customer.AxdEntityCustTable = CustTableUpdateIterator.Next()
+		#dim CustTableCreate As AXaif.Customer.AxdEntityCustTable = MessagePartsCreate.Customer.CustTable.GetAt(CustTableUpdateIterator.Key())
+		do ..MergeCustTable(CustTableCreate,.CustTableUpdate)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MergeCustTable">
+<FormalSpec><![CDATA[CustTableCreate:AXaif.Customer.AxdEntityCustTable,&CustTableUpdate:AXaif.Customer.AxdEntityCustTable]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("CashDisc")
+	do ConvertOptions.Add("Currency")
+	do ConvertOptions.Add("CustClassificationId")
+	do ConvertOptions.Add("CustGroup")
+	do ConvertOptions.Add("EnterpriseNumber")
+	do ConvertOptions.Add("PaymMode")
+	do ConvertOptions.Add("PaymTermId")
+	do ConvertOptions.Add("Name")
+	do ConvertOptions.Add("TaxGroup")
+	do ConvertOptions.Add("VATNum")
+	
+	do ..ObjectConverter.Convert(CustTableCreate,CustTableUpdate,ConvertOptions)
+
+	do ..MergeDirParties(CustTableCreate,.CustTableUpdate)
+]]></Implementation>
+</Method>
+
+<Method name="MergeDirParties">
+<FormalSpec><![CDATA[CustTableCreate:AXaif.Customer.AxdEntityCustTable,&CustTableUpdate:AXaif.Customer.AxdEntityCustTable]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set DirPartyIterator = ##class(TECH.ListIterator).%New(CustTableCreate.DirParty)
+	while DirPartyIterator.HasNext() {
+		#dim DirPartyCreate As AXaif.Customer.AxdEntityDirPartyDirPartyTable = DirPartyIterator.Next()
+		#dim DirPartyUpdate As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTableUpdate.DirParty.GetAt(DirPartyIterator.Key())
+		do ..MergeDirParty(DirPartyCreate,.DirPartyUpdate)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MergeDirParty">
+<FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirPartyTable,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirPartyTable]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("LanguageId")
+	do ConvertOptions.Add("Name")
+	do ConvertOptions.Add("NameAlias")
+	
+	do ..ObjectConverter.Convert(DirPartyTableCreate,DirPartyTableUpdate,ConvertOptions)
+	
+	do ..MergePostalAddressViews(DirPartyTableCreate,.DirPartyTableUpdate)
+	do ..MergeContactInfoViews(DirPartyTableCreate,.DirPartyTableUpdate)
+]]></Implementation>
+</Method>
+
+<Method name="MergePostalAddressViews">
+<FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirPartyTable,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirPartyTable]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set PostalAddressIterator = ##class(TECH.ListIterator).%New(DirPartyTableCreate.DirPartyPostalAddressView)
+	while PostalAddressIterator.HasNext() {
+		#dim PostalAddressViewCreate As AXaif.Customer.AxdEntityDirPartyPostalAddressView = PostalAddressIterator.Next()
+		#dim PostalAddressViewUpdate As AXaif.Customer.AxdEntityDirPartyPostalAddressView = DirPartyTableUpdate.DirPartyPostalAddressView.GetAt(PostalAddressIterator.Key())
+		do ..MergePostalAddressView(PostalAddressViewCreate,.PostalAddressViewUpdate)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MergePostalAddressView">
+<FormalSpec><![CDATA[PostalAddressViewCreate:AXaif.Customer.AxdEntityDirPartyPostalAddressView,&PostalAddressViewUpdate:AXaif.Customer.AxdEntityDirPartyPostalAddressView]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("Address")
+	do ConvertOptions.Add("City")
+	do ConvertOptions.Add("CountryRegionId")
+	do ConvertOptions.Add("LocationName")
+	do ConvertOptions.Add("Roles")
+	do ConvertOptions.Add("Street")
+	do ConvertOptions.Add("ZipCode")
+	
+	do ..ObjectConverter.Convert(PostalAddressViewCreate,PostalAddressViewUpdate,ConvertOptions)
+]]></Implementation>
+</Method>
+
+<Method name="MergeContactInfoViews">
+<FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirPartyTable,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirPartyTable]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ContactInfoIterator = ##class(TECH.ListIterator).%New(DirPartyTableCreate.DirPartyContactInfoView)
+	while ContactInfoIterator.HasNext() {
+		#dim ContactInfoViewCreate As AXaif.Customer.AxdEntityDirPartyContactInfoView = ContactInfoIterator.Next()
+		#dim ContactInfoViewUpdate As AXaif.Customer.AxdEntityDirPartyContactInfoView = DirPartyTableUpdate.DirPartyContactInfoView.GetAt(ContactInfoIterator.Key())
+		do ..MergePostalAddressView(ContactInfoViewCreate,.ContactInfoViewUpdate)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MergeContactInfoView">
+<FormalSpec><![CDATA[ContactInfoViewCreate:AXaif.Customer.AxdEntityDirPartyContactInfoView,&ContactInfoViewUpdate:AXaif.Customer.AxdEntityDirPartyContactInfoView]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	do ConvertOptions.Add("IsPrimary")
+	do ConvertOptions.Add("IsPrivate")
+	do ConvertOptions.Add("LocationName")
+	do ConvertOptions.Add("Locator")
+	do ConvertOptions.Add("Roles")
+	do ConvertOptions.Add("Type")
+	
+	do ..ObjectConverter.Convert(ContactInfoViewCreate,ContactInfoViewUpdate,ConvertOptions)
+]]></Implementation>
+</Method>
+
 <Method name="RemoveDefaultDimension">
 <FormalSpec><![CDATA[&MessageParts:AXaif.Message.MessageParts]]></FormalSpec>
 <Private>1</Private>