Index: AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r35000 -r35024
--- AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35000)
+++ AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35024)
@@ -61,6 +61,11 @@
 	set Table.Name = ..FirmaBepaler.GeefNaam()_" aankoopfacturen interface"
 	
 	do Table.LedgerJournalTrans.Insert(..GetVendTransaction(Factuur))
+	set Iterator = ##class(TECH.ListIterator).%New(Factuur.Boekingen)
+	while Iterator.HasNext() {
+		#dim Boeking As %String = Iterator.Next()
+		do Table.LedgerJournalTrans.Insert(..GetLedgerTransaction(Factuur,Boeking,Iterator.Key()))
+	}
 	
 	quit Table
 ]]></Implementation>
@@ -71,17 +76,21 @@
 <Private>1</Private>
 <ReturnType>AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTrans</ReturnType>
 <Implementation><![CDATA[
-	#dim Transaction As AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTrans = ..MakeTransaction(Factuur,BoekingIndex+1)
+	#dim Transaction As AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTrans = ..MakeTransaction(Factuur,2)
 	set Transaction.AccountType = "Ledger"
 	set Transaction.AmountCurDebit = ..Formatter.FormatNumber(Boeking.Bedrag,2)
+	
+	if Factuur.KortingKontant>0 {
+		#dim TotaalGoederenInclusiefPort As %Numeric = Factuur.Totaal
+		set Transaction.CashDiscAmount = ..Formatter.FormatNumber( -1 * ( Factuur.KortingKontant / TotaalGoederenInclusiefPort * Boeking.Bedrag ) ,2)
+	}
 
 	#dim BoekhoudRekeningId As %String = ##class(AX.common.impl.ConvertAdminToAX).ConvertLedgerCount(Boeking.BoekhoudRekeningId)
 	
 	set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
 	set LedgerDimension.Account = BoekhoudRekeningId
 	set LedgerDimension.DisplayValue = BoekhoudRekeningId_"-"
 	do Transaction.LedgerDimension.Insert(LedgerDimension)
-	
 	quit Transaction
 ]]></Implementation>
 </Method>
@@ -99,7 +108,6 @@
 	set Transaction.TaxItemGroup = "G3"
 	
 	set Transaction.CashDiscAmount = -1*..Formatter.FormatNumber(Factuur.KortingKontant,2)
-	
 	set Transaction.AmountCurCredit = ..Formatter.FormatNumber(Factuur.Totaal,2)
 	
 	#dim Leverancier As DOM.AKP.Leverancier = ..AankoopAPI.GeefLeverancier(Factuur.LeverancierID)
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/PurchaseInvoice/Create/PurchaseInvoice-Create 1  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r35000 -r35024
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/PurchaseInvoice/Create/PurchaseInvoice-Create 1  - VHBE - 20160501_091500.xml	(.../PurchaseInvoice-Create 1  - VHBE - 20160501_091500.xml)	(revision 35000)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/PurchaseInvoice/Create/PurchaseInvoice-Create 1  - VHBE - 20160501_091500.xml	(.../PurchaseInvoice-Create 1  - VHBE - 20160501_091500.xml)	(revision 35024)
@@ -15,7 +15,7 @@
             <AccountType>Vend</AccountType>
             <AmountCurCredit>105.53</AmountCurCredit>
             <CashDiscAmount>-3.17</CashDiscAmount>
-            <CashDiscCode>10EOM3%</CashDiscCode>
+            <CashDiscCode>20EOM3%</CashDiscCode>
             <Company>VHBE</Company>
             <DateCashDisc>2016-05-04</DateCashDisc>
             <Due>2016-05-21</Due>
@@ -34,6 +34,29 @@
             <Txt>BLUM JULIUS GMBH</Txt>
             <Voucher>000000001</Voucher>
           </LedgerJournalTrans>
+          <LedgerJournalTrans class="entity">
+            <AccountType>Ledger</AccountType>
+            <AmountCurDebit>105.53</AmountCurDebit>
+            <CashDiscAmount>-3.17</CashDiscAmount>
+            <CashDiscCode>20EOM3%</CashDiscCode>
+            <Company>VHBE</Company>
+            <DateCashDisc>2016-05-04</DateCashDisc>
+            <Due>2016-05-21</Due>
+            <Invoice>848153</Invoice>
+            <LedgerDimension>
+              <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">604000-</DisplayValue>
+              <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">604000</Account>
+            </LedgerDimension>
+            <LineNum>2.0000000000</LineNum>
+            <Listcode>IncludeNot</Listcode>
+            <OffsetAccountType>Ledger</OffsetAccountType>
+            <OffsetCompany>VHBE</OffsetCompany>
+            <TaxGroup>BDOM</TaxGroup>
+            <TaxItemGroup>G3</TaxItemGroup>
+            <TransDate>2016-05-01</TransDate>
+            <Txt>BLUM JULIUS GMBH</Txt>
+            <Voucher>000000001</Voucher>
+          </LedgerJournalTrans>
         </LedgerJournalTable>
       </LedgerGeneralJournal>
     </MessageParts>