Skip to content

[Master]-Incorrect Price Calculation for Subscription Billing on Non-Leap Years - Follow up for bug 581883 #6242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DhavalMore88 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Master]-Incorrect Price Calculation for Subscription Billing on Non-Leap Years - Follow up for bug 581883 #6242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f6cd8
Changes
DhavalMore88 Jan 21, 2026
a1b3c71
Automation
DhavalMore88 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Apps/W1/Subscription Billing/App/Service Commitments/Tables/SubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1917,7 +1917,10 @@ table 8059 "Subscription Line"
until LastDayInNextPeriod >= EndDate;
if FollowUpDaysExist then begin
FollowUpDays := EndDate - LastDayInPreviousPeriod;
FollowUpPeriodDays := LastDayInNextPeriod - LastDayInPreviousPeriod;
if SinglePeriodDaysCount(StartDate, EndDate, PeriodFormula) then
FollowUpPeriodDays := Date2DMY(CalcDate('<CM>', EndDate), 1)
else
FollowUpPeriodDays := LastDayInNextPeriod - LastDayInPreviousPeriod;
end;
end;

Expand Down Expand Up @@ -2035,6 +2038,15 @@ table 8059 "Subscription Line"
end;
end;

local procedure SinglePeriodDaysCount(StartDate: Date; EndDate: Date; PeriodFormula: DateFormula): Boolean
begin
if Format(PeriodFormula) <> '1M' then
exit(false);

if (Date2DMY(StartDate, 2) = Date2DMY(EndDate, 2)) and (Date2DMY(StartDate, 3) = Date2DMY(EndDate, 3)) then
exit(true);
end;

[IntegrationEvent(false, false)]
local procedure OnAfterUpdateNextBillingDate(var SubscriptionLine: Record "Subscription Line"; LastBillingToDate: Date)
begin
Expand Down
3 changes: 3 additions & 0 deletions src/Apps/W1/Subscription Billing/Test/Billing/RecurringBillingTest.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ codeunit 139688 "Recurring Billing Test"

CreateBillingProposalForCustomerContractUsingTempTemplate("Period Calculation"::"Align to End of Month", '<1Y>', '<1Q>', 20230228D, 20230614D);
CheckBillingLineAmountAndPrice(116.304);

CreateBillingProposalForCustomerContractUsingTempTemplate("Period Calculation"::"Align to End of Month", '<3M>', '<1M>', 20250226D, 20250228D);
CheckBillingLineAmountAndPrice(10.714);
end;

[Test]
Expand Down