diff --git a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileFCYSEPA00100109Pmts.Report.al b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileFCYSEPA00100109Pmts.Report.al index f6303ed677..0a0ed599de 100644 --- a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileFCYSEPA00100109Pmts.Report.al +++ b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileFCYSEPA00100109Pmts.Report.al @@ -495,7 +495,7 @@ report 2000008 "File FCY SEPA 001.001.09 Pmts" AddElement(XMLNodeCurr, 'Amt', '', '', XMLNewChild); XMLNodeCurr := XMLNewChild; - AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, 9), '', XMLNewChild); + AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, ''), '', XMLNewChild); if PmtJnlLine."Currency Code" = '' then ISOCurrCode := CopyStr(GLSetup."LCY Code", 1, 3) else begin diff --git a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileNonEuroSEPAPayments.Report.al b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileNonEuroSEPAPayments.Report.al index b2840e2c81..22a82a7152 100644 --- a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileNonEuroSEPAPayments.Report.al +++ b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileNonEuroSEPAPayments.Report.al @@ -502,7 +502,7 @@ report 2000006 "File Non Euro SEPA Payments" AddElement(XMLNodeCurr, 'Amt', '', '', XMLNewChild); XMLNodeCurr := XMLNewChild; - AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, 9), '', XMLNewChild); + AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, ''), '', XMLNewChild); if PmtJnlLine."Currency Code" = '' then ISOCurrCode := CopyStr(GLSetup."LCY Code", 1, 3) else begin diff --git a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPA00100109Pmts.Report.al b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPA00100109Pmts.Report.al index d7bec55abc..737dc0d390 100644 --- a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPA00100109Pmts.Report.al +++ b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPA00100109Pmts.Report.al @@ -484,7 +484,7 @@ report 2000007 "File SEPA 001.001.09 Pmts" AddElement(XMLNodeCurr, 'Amt', '', '', XMLNewChild); XMLNodeCurr := XMLNewChild; - AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, 9), '', XMLNewChild); + AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, ''), '', XMLNewChild); AddAttribute(XMLDomDoc, XMLNewChild, 'Ccy', 'EUR'); XMLNodeCurr := XMLNodeCurr.ParentNode; AddElement(XMLNodeCurr, 'CdtrAgt', '', '', XMLNewChild); diff --git a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPAPayments.Report.al b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPAPayments.Report.al index 759d8ebb0e..0db96ca0fa 100644 --- a/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPAPayments.Report.al +++ b/src/Layers/BE/BaseApp/Local/BankMgt/Payment/FileSEPAPayments.Report.al @@ -485,7 +485,7 @@ report 2000005 "File SEPA Payments" AddElement(XMLNodeCurr, 'Amt', '', '', XMLNewChild); XMLNodeCurr := XMLNewChild; - AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, 9), '', XMLNewChild); + AddElement(XMLNodeCurr, 'InstdAmt', Format(PmtJnlLine.Amount, 0, ''), '', XMLNewChild); AddAttribute(XMLDomDoc, XMLNewChild, 'Ccy', 'EUR'); XMLNodeCurr := XMLNodeCurr.ParentNode; AddElement(XMLNodeCurr, 'CdtrAgt', '', '', XMLNewChild); diff --git a/src/Layers/BE/Tests/Local/EBPaymentJournalExport.Codeunit.al b/src/Layers/BE/Tests/Local/EBPaymentJournalExport.Codeunit.al index babbb17422..73d0375633 100644 --- a/src/Layers/BE/Tests/Local/EBPaymentJournalExport.Codeunit.al +++ b/src/Layers/BE/Tests/Local/EBPaymentJournalExport.Codeunit.al @@ -1221,15 +1221,18 @@ codeunit 144008 "EB - Payment Journal Export" Initialize(); // Preparation: create settings + SetShowCurrencyToFCYSymbolOnly(); CountryCode := FindCountryRegion(); ExportProtocol := CreateSEPAExportProtocol(false); // Create payments + SetCurrencySymbol(ForeignCurrencyCode); VendorSwift := GenerateBankAccSwiftCode(); VendorNo := CreateVendor(CountryCode, ExportProtocol, VendorSwift, VendorIbanTxt); InvAmount1 := CreateAndPostPurchInv(VendorNo, false); FirstForeignCurrencyCodeIso := ForeignCurrencyIso; CreateForeignCurrency(SecondForeignCurrencyCode, SecondForeignCurrencyCodeIso); + SetCurrencySymbol(SecondForeignCurrencyCode); ForeignCurrencyCode := SecondForeignCurrencyCode; ForeignCurrencyIso := SecondForeignCurrencyCodeIso; InvAmount2 := CreateAndPostPurchInv(VendorNo, false); @@ -1999,6 +2002,24 @@ codeunit 144008 "EB - Payment Journal Export" ForeignCurrency.Modify(true); end; + local procedure SetShowCurrencyToFCYSymbolOnly() + var + GeneralLedgerSetup: Record "General Ledger Setup"; + begin + GeneralLedgerSetup.Get(); + GeneralLedgerSetup.Validate("Show Currency", GeneralLedgerSetup."Show Currency"::"FCY Symbol Only"); + GeneralLedgerSetup.Modify(true); + end; + + local procedure SetCurrencySymbol(CurrencyCode: Code[10]) + var + Currency: Record Currency; + begin + Currency.Get(CurrencyCode); + Currency.Validate(Symbol, '$'); + Currency.Modify(true); + end; + local procedure CreateSEPAExportProtocol(UseEuro: Boolean): Code[20] var ExportProtocol: Record "Export Protocol";