Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r35475 -r35503
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35475)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35503)
@@ -19,14 +19,14 @@
           <ADUImported>Yes</ADUImported>
           <Affiliated_RU>No</Affiliated_RU>
           <Blocked>No</Blocked>
-          <CashDisc>08D2%</CashDisc>
+          <CashDisc>10D3%</CashDisc>
           <CompanyType_MX>Blank</CompanyType_MX>
           <CreditCardAddressVerification>None</CreditCardAddressVerification>
           <CreditCardAddressVerificationLevel>Accept</CreditCardAddressVerificationLevel>
           <CreditCardAddressVerificationVoid>No</CreditCardAddressVerificationVoid>
           <CreditCardCVC>None</CreditCardCVC>
           <Currency>EUR</Currency>
-          <CustClassificationId>R36</CustClassificationId>
+          <CustClassificationId>R09</CustClassificationId>
           <CustExcludeCollectionFee>No</CustExcludeCollectionFee>
           <CustExcludeInterestCharges>No</CustExcludeInterestCharges>
           <CustFinalUser_BR>No</CustFinalUser_BR>
@@ -35,7 +35,7 @@
           <DAXIntegrationId>{70E3383F-E3BF-422C-AF76-EF8826DB0711}</DAXIntegrationId>
           <EInvoice>No</EInvoice>
           <EInvoiceRegister_IT>No</EInvoiceRegister_IT>
-          <EnterpriseNumber>BTW BE 0412.418.957</EnterpriseNumber>
+          <EnterpriseNumber>BTW BE 0402.775.276</EnterpriseNumber>
           <EntityId>77</EntityId>
           <EntryCertificateRequired_W>No</EntryCertificateRequired_W>
           <ExportSales_PL>No</ExportSales_PL>
@@ -61,7 +61,7 @@
           <IssueOwnEntryCertificate_W>No</IssueOwnEntryCertificate_W>
           <MandatoryCreditLimit>No</MandatoryCreditLimit>
           <MandatoryVatDate_PL>No</MandatoryVatDate_PL>
-          <Name>KLANTNAAM NV</Name>
+          <Name>EEN ANDERE NAAM Toenaam</Name>
           <OneTimeCustomer>No</OneTimeCustomer>
           <PackageDepositExcempt_PL>No</PackageDepositExcempt_PL>
           <Party>000000719</Party>
@@ -85,12 +85,10 @@
           <TaxWithholdCalculate_TH>No</TaxWithholdCalculate_TH>
           <UnitedVATInvoice_LT>No</UnitedVATInvoice_LT>
           <UseCashDisc>Normal</UseCashDisc>
-          <VATNum>0412.418.957</VATNum>
           <WebSalesOrderDisplay>All</WebSalesOrderDisplay>
           <DirParty xsi:type="AxdEntity_DirParty_DirOrganization" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" class="entity">
             <LanguageId>nl-be</LanguageId>
-            <Name>KLANTNAAM NV</Name>
-            <NameAlias>KLANTNAAM NV</NameAlias>
+            <Name>EEN ANDERE NAAM Toenaam</Name>
             <PartyNumber>000000719</PartyNumber>
             <PrimaryAddressLocation>000000449</PrimaryAddressLocation>
             <PrimaryContactEmail>5637145035</PrimaryContactEmail>
@@ -101,27 +99,24 @@
             <DirPartyPostalAddressView class="entity">
               <_RecId_LogisticsPostalAddress>5637147302</_RecId_LogisticsPostalAddress>
               <_recVersion_LogisticsPostalAddress>1</_recVersion_LogisticsPostalAddress>
-              <Address>EEN STRAAT 15
-9100 SINT-NIKLAAS
-BELGIUM</Address>
-              <City>SINT-NIKLAAS</City>
+              <City>DUMMYGEMEENTE</City>
               <CountryRegionId>BEL</CountryRegionId>
               <IsLocationOwner>Yes</IsLocationOwner>
               <ISOcode>BE</ISOcode>
               <IsPrimary>Yes</IsPrimary>
               <IsPrimaryTaxRegistration>No</IsPrimaryTaxRegistration>
               <IsPrivate>No</IsPrivate>
               <Location>5637147495</Location>
-              <LocationName>KLANTNAAM NV</LocationName>
+              <LocationName>EEN ANDERE NAAM Toenaam</LocationName>
               <Party>000000719</Party>
               <PartyLocation>5637146495</PartyLocation>
               <PostalAddress>5637147302</PostalAddress>
               <RecId>5637146495</RecId>
               <Roles>Business</Roles>
-              <Street>EEN STRAAT 15</Street>
+              <Street>DummyStraat</Street>
               <ValidFrom>2016-06-21T08:53:54Z</ValidFrom>
               <ValidTo>2154-12-31T23:59:59Z</ValidTo>
