Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml
===================================================================
diff -u -r34868 -r34911
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34868)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34911)
@@ -95,23 +95,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Een creditnota heeft een andere prefix - maar wordt wel geboekt in zelfde dagboek (voucher) als de facturen">
-<Implementation><![CDATA[
-	#dim Creditnota As DOM.VKP.Factuur = ##class(vhTest.Utils.DOM.VKP.Factuur).StandaardCreditnota()
-
-	#dim OrderApiStub As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	do OrderApiStub.IndienMethodCall("GeefFactuur",Creditnota.GeefID()).DanReturn(Creditnota)
-	
-	set Converter = ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New(,,OrderApiStub)
-	#dim GeneralJournal As AXaif.LedgerGeneralJournal.AxdLedgerGeneralJournal = Converter.Convert(Creditnota.GeefID())
-	#dim JournalTable As AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTable = GeneralJournal.LedgerJournalTable.GetAt(1)
-	
-	do $$$AssertEquals(JournalTable.LedgerJournalTrans.GetAt(1).Voucher,"F654321")
-	do $$$AssertEquals(JournalTable.LedgerJournalTrans.GetAt(1).Invoice,"CN654321")	
-	do $$$AssertEquals(JournalTable.LedgerJournalTrans.GetAt(1).DocumentNum,"CN654.321")
-]]></Implementation>
-</Method>
-
 <Method name="Test: SEPA-DD indien de klant betaald via incasso">
 <Implementation><![CDATA[
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
@@ -180,9 +163,9 @@
 	do $$$AssertEquals(Transactie.TaxGroup,"BDOM")
 	do $$$AssertEquals(Transactie.TaxItemGroup,"G3")
 	do $$$AssertEquals(Transactie.TransDate,$$INTDATE^vhLib.DataTypes("2011-06-30"))
-	do $$$AssertEquals(Transactie.DocumentNum,"F123.456")
-	do $$$AssertEquals(Transactie.Invoice,"F123456")
-	do $$$AssertEquals(Transactie.Voucher,"F123456")
+	do $$$AssertEquals(Transactie.DocumentNum,"123456")
+	do $$$AssertEquals(Transactie.Invoice,"123456")
+	do $$$AssertEquals(Transactie.Voucher,"123456")
 ]]></Implementation>
 </Method>
 
@@ -204,8 +187,8 @@
 	do $$$AssertEquals(Transactie.TaxGroup,"BDOM")
 	do $$$AssertEquals(Transactie.TaxItemGroup,"G3")
 	do $$$AssertEquals(Transactie.TransDate,$$INTDATE^vhLib.DataTypes("2011-06-30"))
-	do $$$AssertEquals(Transactie.Invoice,"F123456")
-	do $$$AssertEquals(Transactie.Voucher,"F123456")
+	do $$$AssertEquals(Transactie.Invoice,"123456")
+	do $$$AssertEquals(Transactie.Voucher,"123456")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34870 -r34911
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34870)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34911)
@@ -19,9 +19,9 @@
             <Company>VHBE</Company>
             <CurrencyCode>EUR</CurrencyCode>
             <DateCashDisc>2016-05-21</DateCashDisc>
-            <DocumentNum>F300.500</DocumentNum>
+            <DocumentNum>300500</DocumentNum>
             <Due>2016-06-13</Due>
-            <Invoice>F300500</Invoice>
+            <Invoice>300500</Invoice>
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">01313 - HEREMANS KEUKENS</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">01313</Account>
@@ -40,7 +40,7 @@
             <TaxItemGroup>G3</TaxItemGroup>
             <TransDate>2016-05-13</TransDate>
             <Txt>HEREMANS KEUKENS</Txt>
-            <Voucher>F300500</Voucher>
+            <Voucher>300500</Voucher>
           </LedgerJournalTrans>
           <LedgerJournalTrans class="entity">
             <AccountType>Ledger</AccountType>
@@ -51,9 +51,9 @@
             <Company>VHBE</Company>
             <CurrencyCode>EUR</CurrencyCode>
             <DateCashDisc>2016-05-21</DateCashDisc>
-            <DocumentNum>F300.500</DocumentNum>
+            <DocumentNum>300500</DocumentNum>
             <Due>2016-06-13</Due>
-            <Invoice>F300500</Invoice>
+            <Invoice>300500</Invoice>
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703100</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703100</Account>
@@ -71,7 +71,7 @@
             <TaxItemGroup>G3</TaxItemGroup>
             <TransDate>2016-05-13</TransDate>
             <Txt>HEREMANS KEUKENS</Txt>
-            <Voucher>F300500</Voucher>
+            <Voucher>300500</Voucher>
           </LedgerJournalTrans>
         </LedgerJournalTable>
       </LedgerGeneralJournal>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34870 -r34911
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34870)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34911)
@@ -19,9 +19,9 @@
             <Company>VHBE</Company>
             <CurrencyCode>EUR</CurrencyCode>
             <DateCashDisc>2016-03-30</DateCashDisc>
-            <DocumentNum>F586.689</DocumentNum>
+            <DocumentNum>586689</DocumentNum>
             <Due>2016-04-22</Due>
-            <Invoice>F586689</Invoice>
+            <Invoice>586689</Invoice>
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"><![CDATA[09283 - L & P INTERIEURPRODUKTIE]]></DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">09283</Account>
@@ -40,7 +40,7 @@
             <TaxItemGroup>G3</TaxItemGroup>
             <TransDate>2016-03-22</TransDate>
             <Txt><![CDATA[L & P INTERIEURPRODUKTIE]]></Txt>
-            <Voucher>F586689</Voucher>
+            <Voucher>586689</Voucher>
           </LedgerJournalTrans>
           <LedgerJournalTrans class="entity">
             <AccountType>Ledger</AccountType>
@@ -51,9 +51,9 @@
             <Company>VHBE</Company>
             <CurrencyCode>EUR</CurrencyCode>
             <DateCashDisc>2016-03-30</DateCashDisc>
-            <DocumentNum>F586.689</DocumentNum>
+            <DocumentNum>586689</DocumentNum>
             <Due>2016-04-22</Due>
-            <Invoice>F586689</Invoice>
+            <Invoice>586689</Invoice>
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703000</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703000</Account>
@@ -71,7 +71,7 @@
             <TaxItemGroup>G3</TaxItemGroup>
             <TransDate>2016-03-22</TransDate>
             <Txt><![CDATA[L & P INTERIEURPRODUKTIE]]></Txt>
-            <Voucher>F586689</Voucher>
+            <Voucher>586689</Voucher>
           </LedgerJournalTrans>
         </LedgerJournalTable>
       </LedgerGeneralJournal>
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34868 -r34911
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34868)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34911)
@@ -159,12 +159,10 @@
 		 
 	set Transaction.Txt = Factuur.GeefKlant().GeefNaam()
 	
-	#dim DocumentPrefix As %String = $$$If(Factuur.GeefFactuurCode()="F","F","CN")
+	set Transaction.DocumentNum = Factuur.GeefID()
+	set Transaction.Invoice = Factuur.GeefID()
+	set Transaction.Voucher = Factuur.GeefID()
 	
-	set Transaction.DocumentNum = DocumentPrefix_$extract(Factuur.GeefID(),1,3)_"."_$extract(Factuur.GeefID(),4,6)
-	set Transaction.Invoice = DocumentPrefix_Factuur.GeefID()
-	set Transaction.Voucher = "F"_Factuur.GeefID()
-	
 	set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
 	set LedgerDimensionValues = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimensionAttributeValue).%New()
 	set LedgerDimensionValues.Name = "Klant"