Index: AXdixf/Vendor/Vendor.cls.xml
===================================================================
diff -u -r34671 -r34738
--- AXdixf/Vendor/Vendor.cls.xml (.../Vendor.cls.xml) (revision 34671)
+++ AXdixf/Vendor/Vendor.cls.xml (.../Vendor.cls.xml) (revision 34738)
@@ -87,7 +87,7 @@
%String
-
+
%String
Index: AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml
===================================================================
diff -u -r34689 -r34738
--- AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml (.../DixfConverter.cls.xml) (revision 34689)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfConverter.cls.xml (.../DixfConverter.cls.xml) (revision 34738)
@@ -58,7 +58,7 @@
Set AxLeverancier.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
Set AxLeverancier.PaymTermId = ..Formatter.ConvertPaymTermId(Leverancier.GeefBetaalwijze(),Leverancier.GeefBetalingVoorwaarde())
Set AxLeverancier.PaymMode = ..ConvertPaymentMode(Partij)
- Set AxLeverancier.UseCashDisc = ..Formatter.FormatCashDiscount(Leverancier.GeefKortingKontant(),Leverancier.GeefTermijnKortingKontant())
+ Set AxLeverancier.CashDisc = ..Formatter.FormatCashDiscount(Leverancier.GeefKortingKontant(),Leverancier.GeefTermijnKortingKontant())
Set:$$$HasLength(Leverancier.GeefBankRekeningNr()) AxLeverancier.BankAccount = "1"
Set AxLeverancier.TaxGroup = ..ConvertTaxGroup(Partij)
Set AxLeverancier.MainContactWorkerPartyName = ..EasyFormDataService.GeefEersteGoedkeurder(Leverancier.GeefCode())
Index: AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml
===================================================================
diff -u -r34711 -r34738
--- AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml (.../DixfGenerator.cls.xml) (revision 34711)
+++ AX/Uitgaand/AKP/Leverancier/impl/DixfGenerator.cls.xml (.../DixfGenerator.cls.xml) (revision 34738)
@@ -44,7 +44,7 @@
Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "VATNum")
Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PaymTermId")
Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "PaymMode")
- Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "UseCashDisc")
+ Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "CashDisc")
Do Headers.InsertKeyValue("AXdixf.Vendor.Vendor", "BankAccount")
#dim AXLeverancierData As APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased
Index: vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml
===================================================================
diff -u -r34689 -r34738
--- vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml (.../Convert.cls.xml) (revision 34689)
+++ vhUnitTest/AX/Uitgaand/AKP/Leverancier/impl/DixfConverter/Convert.cls.xml (.../Convert.cls.xml) (revision 34738)
@@ -630,7 +630,7 @@
Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(,..EasyFormDataService)
Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
- Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"")
+ Do $$$AssertEquals(..AxLeverancier.CashDisc,"")
]]>
@@ -642,7 +642,7 @@
Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(,..EasyFormDataService)
Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
- Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"10EOM5%")
+ Do $$$AssertEquals(..AxLeverancier.CashDisc,"10EOM5%")
]]>
@@ -654,7 +654,7 @@
Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(,..EasyFormDataService)
Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
- Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"08D1%")
+ Do $$$AssertEquals(..AxLeverancier.CashDisc,"08D1%")
]]>
@@ -666,7 +666,7 @@
Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(,..EasyFormDataService)
Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
- Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"10D3%")
+ Do $$$AssertEquals(..AxLeverancier.CashDisc,"10D3%")
]]>
@@ -678,7 +678,7 @@
Set Converter = ##class(AX.Uitgaand.AKP.Leverancier.impl.DixfConverter).%New(,..EasyFormDataService)
Set ..AxLeverancier = Converter.Convert(..Partij, ..Leverancier)
- Do $$$AssertEquals(..AxLeverancier.UseCashDisc,"08D3%")
+ Do $$$AssertEquals(..AxLeverancier.CashDisc,"08D3%")
]]>