-              <ZipCode>3590</ZipCode>
+              <ZipCode>9100</ZipCode>
             </DirPartyPostalAddressView>
             <DirPartyContactInfoView class="entity">
               <ElectronicAddress>5637145033</ElectronicAddress>
@@ -182,7 +177,7 @@
             </DirPartyContactInfoView>
             <ABC>None</ABC>
             <OrganizationName class="entity">
-              <Name>KLANTNAAM NV</Name>
+              <Name>DE NAAM</Name>
               <RecId>5637149552</RecId>
               <RecVersion>1</RecVersion>
               <ValidFrom>2016-06-21T08:53:54Z</ValidFrom>
Index: vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 35503)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.AifMessage.Converter.CustomerCreateConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.AifMessage.Converter.CustomerCreateConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Convert">
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
+<ReturnType>AXaif.Message.MessageParts</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Command)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r35473 -r35503
--- vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35473)
+++ vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35503)
@@ -57,6 +57,17 @@
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
 	
 	#dim KlantId As %String = "K||1234"
+	
+	#dim PartijAPI As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
+	#dim Partij As vhTest.Mock.DOM.PARTIJ.Partij = ##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij()
+	do Partij.IndienMethodCall("GeefNaam").DanReturn("EEN ANDERE NAAM")
+	do PartijAPI.IndienMethodCall("GeefPartij","K||1234").DanReturn(Partij)
+	
+	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	#dim Klant As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
+	do Klant.IndienMethodCall("GeefNaam").DanReturn("EEN ANDERE NAAM")
+	do VerkoopAPI.IndienMethodCall("GeefKlant","K||1234").DanReturn(Klant)
+	
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"\AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
Index: vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml
===================================================================
diff -u -r35472 -r35503
--- vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 35472)
+++ vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 35503)
@@ -18,7 +18,6 @@
 <Method name="Test: Het resultaat van de conversie is een nieuwe instantie">
 <Implementation><![CDATA[
 	set Request = ##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2","K||1234")
-	set Request.Message = ##class(AXaif.Message.Envelope).%New()
 
 	#dim MessageParts As AXaif.Message.MessageParts = ..Converter.Convert(Request)
 
@@ -29,7 +28,6 @@
 <Method name="Test: Een veld niet door ons aangepast blijft bestaan">
 <Implementation><![CDATA[
 	set Request = ##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2","K||1234")
-	set Request.Message = ##class(AXaif.Message.Envelope).%New()
 	set Request.Message.Body.MessageParts.Customer.DocPurpose = "DocPurpose"
 		
 	#dim MessageParts As AXaif.Message.MessageParts = ..Converter.Convert(Request)
@@ -41,20 +39,51 @@
 <Method name="Test: Default dimensions worden niet mee geëxporteerd ook al wordt het niet door ons aangepast">
 <Implementation><![CDATA[
 	set Request = ##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2","K||1234")
-	set Request.Message = ##class(AXaif.Message.Envelope).%New()
 	
 	set CustTable = ##class(AXaif.Customer.AxdEntityCustTable).%New()
 	set CustTable.DefaultDimension = ##class(AXaif.Customer.AxdTypeDimensionAttributeValueSet).%New()
 	do CustTable.DefaultDimension.Values.Insert(##class(AXaif.Customer.AxdTypeDimensionAttributeValue).%New("Account","01234"))
 	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTable)
 		
 	if $$$AssertEquals(Request.Message.Body.MessageParts.Customer.CustTable.Count(),1) {
-		#dim MessageParts As AXaif.Message.MessageParts = ..Converter.Convert(Request)
+		set CreateConverterStub = ##class(vhTest.Mock.AXimpl.AifMessage.Converter.CustomerCreateConverter).%New()
+		do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+		set Converter = ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
+		#dim MessageParts As AXaif.Message.MessageParts = Converter.Convert(Request)
 
 		do $$$AssertEmptyList(MessageParts.Customer.CustTable.GetAt(1).DefaultDimension.Values)
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Klantnaam kan al gewijzigd worden">
+<Implementation><![CDATA[
+	set Request = ##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2","K||1234")
+	set Request.Message.Body.MessageParts.Customer.DocPurpose = "DocPurpose"
+	set CustTableRead = ##class(AXaif.Customer.AxdEntityCustTable).%New()
+	set CustTableRead.Name = "OriginalName"
+	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTableRead)
+	
+	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.AifMessage.Converter.CustomerCreateConverter).%New()
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+	set Converter = ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
+	
+	#dim MessageParts As AXaif.Message.MessageParts = Converter.Convert(Request)
+	do $$$AssertEquals(MessageParts.Customer.CustTable.GetAt(1).Name,"UpdatedName")
+]]></Implementation>
+</Method>
+
+<Method name="GetMessageParts">
+<ReturnType>AXaif.Message.MessageParts</ReturnType>
+<Implementation><![CDATA[
+	set MessagePartsCreate = ##class(AXaif.Message.MessageParts).%New()
+	set CustTableCreate = ##class(AXaif.Customer.AxdEntityCustTable).%New()
+	set CustTableCreate.Name = "UpdatedName"
+	set CustTableCreate.CustGroup = "EU"
+	do MessagePartsCreate.Customer.CustTable.Insert(CustTableCreate)
+	quit MessagePartsCreate
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(revision 35503)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.AifMessage.Converter.CustomerCreateConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.AifMessage.Converter.CustomerCreateConverter</Super>
+
+<Method name="Convert">
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
+<ReturnType>AXaif.Message.MessageParts</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
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>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/ReadResponse.xml
===================================================================
diff -u -r35470 -r35503
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/ReadResponse.xml	(.../ReadResponse.xml)	(revision 35470)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/ReadResponse.xml	(.../ReadResponse.xml)	(revision 35503)
@@ -19,14 +19,14 @@
 					<ADUImported>Yes</ADUImported>
 					<Affiliated_RU>No</Affiliated_RU>
 					<Blocked>No</Blocked>
-					<CashDisc>08D2%</CashDisc>
+					<CashDisc>10D3%</CashDisc>
 					<CompanyType_MX>Blank</CompanyType_MX>
 					<CreditCardAddressVerification>None</CreditCardAddressVerification>
 					<CreditCardAddressVerificationLevel>Accept</CreditCardAddressVerificationLevel>
 					<CreditCardAddressVerificationVoid>No</CreditCardAddressVerificationVoid>
 					<CreditCardCVC>None</CreditCardCVC>
 					<Currency>EUR</Currency>
-					<CustClassificationId>R36</CustClassificationId>
+					<CustClassificationId>R09</CustClassificationId>
 					<CustExcludeCollectionFee>No</CustExcludeCollectionFee>
 					<CustExcludeInterestCharges>No</CustExcludeInterestCharges>
 					<CustFinalUser_BR>No</CustFinalUser_BR>
@@ -43,7 +43,7 @@
 					</DefaultDimension>
 					<EInvoice>No</EInvoice>
 					<EInvoiceRegister_IT>No</EInvoiceRegister_IT>
-					<EnterpriseNumber>BTW BE 0412.418.957</EnterpriseNumber>
+					<EnterpriseNumber>BTW BE 0402.775.276</EnterpriseNumber>
 					<EntityId>77</EntityId>
 					<EntryCertificateRequired_W>No</EntryCertificateRequired_W>
 					<ExportSales_PL>No</ExportSales_PL>
@@ -69,7 +69,7 @@
 					<IssueOwnEntryCertificate_W>No</IssueOwnEntryCertificate_W>
 					<MandatoryCreditLimit>No</MandatoryCreditLimit>
 					<MandatoryVatDate_PL>No</MandatoryVatDate_PL>
-					<Name>KLANTNAAM NV</Name>
+					<Name>DE NAAM</Name>
 					<OneTimeCustomer>No</OneTimeCustomer>
 					<PackageDepositExcempt_PL>No</PackageDepositExcempt_PL>
 					<Party>000000719</Party>
@@ -93,12 +93,11 @@
 					<TaxWithholdCalculate_TH>No</TaxWithholdCalculate_TH>
 					<UnitedVATInvoice_LT>No</UnitedVATInvoice_LT>
 					<UseCashDisc>Normal</UseCashDisc>
-					<VATNum>0412.418.957</VATNum>
 					<WebSalesOrderDisplay>All</WebSalesOrderDisplay>
 					<DirParty xsi:type="AxdEntity_DirParty_DirOrganization" class="entity" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 						<LanguageId>nl-be</LanguageId>
-						<Name>KLANTNAAM NV</Name>
-						<NameAlias>KLANTNAAM NV</NameAlias>
+						<Name>DE NAAM</Name>
+						<NameAlias>DE NAAM</NameAlias>
 						<PartyNumber>000000719</PartyNumber>
 						<PrimaryAddressLocation>000000449</PrimaryAddressLocation>
 						<PrimaryContactEmail>5637145035</PrimaryContactEmail>
@@ -120,7 +119,7 @@
 							<IsPrimaryTaxRegistration>No</IsPrimaryTaxRegistration>
 							<IsPrivate>No</IsPrivate>
 							<Location>5637147495</Location>
-							<LocationName>KLANTNAAM NV</LocationName>
+							<LocationName>DE NAAM</LocationName>
 							<Party>000000719</Party>
 							<PartyLocation>5637146495</PartyLocation>
 							<PostalAddress>5637147302</PostalAddress>
@@ -191,7 +190,7 @@
 						</DirPartyContactInfoView>
 						<ABC>None</ABC>
 						<OrganizationName class="entity">
-							<Name>KLANTNAAM NV</Name>
+							<Name>DE NAAM</Name>
 							<RecId>5637149552</RecId>
 							<RecVersion>1</RecVersion>
 							<ValidFrom>2016-06-21T08:53:54Z</ValidFrom>