Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml
===================================================================
diff -u -r34727 -r34728
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34727)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml (.../Test.cls.xml) (revision 34728)
@@ -158,6 +158,7 @@
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
do $$$AssertEquals(Transactie.TaxGroup,"BDOM")
+ do $$$AssertEquals(Transactie.TaxItemGroup,"G3")
do $$$AssertEquals(Transactie.TransDate,"2011-06-30")
do $$$AssertEquals(Transactie.DocumentNum,"F123.456")
do $$$AssertEquals(Transactie.Invoice,"F123456")
@@ -178,6 +179,8 @@
do $$$AssertEquals(Transactie.LineNum,"2.0000000000")
do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
+ do $$$AssertEquals(Transactie.TaxGroup,"BDOM")
+ do $$$AssertEquals(Transactie.TaxItemGroup,"G3")
do $$$AssertEquals(Transactie.TransDate,"2011-06-30")
do $$$AssertEquals(Transactie.Invoice,"F123456")
do $$$AssertEquals(Transactie.Voucher,"F123456")
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34727 -r34728
--- 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 34727)
+++ 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 34728)
@@ -16,7 +16,7 @@
2,563.13
42.51
08D2%
- prbe
+ VHBE
EUR
F300.500
1846-07-09
@@ -28,8 +28,9 @@
1.0000000000
IncludeNot
Ledger
- prbe
+ VHBE
BDOM
+ G3
1846-07-09
HEREMANS KEUKENS
F300500
@@ -38,7 +39,7 @@
Ledger
2,125.67
08D2%
- prbe
+ VHBE
EUR
F300.500
1846-07-09
@@ -50,7 +51,9 @@
2.0000000000
IncludeNot
Ledger
- prbe
+ VHBE
+ BDOM
+ G3
1846-07-09
HEREMANS KEUKENS
F300500
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689 - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34727 -r34728
--- 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 34727)
+++ 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 34728)
@@ -16,7 +16,7 @@
1,220.23
20.24
08D2%
- prbe
+ VHBE
EUR
F586.689
1846-07-09
@@ -28,8 +28,9 @@
1.0000000000
IncludeNot
Ledger
- prbe
+ VHBE
BDOM
+ G3
1846-07-09
F586689
@@ -38,7 +39,7 @@
Ledger
1,011.97
08D2%
- prbe
+ VHBE
EUR
F586.689
1846-07-09
@@ -50,7 +51,9 @@
2.0000000000
IncludeNot
Ledger
- prbe
+ VHBE
+ BDOM
+ G3
1846-07-09
F586689
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34727 -r34728
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34727)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34728)
@@ -103,7 +103,9 @@
#dim Transaction As AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTrans = ..MakeTransaction(Factuur,1)
set Transaction.AccountType = "Cust"
set Transaction.OffsetAccountType = "Ledger"
+
set Transaction.TaxGroup = ..Utils.ConvertTaxGroup(Factuur.GeefKlant())
+ set Transaction.TaxItemGroup = "G3"
set Transaction.CashDiscAmount = ..Formatter.FormatNumber(Factuur.GeefTotaalKortingKontant(),2)
@@ -125,11 +127,14 @@
set Transaction.LedgerDimension = ##class(AXaif.Shared.AxdTypeMultiTypeAccount).%New()
set Transaction.OffsetAccountType = "Ledger"
- set Transaction.OffsetCompany = "prbe"
- set Transaction.Company = "prbe"
+ set Transaction.OffsetCompany = ..FirmaBepaler.GeefInitialen()
+ set Transaction.Company = ..FirmaBepaler.GeefInitialen()
set Transaction.class = "entity"
set Transaction.CurrencyCode = Factuur.GeefMuntCode()
+ set Transaction.TaxGroup = "BDOM"
+ set Transaction.TaxItemGroup = "G3"
+
set:(Factuur.GeefTotaalKortingKontant()>0) Transaction.CashDiscCode = ..GetCashDiscCode(Factuur)
set Transaction.LineNum = ..Formatter.FormatNumber(ItemIndex,10)
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34727 -r34728
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34727)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml (.../AifConverter.cls.xml) (revision 34728)
@@ -76,8 +76,9 @@
set Custable.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Partij.GeefBTWNr())
set Custable.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
- set Custable.TaxGroup = ..Utils.ConvertTaxGroup(Klant)
+ set Custable.TaxGroup = ..Utils.ConvertTaxGroup(Klant)
+
set Custable.WebSalesOrderDisplay = "All"
set Custable.PaymTermId = ..Formatter.ConvertPaymTermId(Klant.GeefBetalingwijze(), Klant.GeefBetalingTermijn())
set Custable.PaymMode = ..Formatter.ConvertPaymMode(Klant.GeefBetalingwijze())