Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35570 -r35596
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35570)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35596)
@@ -13,6 +13,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ContactInfoViewComparator">
+<Type>TECH.Comparator.IComparator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ContactInfoViewSorter">
+<Type>TECH.Algo.Sort.InsertionSort</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>CustomerCreator:AXimpl.AifMessage.Converter.CustomerCreateConverter</FormalSpec>
 <Private>1</Private>
@@ -22,6 +32,9 @@
 <Implementation><![CDATA[
 	set ..CustomerCreator = $$$Inject(CustomerCreator,##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New())
 	set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	set ..ContactInfoViewComparator = ##class(TECH.Comparator.PropertyBasedComparator).%New("LocationName",##class(TECH.ListUtils).CreateListOfDataTypes("Telefoon 1","Telefoon 2"))
+	set ..ContactInfoViewSorter = ##class(TECH.Algo.Sort.InsertionSort).%New()	
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -72,14 +85,14 @@
 <Implementation><![CDATA[
 	#dim MessagePartsUpdate As AXaif.Message.MessageParts = MessagePartsRead.%ConstructClone()
 
-	do ..MergeCustables(MessagePartsCreate,.MessagePartsUpdate)
+	do ..MergeCustables(.MessagePartsUpdate,MessagePartsCreate)
 
 	quit MessagePartsUpdate
 ]]></Implementation>
 </Method>
 
 <Method name="MergeCustables">
-<FormalSpec><![CDATA[MessagePartsCreate:AXaif.Message.MessageParts,&MessagePartsUpdate:AXaif.Message.MessageParts]]></FormalSpec>
+<FormalSpec><![CDATA[&MessagePartsUpdate:AXaif.Message.MessageParts,MessagePartsCreate:AXaif.Message.MessageParts]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set CustTableUpdateIterator = ##class(TECH.ListIterator).%New(MessagePartsUpdate.Customer.CustTable)
@@ -97,6 +110,7 @@
 <Implementation><![CDATA[
 	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
 	do ConvertOptions.Add("action",,"set Output=""update""")
+	do ConvertOptions.Add("ADUTaxRegistrationNumber")
 	do ConvertOptions.Add("CashDisc")
 	do ConvertOptions.Add("Currency")
 	do ConvertOptions.Add("CustClassificationId")
@@ -207,21 +221,45 @@
 <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 ..MergeContactInfoView(ContactInfoViewCreate,.ContactInfoViewUpdate)
+	#dim Name As %String 
+	for Name = "Telefoon 1","Telefoon 2" {
+		#dim ContactInfoViewCreate As AXaif.Customer.AxdEntityDirPartyContactInfoView = ##class(TECH.ObjectListUtils).FindPropertyWithValue(DirPartyTableCreate.DirPartyContactInfoView,"LocationName",Name)
+		#dim ContactInfoViewUpdate As AXaif.Customer.AxdEntityDirPartyContactInfoView = ##class(TECH.ObjectListUtils).FindPropertyWithValue(DirPartyTableUpdate.DirPartyContactInfoView,"LocationName",Name)
+		
+		#dim Action As %String = ..CalculateAction(ContactInfoViewCreate,ContactInfoViewUpdate)
+		continue:Action="none"
+
+		if Action = "delete" { 
+			set ContactInfoViewUpdate.action = "delete"
+		} else {
+			if Action = "create" {
+				set ContactInfoViewUpdate = ##class(AXaif.Customer.AxdEntityDirPartyContactInfoView).%New()
+				do DirPartyTableUpdate.DirPartyContactInfoView.Insert(ContactInfoViewUpdate)
+			}
+			do ..MergeContactInfoView(ContactInfoViewCreate,.ContactInfoViewUpdate,Action)
+		}
 	}
+		
+	do ..ContactInfoViewSorter.Sort(DirPartyTableUpdate.DirPartyContactInfoView,..ContactInfoViewComparator)
 ]]></Implementation>
 </Method>
 
+<Method name="CalculateAction">
+<FormalSpec>ContactInfoViewCreate:AXaif.Customer.AxdEntityDirPartyContactInfoView,ContactInfoViewUpdate:AXaif.Customer.AxdEntityDirPartyContactInfoView</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Lookup As TECH.MultiDim
+	set Lookup("00")="none", Lookup("11")="update", Lookup("01")="create", Lookup("10")="delete"
+	quit Lookup($IsObject(ContactInfoViewUpdate)_$IsObject(ContactInfoViewCreate))
+]]></Implementation>
+</Method>
+
 <Method name="MergeContactInfoView">
-<FormalSpec><![CDATA[ContactInfoViewCreate:AXaif.Customer.AxdEntityDirPartyContactInfoView,&ContactInfoViewUpdate:AXaif.Customer.AxdEntityDirPartyContactInfoView]]></FormalSpec>
+<FormalSpec><![CDATA[ContactInfoViewCreate:AXaif.Customer.AxdEntityDirPartyContactInfoView,&ContactInfoViewUpdate:AXaif.Customer.AxdEntityDirPartyContactInfoView,Action:%String]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set ConvertOptions = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
-	do ConvertOptions.Add("action",,"set Output=""update""")
+	do ConvertOptions.Add("action",,"set Output="""_Action_"""")
 	do ConvertOptions.Add("IsPrimary")
 	do ConvertOptions.Add("LocationName")
 	do ConvertOptions.Add("Locator")