From 2159d13981e82ffad7b13619cc695e445890b0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Mart=C3=ADnez=20Pineda?=
 <diegojoshuam@microsoft.com>
Date: Mon, 8 Jun 2026 18:04:46 +0200
Subject: [PATCH] Render per-row Currency Code in Aged Accounts
 Receivable/Payable Excel

---
 .../EXRAgedAccPayableExcel.Report.al           | 18 ++++++++++--------
 .../EXRAgedAccountsRecExcel.Report.al          | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al
index e4de74d342..ca15184655 100644
--- a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al
+++ b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al
@@ -76,8 +76,9 @@ report 4403 "EXR Aged Acc Payable Excel"
                 {
                     IncludeCaption = true;
                 }
-                column(CurrencyCode; CurrencyCodeDisplayCode)
+                column(CurrencyCode; "Currency Code")
                 {
+                    IncludeCaption = true;
                 }
                 column(PostingDate; "Posting Date")
                 {
@@ -118,11 +119,7 @@ report 4403 "EXR Aged Acc Payable Excel"
                 Clear(AgingData);
                 AgingData.DeleteAll();
                 InsertAgingData(VendorAgingData);
-
-                if AgingData."Currency Code" = '' then
-                    CurrencyCodeDisplayCode := GeneralLedgerSetup.GetCurrencyCode('')
-                else
-                    CurrencyCodeDisplayCode := AgingData."Currency Code";
+                CurrencyCodeDisplayCode := AgingData."Currency Code";
             end;
         }
 
@@ -263,7 +260,6 @@ report 4403 "EXR Aged Acc Payable Excel"
         DueByCurrencies = 'Due by Currencies', MaxLength = 31, Comment = 'Excel worksheet name.';
         OpenByFCY = 'Open by (FCY)';
         DataRetrieved = 'Data retrieved:';
-        CurrencyCodeDisplay = 'Currency Code';
         AgedAsOf = 'Aged as of:';
         AgedAccountsPayable = 'Aged Accounts Payable';
         AgedAccountsPayablePrint = 'Aged Accounts Payable (Print)', MaxLength = 31, Comment = 'Excel worksheet name.';
@@ -314,6 +310,9 @@ report 4403 "EXR Aged Acc Payable Excel"
         if PeriodCount = 0 then
             PeriodCount := 5;
 
+        if not GeneralLedgerSetup.Get() then
+            Clear(GeneralLedgerSetup);
+
         WorkingEndDate := EndingDate;
         WorkingStartDate := CalcDate(PeriodLength, WorkingEndDate);
         repeat
@@ -357,7 +356,10 @@ report 4403 "EXR Aged Acc Payable Excel"
         AgingData."Document No." := VendorLedgerEntry."Document No.";
         AgingData."Dimension 1 Code" := VendorLedgerEntry."Global Dimension 1 Code";
         AgingData."Dimension 2 Code" := VendorLedgerEntry."Global Dimension 2 Code";
-        AgingData."Currency Code" := VendorLedgerEntry."Currency Code";
+        if VendorLedgerEntry."Currency Code" = '' then
+            AgingData."Currency Code" := GeneralLedgerSetup.GetCurrencyCode('')
+        else
+            AgingData."Currency Code" := VendorLedgerEntry."Currency Code";
         AgingData."Posting Date" := VendorLedgerEntry."Posting Date";
         AgingData."Document Date" := VendorLedgerEntry."Document Date";
         AgingData."Due Date" := VendorLedgerEntry."Due Date";
diff --git a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al
index 1aad3b6cd9..2c4b0ad3b3 100644
--- a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al
+++ b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al
@@ -76,8 +76,9 @@ report 4402 "EXR Aged Accounts Rec Excel"
                 {
                     IncludeCaption = true;
                 }
-                column(CurrencyCode; CurrencyCodeDisplayCode)
+                column(CurrencyCode; "Currency Code")
                 {
+                    IncludeCaption = true;
                 }
                 column(PostingDate; "Posting Date")
                 {
@@ -118,11 +119,7 @@ report 4402 "EXR Aged Accounts Rec Excel"
                 Clear(AgingData);
                 AgingData.DeleteAll();
                 InsertAgingData(CustomerAgingData);
-
-                if AgingData."Currency Code" = '' then
-                    CurrencyCodeDisplayCode := GeneralLedgerSetup.GetCurrencyCode('')
-                else
-                    CurrencyCodeDisplayCode := AgingData."Currency Code";
+                CurrencyCodeDisplayCode := AgingData."Currency Code";
             end;
         }
 
@@ -263,7 +260,6 @@ report 4402 "EXR Aged Accounts Rec Excel"
         DueByCurrencies = 'Due by Currencies', MaxLength = 31, Comment = 'Excel worksheet name.';
         OpenByFCY = 'Open by (FCY)';
         DataRetrieved = 'Data retrieved:';
-        CurrencyCodeDisplay = 'Currency Code';
         AgedAsOf = 'Aged as of:';
         AgedAccountsReceivable = 'Aged Accounts Receivable';
         AgedAccountsReceivablePrint = 'Aged Accounts Rec. (Print)', MaxLength = 31, Comment = 'Excel worksheet name.';
@@ -314,6 +310,9 @@ report 4402 "EXR Aged Accounts Rec Excel"
         if PeriodCount = 0 then
             PeriodCount := 5;
 
+        if not GeneralLedgerSetup.Get() then
+            Clear(GeneralLedgerSetup);
+
         WorkingEndDate := EndingDate;
         WorkingStartDate := CalcDate(PeriodLength, WorkingEndDate);
         repeat
@@ -357,7 +356,10 @@ report 4402 "EXR Aged Accounts Rec Excel"
         AgingData."Document No." := CustLedgerEntry."Document No.";
         AgingData."Dimension 1 Code" := CustLedgerEntry."Global Dimension 1 Code";
         AgingData."Dimension 2 Code" := CustLedgerEntry."Global Dimension 2 Code";
-        AgingData."Currency Code" := CustLedgerEntry."Currency Code";
+        if CustLedgerEntry."Currency Code" = '' then
+            AgingData."Currency Code" := GeneralLedgerSetup.GetCurrencyCode('')
+        else
+            AgingData."Currency Code" := CustLedgerEntry."Currency Code";
         AgingData."Posting Date" := CustLedgerEntry."Posting Date";
         AgingData."Document Date" := CustLedgerEntry."Document Date";
         AgingData."Due Date" := CustLedgerEntry."Due Date";