Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35596 -r35598
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35596)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35598)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ContactInfoViewOrder">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ContactInfoViewComparator">
 <Type>TECH.Comparator.IComparator</Type>
 <Private>1</Private>
@@ -32,7 +37,8 @@
 <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 ..ContactInfoViewOrder = ##class(TECH.ListUtils).CreateListOfDataTypes("Telefoon 1","Telefoon 2","Fax","E-mail","URL")
+	set ..ContactInfoViewComparator = ##class(TECH.Comparator.PropertyBasedComparator).%New("LocationName",..ContactInfoViewOrder)
 	set ..ContactInfoViewSorter = ##class(TECH.Algo.Sort.InsertionSort).%New()	
 	
 	Quit $$$OK
@@ -221,12 +227,15 @@
 <FormalSpec><![CDATA[DirPartyTableCreate:AXaif.Customer.AxdEntityDirPartyDirPartyTable,&DirPartyTableUpdate:AXaif.Customer.AxdEntityDirPartyDirPartyTable]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim Name As %String 
-	for Name = "Telefoon 1","Telefoon 2" {
+	set ContactInfoViewOrderIterator = ##class(TECH.ListIterator).%New(..ContactInfoViewOrder)
+	while ContactInfoViewOrderIterator.HasNext() {
+		#dim Name As %String = ContactInfoViewOrderIterator.Next()
+		
 		#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" {