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 7dc8662512..166dad6008 100644 --- a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al +++ b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccPayableExcel.Report.al @@ -342,11 +342,17 @@ report 4403 "EXR Aged Acc Payable Excel" local procedure InsertAgingData(var Vendor: Record "Vendor") var VendorLedgerEntry: Record "Vendor Ledger Entry"; + EarliestPeriodStart: Date; begin + EarliestPeriodStart := PeriodStarts.Get(PeriodStarts.Count()); VendorLedgerEntry.SetCurrentKey("Vendor No.", Open, Positive, "Due Date", "Currency Code"); VendorLedgerEntry.SetRange("Vendor No.", Vendor."No."); VendorLedgerEntry.SetRange("Posting Date", 0D, EndingDate); VendorLedgerEntry.SetRange("Date Filter", 0D, EndingDate); + + if (TempEXRAgingReportBuffer."Aged By" = TempEXRAgingReportBuffer."Aged By"::"Due Date") and (PeriodCount <> 0) then + VendorLedgerEntry.SetRange("Due Date", EarliestPeriodStart, EndingDate); + VendorLedgerEntry.SetAutoCalcFields("Remaining Amt. (LCY)", "Remaining Amount", "Original Amount", "Original Amt. (LCY)"); VendorLedgerEntry.SetFilter("Remaining Amt. (LCY)", '<>0'); if VendorLedgerEntry.FindSet() then 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 e07ca9a845..0a83fac3af 100644 --- a/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al +++ b/src/Apps/W1/ExcelReports/App/src/Financials/EXRAgedAccountsRecExcel.Report.al @@ -341,11 +341,17 @@ report 4402 "EXR Aged Accounts Rec Excel" local procedure InsertAgingData(var Customer: Record Customer) var CustLedgerEntry: Record "Cust. Ledger Entry"; + EarliestPeriodStart: Date; begin + EarliestPeriodStart := PeriodStarts.Get(PeriodStarts.Count()); CustLedgerEntry.SetCurrentKey("Customer No.", Open, Positive, "Due Date", "Currency Code"); CustLedgerEntry.SetRange("Customer No.", Customer."No."); CustLedgerEntry.SetRange("Posting Date", 0D, EndingDate); CustLedgerEntry.SetRange("Date Filter", 0D, EndingDate); + + if (TempEXRAgingReportBuffer."Aged By" = TempEXRAgingReportBuffer."Aged By"::"Due Date") and (PeriodCount <> 0) then + CustLedgerEntry.SetRange("Due Date", EarliestPeriodStart, EndingDate); + CustLedgerEntry.SetAutoCalcFields("Remaining Amt. (LCY)", "Remaining Amount", "Original Amount", "Original Amt. (LCY)"); CustLedgerEntry.SetFilter("Remaining Amt. (LCY)", '<>0'); if CustLedgerEntry.FindSet() then diff --git a/src/Apps/W1/ExcelReports/Test/src/AgedAccountsExcelReports.Codeunit.al b/src/Apps/W1/ExcelReports/Test/src/AgedAccountsExcelReports.Codeunit.al index 6442d2d2a8..5258840872 100644 --- a/src/Apps/W1/ExcelReports/Test/src/AgedAccountsExcelReports.Codeunit.al +++ b/src/Apps/W1/ExcelReports/Test/src/AgedAccountsExcelReports.Codeunit.al @@ -370,21 +370,21 @@ codeunit 139555 "Aged Accounts Excel Reports" [RequestPageHandler] procedure EXRAgedAccPayableExcelHandler(var EXRAgedAccPayableExcel: TestRequestPage "EXR Aged Acc Payable Excel") begin - EXRAgedAccPayableExcel.AgedAsOfOption.SetValue(WorkDate()); + EXRAgedAccPayableExcel.AgedAsOfOption.SetValue(WorkDate() + 30); EXRAgedAccPayableExcel.OK().Invoke(); end; [RequestPageHandler] procedure EXRAgedAccountsRecExcelHandler(var EXRAgedAccountsRecExcel: TestRequestPage "EXR Aged Accounts Rec Excel") begin - EXRAgedAccountsRecExcel.AgedAsOfOption.SetValue(WorkDate()); + EXRAgedAccountsRecExcel.AgedAsOfOption.SetValue(WorkDate() + 30); EXRAgedAccountsRecExcel.OK().Invoke(); end; [RequestPageHandler] procedure EXRAgedAccPayablePostingDateHandler(var EXRAgedAccPayableExcel: TestRequestPage "EXR Aged Acc Payable Excel") begin - EXRAgedAccPayableExcel.AgedAsOfOption.SetValue(WorkDate()); + EXRAgedAccPayableExcel.AgedAsOfOption.SetValue(WorkDate() + 30); EXRAgedAccPayableExcel.AgingbyOption.SetValue('Posting Date'); EXRAgedAccPayableExcel.OK().Invoke(); end;