Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34727 -r34840
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34727)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34840)
@@ -857,14 +857,16 @@
#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
#dim PostalAddresFictief As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
- #dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
- do $$$AssertEquals(PostalAddresFictief.IsPrimary,"Yes")
- do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"NLD")
- do $$$AssertEquals(PostalAddresFictief.Roles,"Business")
- do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam Toenaam")
+ if $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),2) {
+ do $$$AssertEquals(PostalAddresFictief.IsPrimary,"Yes")
+ do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"NLD")
+ do $$$AssertEquals(PostalAddresFictief.Roles,"Business")
+ do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam Toenaam")
+ }
+
+ #dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
do $$$AssertEquals(PostalAddresEcht.IsPrimary,"No")
- do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),2)
]]>
Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml
===================================================================
diff -u -r34817 -r34840
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34817)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34840)
@@ -148,8 +148,8 @@
do $$$AssertEquals(Transactie.AmountCurDebit,"121.00")
do $$$AssertEquals(Transactie.AmountCurCredit,"")
do $$$AssertEquals(Transactie.CurrencyCode,"EUR")
- do $$$AssertEquals(Transactie.LedgerDimension.Account,"01234")
- do $$$AssertEquals(Transactie.LedgerDimension.DisplayValue,"01234 - DE KLANTNAAM")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Account,"01234")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).DisplayValue,"01234 - DE KLANTNAAM")
do $$$AssertEquals(Transactie.LineNum,"1.0000000000")
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
@@ -170,8 +170,8 @@
do $$$AssertEquals(Transactie.AmountCurCredit,"100.00")
do $$$AssertEquals(Transactie.AmountCurDebit,"")
do $$$AssertEquals(Transactie.CurrencyCode,"EUR")
- do $$$AssertEquals(Transactie.LedgerDimension.Account,"700000")
- do $$$AssertEquals(Transactie.LedgerDimension.DisplayValue,"700000-")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).Account,"700000")
+ do $$$AssertEquals(Transactie.LedgerDimension.GetAt(1).DisplayValue,"700000-")
do $$$AssertEquals(Transactie.LineNum,"2.0000000000")
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34817 -r34840
--- 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 34817)
+++ 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)
@@ -22,10 +22,10 @@
F586.689
2016-04-22
F586689
-
-
- 09283
-
+
+
+ 09283
+
1.0000000000
IncludeNot
Ledger
@@ -48,10 +48,10 @@
F586.689
2016-04-22
F586689
-
- 703000-
- 703000
-
+
+ 703000-
+ 703000
+
2.0000000000
Ledger
VHBE
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34817 -r34840
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34817)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34840)
@@ -98,9 +98,12 @@
#dim BoekhoudRekeningId As %String = Boeking.BoekhoudRekeningId
- set Transaction.LedgerDimension.Account = BoekhoudRekeningId
- set Transaction.LedgerDimension.DisplayValue = BoekhoudRekeningId _ "-"
+ set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
+ set LedgerDimension.Account = BoekhoudRekeningId
+ set LedgerDimension.DisplayValue = BoekhoudRekeningId _ "-"
+ do Transaction.LedgerDimension.Insert(LedgerDimension)
+
quit Transaction
]]>
@@ -126,9 +129,13 @@
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.Account = ..Formatter.FormatAccountNumber(Factuur.GeefKlantNr())
- set Transaction.LedgerDimension.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
]]>
@@ -146,7 +153,6 @@
set:(Factuur.GeefTotaalKortingKontant()>0) Transaction.DateCashDisc = Factuur.GeefVervalDatumKortingContant()
set:(Factuur.GeefTotaalKortingKontant()>0) Transaction.CashDiscCode = ..GetCashDiscCode(Factuur)
- set Transaction.LedgerDimension = ##class(AXaif.Shared.AxdTypeMultiTypeAccount).%New()
set Transaction.OffsetAccountType = "Ledger"
set Transaction.OffsetCompany = ..FirmaBepaler.GeefInitialen()
set Transaction.Company = ..FirmaBepaler.GeefInitialen()
Index: AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34782 -r34840
--- AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34782)
+++ AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34840)
@@ -62,7 +62,6 @@
do Table.LedgerJournalTrans.Insert(..GetVendTransaction(Factuur))
-
quit Table
]]>
@@ -77,8 +76,11 @@
set Transaction.AmountCurCredit = ..Formatter.FormatNumber(Boeking.Bedrag,2)
- set Transaction.LedgerDimension.Account = Boeking.BoekhoudRekeningId
- set Transaction.LedgerDimension.DisplayValue = Boeking.BoekhoudRekeningId_"-"
+ set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
+ set LedgerDimension.Account = Boeking.BoekhoudRekeningId
+ set LedgerDimension.DisplayValue = Boeking.BoekhoudRekeningId_"-"
+ do Transaction.LedgerDimension.Insert(LedgerDimension)
+
quit Transaction
]]>
@@ -101,8 +103,12 @@
#dim Leverancier As DOM.AKP.Leverancier = ..AankoopAPI.GeefLeverancier(Factuur.LeverancierID)
- set Transaction.LedgerDimension.Account = ..Formatter.FormatAccountNumber(Leverancier.GeefCode())
- set Transaction.LedgerDimension.DisplayValue = ..Formatter.FormatAccountNumber(Leverancier.GeefCode())_" - "_Leverancier.GeefNaam()
+ set LedgerDimension = ##class(AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension).%New()
+ set LedgerDimension.Account = ..Formatter.FormatAccountNumber(Leverancier.GeefCode())
+ set LedgerDimension.DisplayValue = ..Formatter.FormatAccountNumber(Leverancier.GeefCode())_" - "_Leverancier.GeefNaam()
+
+ do Transaction.LedgerDimension.Insert(LedgerDimension)
+
quit Transaction
]]>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/Inbound/PurchaseInvoice-Create 1 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34769 -r34840
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/Inbound/PurchaseInvoice-Create 1 - VHBE - 20160501_091500.xml (.../PurchaseInvoice-Create 1 - VHBE - 20160501_091500.xml) (revision 34769)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestPurchaseInvoice-Create/AIF/Inbound/PurchaseInvoice-Create 1 - VHBE - 20160501_091500.xml (.../PurchaseInvoice-Create 1 - VHBE - 20160501_091500.xml) (revision 34840)
@@ -19,10 +19,10 @@
VHBE
2016-05-21
848153
-
- 05005 - BLUM JULIUS GMBH
- 05005
-
+
+ 05005 - BLUM JULIUS GMBH
+ 05005
+
1.0000000000
IncludeNot
Ledger
Index: AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml
===================================================================
diff -u
--- AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml (revision 0)
+++ AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml (revision 34840)
@@ -0,0 +1,59 @@
+
+
+
+serial
+1
+%SerialObject,%XML.Adaptor
+right
+
+
+1
+
+
+
+http://schemas.microsoft.com/dynamics/2008/01/documents/LedgerGeneralJournal
+
+
+
+LedgerDimension
+
+
+
+1
+
+
+
+%String
+
+
+
+
+
+
+
+
+%String
+
+
+
+
+
+
+
+
+%Library.CacheSerialState
+LedgerGeneralJournalDimensionState
+^AXaif.Ledg1C5F.LedgerGenerA9BCS
+
+
+DisplayValue
+
+
+Account
+
+
+
+
+
+
+
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34817 -r34840
--- 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 34817)
+++ 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)
@@ -22,10 +22,10 @@
F300.500
2016-06-13
F300500
-
- 01313 - HEREMANS KEUKENS
- 01313
-
+
+ 01313 - HEREMANS KEUKENS
+ 01313
+
1.0000000000
IncludeNot
Ledger
@@ -48,10 +48,10 @@
F300.500
2016-06-13
F300500
-
- 703100-
- 703100
-
+
+ 703100-
+ 703100
+
2.0000000000
Ledger
VHBE
Index: AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalTrans.cls.xml
===================================================================
diff -u -r34604 -r34840
--- AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalTrans.cls.xml (.../AxdEntityLedgerJournalTrans.cls.xml) (revision 34604)
+++ AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalTrans.cls.xml (.../AxdEntityLedgerJournalTrans.cls.xml) (revision 34840)
@@ -108,8 +108,10 @@
-AXaif.Shared.AxdTypeMultiTypeAccount
+AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimension
+list
+
@@ -206,8 +208,6 @@
AxdEntityLedgerJournalTransState
^AXaif.Ledg1C5F.AxdEntityLeE566S
-listnode
-
AccountType
@@ -257,58 +257,58 @@
JournalNum
-LedgerDimension
+LineNum
-LineNum
+Listcode
-Listcode
+OffsetAccountType
-OffsetAccountType
+OffsetCompany
-OffsetCompany
+OffsetDefaultDimension
-OffsetDefaultDimension
+OffsetLedgerDimension
-OffsetLedgerDimension
+OffsetTxt
-OffsetTxt
+PaymId
-PaymId
+PaymMode
-PaymMode
+RecVersion
-RecVersion
+TaxGroup
-TaxGroup
+TaxItemGroup
-TaxItemGroup
+TransDate
-TransDate
+Txt
-Txt
+Voucher
-Voucher
+class
-class
+action
-action
+LedgerDimension