Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(revision 0)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(revision 35472)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope xmlns="http://schemas.microsoft.com/dynamics/2011/01/documents/Message">
+  <Header>
+    <MessageId>{12345678-ABCD-EFGH-1234-1234567890AB}</MessageId>
+    <Company>VHBE</Company>
+    <Action>http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/update</Action>
+  </Header>
+  <Body>
+    <MessageParts>
+      <Customer xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/Customer">
+        <DocPurpose>Original</DocPurpose>
+        <SenderId>VHBE</SenderId>
+        <ValidAsOfDateTime>2016-06-22T09:34:22Z</ValidAsOfDateTime>
+        <ValidTimeStateType>AsOf</ValidTimeStateType>
+        <CustTable class="entity">
+          <_DocumentHash>10e366887c6b4ce7c9c954dbefc2d1dd</_DocumentHash>
+          <AccountNum>01234</AccountNum>
+          <AccountStatement>Always</AccountStatement>
+          <ADUImported>Yes</ADUImported>
+          <Affiliated_RU>No</Affiliated_RU>
+          <Blocked>No</Blocked>
+          <CashDisc>08D2%</CashDisc>
+          <CompanyType_MX>Blank</CompanyType_MX>
+          <CreditCardAddressVerification>None</CreditCardAddressVerification>
+          <CreditCardAddressVerificationLevel>Accept</CreditCardAddressVerificationLevel>
+          <CreditCardAddressVerificationVoid>No</CreditCardAddressVerificationVoid>
+          <CreditCardCVC>None</CreditCardCVC>
+          <Currency>EUR</Currency>
+          <CustClassificationId>R36</CustClassificationId>
+          <CustExcludeCollectionFee>No</CustExcludeCollectionFee>
+          <CustExcludeInterestCharges>No</CustExcludeInterestCharges>
+          <CustFinalUser_BR>No</CustFinalUser_BR>
+          <CustGroup>BE</CustGroup>
+          <CustWhtContributionType_BR>Other</CustWhtContributionType_BR>
+          <DAXIntegrationId>{70E3383F-E3BF-422C-AF76-EF8826DB0711}</DAXIntegrationId>
+          <s01:DefaultDimension xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes" xmlns:s01="http://schemas.microsoft.com/dynamics/2008/01/documents/Customer">
+          </s01:DefaultDimension>
+          <EInvoice>No</EInvoice>
+          <EInvoiceRegister_IT>No</EInvoiceRegister_IT>
+          <EnterpriseNumber>BTW BE 0412.418.957</EnterpriseNumber>
+          <EntityId>77</EntityId>
+          <EntryCertificateRequired_W>No</EntryCertificateRequired_W>
+          <ExportSales_PL>No</ExportSales_PL>
+          <ExpressBillOfLading>No</ExpressBillOfLading>
+          <FiscalDocType_PL>Invoice</FiscalDocType_PL>
+          <ForecastDMPInclude>No</ForecastDMPInclude>
+          <ForeignResident_RU>No</ForeignResident_RU>
+          <GenerateIncomingFiscalDocument_BR>No</GenerateIncomingFiscalDocument_BR>
+          <GiroType>None</GiroType>
+          <GiroTypeAccountStatement>None</GiroTypeAccountStatement>
+          <GiroTypeCollectionletter>None</GiroTypeCollectionletter>
+          <GiroTypeFreeTextInvoice>None</GiroTypeFreeTextInvoice>
+          <GiroTypeInterestNote>None</GiroTypeInterestNote>
+          <GiroTypeProjInvoice>None</GiroTypeProjInvoice>
+          <ICMSContributor_BR>No</ICMSContributor_BR>
+          <InclTax>No</InclTax>
+          <InterCompanyAllowIndirectCreation>No</InterCompanyAllowIndirectCreation>
+          <InterCompanyAutoCreateOrders>No</InterCompanyAutoCreateOrders>
+          <InterCompanyDirectDelivery>No</InterCompanyDirectDelivery>
+          <InventProfileType_RU>NotSpecified</InventProfileType_RU>
+          <InvoiceAddress>InvoiceAccount</InvoiceAddress>
+          <InvoicePostingType_RU>Standard</InvoicePostingType_RU>
+          <IssueOwnEntryCertificate_W>No</IssueOwnEntryCertificate_W>
+          <MandatoryCreditLimit>No</MandatoryCreditLimit>
+          <MandatoryVatDate_PL>No</MandatoryVatDate_PL>
+          <Name>KLANTNAAM NV</Name>
+          <OneTimeCustomer>No</OneTimeCustomer>
+          <PackageDepositExcempt_PL>No</PackageDepositExcempt_PL>
+          <Party>000000719</Party>
+          <PaymMode>OVER</PaymMode>
+          <PaymTermId>NET30</PaymTermId>
+          <PdsFreightAccrued>No</PdsFreightAccrued>
+          <PresenceType_BR>DoesNotApply</PresenceType_BR>
+          <RecId>5637145052</RecId>
+          <RecVersion>248350768</RecVersion>
+          <RFIDCaseTagging>No</RFIDCaseTagging>
+          <RFIDItemTagging>No</RFIDItemTagging>
+          <RFIDPalletTagging>No</RFIDPalletTagging>
+          <ServiceCodeOnDlvAddress_BR>No</ServiceCodeOnDlvAddress_BR>
+          <ShipCarrierBlindShipment>No</ShipCarrierBlindShipment>
+          <ShipCarrierFuelSurcharge>No</ShipCarrierFuelSurcharge>
+          <Suframa_BR>No</Suframa_BR>
+          <SuframaPISCOFINS_BR>No</SuframaPISCOFINS_BR>
+          <SyncEntityId>{00000000-0000-0000-0000-000000000000}</SyncEntityId>
+          <TaxGroup>BDOM</TaxGroup>
+          <TaxWithholdCalculate_IN>No</TaxWithholdCalculate_IN>
+          <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>
+            <PartyNumber>000000719</PartyNumber>
+            <PrimaryAddressLocation>000000449</PrimaryAddressLocation>
+            <PrimaryContactEmail>5637145035</PrimaryContactEmail>
+            <PrimaryContactFax>5637145034</PrimaryContactFax>
+            <PrimaryContactPhone>5637145033</PrimaryContactPhone>
+            <RecId>5637152302</RecId>
+            <RecVersion>1238470994</RecVersion>
+            <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>
+              <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>
+              <Party>000000719</Party>
+              <PartyLocation>5637146495</PartyLocation>
+              <PostalAddress>5637147302</PostalAddress>
+              <RecId>5637146495</RecId>
+              <Roles>Business</Roles>
+              <Street>EEN STRAAT 15</Street>
+              <ValidFrom>2016-06-21T08:53:54Z</ValidFrom>
+              <ValidTo>2154-12-31T23:59:59Z</ValidTo>
+              <ZipCode>3590</ZipCode>
+            </DirPartyPostalAddressView>
+            <DirPartyContactInfoView class="entity">
+              <ElectronicAddress>5637145033</ElectronicAddress>
+              <IsInstantMessage>No</IsInstantMessage>
+              <IsLocationOwner>Yes</IsLocationOwner>
+              <IsMobilePhone>No</IsMobilePhone>
+              <IsPrimary>Yes</IsPrimary>
+              <IsPrivate>No</IsPrivate>
+              <Location>5637147496</Location>
+              <LocationId>000000450</LocationId>
+              <LocationName>Telefoon 1</LocationName>
+              <Locator>011-32 39 91</Locator>
+              <Party>000000719</Party>
+              <PartyLocation>5637146496</PartyLocation>
+              <RecId>5637145033</RecId>
+              <Roles>Business</Roles>
+              <Type>Phone</Type>
+              <TypeIcon>2637</TypeIcon>
+              <ValidTo>2154-12-31T23:59:59Z</ValidTo>
+            </DirPartyContactInfoView>
+            <DirPartyContactInfoView class="entity">
+              <ElectronicAddress>5637145034</ElectronicAddress>
+              <IsInstantMessage>No</IsInstantMessage>
+              <IsLocationOwner>Yes</IsLocationOwner>
+              <IsMobilePhone>No</IsMobilePhone>
+              <IsPrimary>Yes</IsPrimary>
+              <IsPrivate>No</IsPrivate>
+              <Location>5637147496</Location>
+              <LocationId>000000450</LocationId>
+              <LocationName>Fax</LocationName>
+              <Locator>011-33 20 84</Locator>
+              <Party>000000719</Party>
+              <PartyLocation>5637146496</PartyLocation>
+              <RecId>5637145034</RecId>
+              <Roles>Business</Roles>
+              <Type>Fax</Type>
+              <TypeIcon>2637</TypeIcon>
+              <ValidTo>2154-12-31T23:59:59Z</ValidTo>
+            </DirPartyContactInfoView>
+            <DirPartyContactInfoView class="entity">
+              <ElectronicAddress>5637145035</ElectronicAddress>
+              <IsInstantMessage>No</IsInstantMessage>
+              <IsLocationOwner>Yes</IsLocationOwner>
+              <IsMobilePhone>No</IsMobilePhone>
+              <IsPrimary>Yes</IsPrimary>
+              <IsPrivate>No</IsPrivate>
+              <Location>5637147496</Location>
+              <LocationId>000000450</LocationId>
+              <LocationName>E-mail</LocationName>
+              <Locator>iemand@ergens.be</Locator>
+              <Party>000000719</Party>
+              <PartyLocation>5637146496</PartyLocation>
+              <RecId>5637145035</RecId>
+              <Roles>Business</Roles>
+              <Type>Email</Type>
+              <TypeIcon>2631</TypeIcon>
+              <ValidTo>2154-12-31T23:59:59Z</ValidTo>
+            </DirPartyContactInfoView>
+            <ABC>None</ABC>
+            <OrganizationName class="entity">
+              <Name>KLANTNAAM NV</Name>
+              <RecId>5637149552</RecId>
+              <RecVersion>1</RecVersion>
+              <ValidFrom>2016-06-21T08:53:54Z</ValidFrom>
+              <ValidTo>2154-12-31T23:59:59Z</ValidTo>
+            </OrganizationName>
+          </DirParty>
+        </CustTable>
+      </Customer>
+    </MessageParts>
+  </Body>
+</Envelope>
Index: vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r35465 -r35472
--- vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35465)
+++ vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35472)
@@ -52,6 +52,31 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Customer - Update">
+<Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	
+	#dim KlantId As %String = "K||1234"
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"\AIF",..#Applicatie)
+	
+	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
+	
+	set RequestComposer = ##class(AXimpl.AifMessage.RequestComposer).%New(MessageManager)
+
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	
+	set XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
+	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"ReadResponse.xml")
+	#dim ReadResponse As AXaif.Message.Envelope = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
+
+	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2",KlantId,ReadResponse))
+		
+	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Verkoopfactuur - export">
 <Implementation><![CDATA[
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
Index: AXaif/Customer/AxdTypeDimensionAttributeValueSet.cls.xml
===================================================================
diff -u -r35470 -r35472
--- AXaif/Customer/AxdTypeDimensionAttributeValueSet.cls.xml	(.../AxdTypeDimensionAttributeValueSet.cls.xml)	(revision 35470)
+++ AXaif/Customer/AxdTypeDimensionAttributeValueSet.cls.xml	(.../AxdTypeDimensionAttributeValueSet.cls.xml)	(revision 35472)
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXaif.Customer.AxdTypeDimensionAttributeValueSet">
-<ClassType/>
-<CompileAfter/>
-<ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,%XML.Adaptor</Super>
-<Inheritance>right</Inheritance>
+<ClassType>serial</ClassType>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="ELEMENTQUALIFIED">
 <Default>1</Default>
@@ -36,6 +33,18 @@
 <Parameter name="XMLNAME" value="Values"/>
 <Parameter name="XMLPROJECTION" value="COLLECTION"/>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>AxdTypeDimensionAttributeValueSetState</State>
+<StreamLocation>^AXaif.CustD1F9.AxdTypeDime392DS</StreamLocation>
+<Data name="AxdTypeDimensionAttributeValueSetState">
+<Subscript>"AxdTypeDimensionAttributeValueSet"</Subscript>
+<Value name="1">
+<Value>Values</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35470 -r35472
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35470)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35472)
@@ -6,9 +6,25 @@
 <Method name="Convert">
 <FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.MessageParts</ReturnType>
