Index: AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml
===================================================================
diff -u -r34840 -r34868
--- AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml (.../AxdEntityLedgerJournalDimension.cls.xml) (revision 34840)
+++ AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml (.../AxdEntityLedgerJournalDimension.cls.xml) (revision 34868)
@@ -40,6 +40,16 @@
+
+AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimensionAttributeValue
+list
+_Values
+
+
+
+
+
+
%Library.CacheSerialState
LedgerGeneralJournalDimensionState
@@ -51,6 +61,9 @@
Account
+
+Values
+
Index: AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimensionAttributeValue.cls.xml
===================================================================
diff -u
--- AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimensionAttributeValue.cls.xml (revision 0)
+++ AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimensionAttributeValue.cls.xml (revision 34868)
@@ -0,0 +1,60 @@
+
+
+
+serial
+
+1
+%SerialObject,%XML.Adaptor
+right
+
+
+1
+
+
+
+http://schemas.microsoft.com/dynamics/2008/01/documents/LedgerGeneralJournal
+
+
+
+AxdType_DimensionAttributeValue
+
+
+
+1
+
+
+
+AxdType_DimensionAttributeValue
+
+
+
+%String
+1
+
+
+
+
+
+%String
+1
+
+
+
+
+
+%Library.CacheSerialState
+AxdEntityLedgerJournalDimensionAttributeValueState
+^AXaif.Ledg1C5F.AxdEntityLed99ES
+
+
+Name
+
+
+Value
+
+
+
+
+
+
+
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34840 -r34868
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34840)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34868)
@@ -95,15 +95,12 @@
set:(Factuur.GeefFactuurCode()=##class(DOM.VKP.Factuur.enu.FactuurType).Factuur()) Transaction.AmountCurCredit = ..Formatter.FormatNumber(Boeking.Bedrag+Transaction.ADUCorrectedTaxAmount,2)
set:(Factuur.GeefFactuurCode()=##class(DOM.VKP.Factuur.enu.FactuurType).Creditnota()) Transaction.AmountCurDebit = ..Formatter.FormatNumber(Boeking.Bedrag+Transaction.ADUCorrectedTaxAmount,2)
+
+ #dim BoekhoudRekeningId As %String = ##class(AX.common.impl.ConvertAdminToAX).ConvertLedgerCount(Boeking.BoekhoudRekeningId)
- #dim BoekhoudRekeningId As %String = Boeking.BoekhoudRekeningId
+ set Transaction.LedgerDimension.GetAt(1).Account = BoekhoudRekeningId
+ set Transaction.LedgerDimension.GetAt(1).DisplayValue = BoekhoudRekeningId
- set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
- set LedgerDimension.Account = BoekhoudRekeningId
- set LedgerDimension.DisplayValue = BoekhoudRekeningId _ "-"
-
- do Transaction.LedgerDimension.Insert(LedgerDimension)
-
quit Transaction
]]>
@@ -129,13 +126,9 @@
set:(Factuur.GeefFactuurCode()=##class(DOM.VKP.Factuur.enu.FactuurType).Factuur()) Transaction.AmountCurDebit = ..Formatter.FormatNumber(Factuur.GeefTotaalTeBetalen(),2)
set:(Factuur.GeefFactuurCode()=##class(DOM.VKP.Factuur.enu.FactuurType).Creditnota()) Transaction.AmountCurCredit = ..Formatter.FormatNumber(Factuur.GeefTotaalTeBetalen(),2)
+ set Transaction.LedgerDimension.GetAt(1).Account = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())
+ set Transaction.LedgerDimension.GetAt(1).DisplayValue = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())_" - "_Factuur.GeefKlant().GeefNaam()
- set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
- set LedgerDimension.Account = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())
- set LedgerDimension.DisplayValue = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())_" - "_Factuur.GeefKlant().GeefNaam()
-
- do Transaction.LedgerDimension.Insert(LedgerDimension)
-
quit Transaction
]]>
@@ -172,6 +165,14 @@
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"
+ set LedgerDimensionValues.Value = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())
+
+ do LedgerDimension.Values.Insert(LedgerDimensionValues)
+ do Transaction.LedgerDimension.Insert(LedgerDimension)
+
quit Transaction
]]>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34840 -r34868
--- 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 34840)
+++ 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 34868)
@@ -25,6 +25,12 @@
09283
+
+
+ Klant
+ 09283
+
+
1.0000000000
IncludeNot
@@ -49,8 +55,14 @@
2016-04-22
F586689
- 703000-
+ 703000
703000
+
+
+ Klant
+ 09283
+
+
2.0000000000
Ledger
Index: AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34840 -r34868
--- AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34840)
+++ AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34868)
@@ -76,9 +76,11 @@
set Transaction.AmountCurCredit = ..Formatter.FormatNumber(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 = Boeking.BoekhoudRekeningId
- set LedgerDimension.DisplayValue = Boeking.BoekhoudRekeningId_"-"
+ set LedgerDimension.Account = BoekhoudRekeningId
+ set LedgerDimension.DisplayValue = BoekhoudRekeningId_"-"
do Transaction.LedgerDimension.Insert(LedgerDimension)
quit Transaction
Index: AX/common/impl/ConvertAdminToAX.cls.xml
===================================================================
diff -u -r34776 -r34868
--- AX/common/impl/ConvertAdminToAX.cls.xml (.../ConvertAdminToAX.cls.xml) (revision 34776)
+++ AX/common/impl/ConvertAdminToAX.cls.xml (.../ConvertAdminToAX.cls.xml) (revision 34868)
@@ -10,6 +10,180 @@
+
+
+1
+LedgerCountId:%String
+%String
+
+
+
+
+1
+1
+
+
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34840 -r34868
--- 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 34840)
+++ 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 34868)
@@ -25,6 +25,12 @@
01313 - HEREMANS KEUKENS
01313
+
+
+ Klant
+ 01313
+
+
1.0000000000
IncludeNot
@@ -49,8 +55,14 @@
2016-06-13
F300500
- 703100-
+ 703100
703100
+
+
+ Klant
+ 01313
+
+
2.0000000000
Ledger
Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml
===================================================================
diff -u -r34840 -r34868
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34840)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34868)
@@ -130,6 +130,28 @@
]]>
+
+
+
+
JournalTable:AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTable
1
@@ -150,6 +172,8 @@
do $$$AssertEquals(Transactie.CurrencyCode,"EUR")
do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Account,"01234")
do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).DisplayValue,"01234 - DE KLANTNAAM")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Values.GetAt(1).Name,"Klant")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Values.GetAt(1).Value,"01234")
do $$$AssertEquals(Transactie.LineNum,"1.0000000000")
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
@@ -171,7 +195,9 @@
do $$$AssertEquals(Transactie.AmountCurDebit,"")
do $$$AssertEquals(Transactie.CurrencyCode,"EUR")
do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Account,"700000")
- do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).DisplayValue,"700000-")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).DisplayValue,"700000")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Values.GetAt(1).Name,"Klant")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Values.GetAt(1).Value,"01234")
do $$$AssertEquals(Transactie.LineNum,"2.0000000000")
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")