Index: vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml
===================================================================
diff -u -r33538 -r33549
--- vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33538)
+++ vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33549)
@@ -21,6 +21,7 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
 	do ..Klant.IndienMethodCall("GeefID").DanReturn("K||1234")
 	do ..Klant.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Dummy.DOM.VKP.LeverAdres).%New())
+	do ..Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands())
 ]]></Implementation>
 </Method>
 
@@ -37,6 +38,62 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Taal variaties - Nederlands">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands())
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.LanguageId,"nl-be")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Taal variaties - Frans">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Frans())
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.LanguageId,"fr")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Taal variaties - Duits">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Duits())
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.LanguageId,"de")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Taal variaties - Engels">
+<Implementation><![CDATA[
+	do ..Klant.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Engels())
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	
+	do $$$AssertEquals(Party.LanguageId,"en-us")
+]]></Implementation>
+</Method>
+
 <Method name="Test: KlantNummer - Nummer bevat voorloop nullen">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCode").DanReturn(4682)
Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33538 -r33549
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33538)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33549)
@@ -22,13 +22,29 @@
 	set Custable.TaxGroup = ..FormatTaxGroup(Klant)
 	
 	set Custable.WebSalesOrderDisplay = "All"
-
+	
+	set DirParty = ##class(AXaif.Customer.AxdEntityDirPartyDirPartyTable).%New()
+	set DirParty.LanguageId = ..FormatLanuageId(Klant.GeefTaal())
+	do Custable.DirParty.Insert(DirParty)
+	
 	do AxKlant.CustTable.Insert(Custable)
 
 	quit AxKlant
 ]]></Implementation>
 </Method>
 
+<Method name="FormatLanuageId">
+<FormalSpec>Taal:DOM.enu.Taal</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:Taal=##class(DOM.enu.Taal).Frans() "fr"
+	quit:Taal=##class(DOM.enu.Taal).Duits() "de"
+	quit:Taal=##class(DOM.enu.Taal).Engels() "en-us"
+	quit "nl-be"
+]]></Implementation>
+</Method>
+
 <Method name="FormatCashDisc">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
 <Private>1</Private>