-<Implementation><![CDATA[	quit Command.Message.Body.MessageParts.%ConstructClone($$$true)
+<Implementation><![CDATA[
+	#dim MessageParts As AXaif.Message.MessageParts = Command.Message.Body.MessageParts.%ConstructClone($$$true)
+	
+	do ..RemoveDefaultDimension(MessageParts)
+	
+	quit MessageParts
 ]]></Implementation>
 </Method>
+
+<Method name="RemoveDefaultDimension">
+<FormalSpec><![CDATA[&MessageParts:AXaif.Message.MessageParts]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set Iterator = ##class(TECH.ListIterator).%New(MessageParts.Customer.CustTable)
+	while Iterator.HasNext() {
+		do Iterator.Next().DefaultDimension.Values.Clear()
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml
===================================================================
diff -u -r35470 -r35472
--- vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 35470)
+++ vhUnitTest/AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 35472)
@@ -3,19 +3,58 @@
 <Class name="vhUnitTest.AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter.Convert.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test">
+<Property name="Converter">
+<Type>AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
+	do ##super()
+	set ..Converter = ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New()
+]]></Implementation>
+</Method>
+
+<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)
+
+	do $$$AssertNotEquals(MessageParts,Request.Message.Body.MessageParts)
+]]></Implementation>
+</Method>
+
+<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"
 		
-	set Converter = ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New()
-	#dim MessageParts As AXaif.Message.MessageParts = Converter.Convert(Request)
-	
-	do $$$AssertNotEquals(MessageParts,Request.Message.Body.MessageParts)
+	#dim MessageParts As AXaif.Message.MessageParts = ..Converter.Convert(Request)
+
 	do $$$AssertEquals(MessageParts.Customer.DocPurpose,"DocPurpose")
 ]]></Implementation>
 </Method>
+
+<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)
+
+		do $$$AssertEmptyList(MessageParts.Customer.CustTable.GetAt(1).DefaultDimension.Values)
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXaif/Customer/AxdTypeDimensionAttributeValue.cls.xml
===================================================================
diff -u -r35470 -r35472
--- AXaif/Customer/AxdTypeDimensionAttributeValue.cls.xml	(.../AxdTypeDimensionAttributeValue.cls.xml)	(revision 35470)
+++ AXaif/Customer/AxdTypeDimensionAttributeValue.cls.xml	(.../AxdTypeDimensionAttributeValue.cls.xml)	(revision 35472)
@@ -41,6 +41,19 @@
 <Parameter name="XMLNAME" value="Value"/>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>Name:%String="",Value:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Name = Name
+	set ..Value = Value
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>AxdTypeDimensionAttributeValueState</State>
