Skip to content

[Bug][SubscriptionBilling]: Invoicing Item on Subscription Package Line ignored for "Subscription Item" type items #6895

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
miljance wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Bug][SubscriptionBilling]: Invoicing Item on Subscription Package Line ignored for "Subscription Item" type items #6895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions src/Apps/W1/Subscription Billing/App/Import/Codeunits/CreateSubscriptionLine.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ codeunit 8006 "Create Subscription Line"
local procedure CreateServiceCommitment()
var
ServiceCommitment: Record "Subscription Line";
ServiceObject: Record "Subscription Header";
ContractsItemManagement: Codeunit "Sub. Contracts Item Management";
begin
ServiceCommitment.Init();
ServiceCommitment.Validate("Subscription Header No.", ImportedServiceCommitment."Subscription Header No.");
Expand All @@ -71,13 +69,7 @@ codeunit 8006 "Create Subscription Line"
OnAfterSubscriptionLineInsert(ServiceCommitment, ImportedServiceCommitment);

ServiceCommitment."Invoicing via" := ImportedServiceCommitment."Invoicing via";
if ImportedServiceCommitment."Invoicing Item No." <> '' then
ServiceCommitment."Invoicing Item No." := ImportedServiceCommitment."Invoicing Item No."
else
if ServiceObject.Get(ServiceCommitment."Subscription Header No.") then
if ServiceObject.IsItem() then
if ContractsItemManagement.IsServiceCommitmentItem(ServiceObject."Source No.") then
ServiceCommitment."Invoicing Item No." := ServiceObject."Source No.";
ServiceCommitment."Invoicing Item No." := ImportedServiceCommitment.GetInvoicingItemNo();
ServiceCommitment.Template := ImportedServiceCommitment."Template Code";
ServiceCommitment.Validate("Subscription Package Code", ImportedServiceCommitment."Subscription Package Code");
ServiceCommitment.Partner := ImportedServiceCommitment.Partner;
Expand Down
13 changes: 13 additions & 0 deletions src/Apps/W1/Subscription Billing/App/Import/Tables/ImportedSubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,4 +314,17 @@ table 8009 "Imported Subscription Line"
"Currency Factor" := CurrExchRate.ExchangeRate("Currency Factor Date", "Currency Code");
end
end;

internal procedure GetInvoicingItemNo(): Code[20]
var
SubscriptionHeader: Record "Subscription Header";
ContractsItemManagement: Codeunit "Sub. Contracts Item Management";
begin
if Rec."Invoicing Item No." <> '' then
exit(Rec."Invoicing Item No.");
if SubscriptionHeader.Get(Rec."Subscription Header No.") then
if SubscriptionHeader.IsItem() then
if ContractsItemManagement.IsServiceCommitmentItem(SubscriptionHeader."Source No.") then
exit(SubscriptionHeader."Source No.");
end;
}
6 changes: 5 additions & 1 deletion ...ion Billing/App/Sales Service Commitments/Codeunits/SalesSubscriptionLineMgmt.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,11 @@ codeunit 8069 "Sales Subscription Line Mgmt."
Item.Get(ItemNo);
case Item."Subscription Option" of
Item."Subscription Option"::"Service Commitment Item":
exit(Item."No.");
begin
if ServiceCommitmentPackageLine."Invoicing Item No." <> '' then
exit(ServiceCommitmentPackageLine."Invoicing Item No.");
exit(Item."No.");
end;
Item."Subscription Option"::"Sales with Service Commitment":
begin
if ServiceCommitmentPackageLine."Invoicing via" = Enum::"Invoicing Via"::Contract then
Expand Down
8 changes: 8 additions & 0 deletions ...s/W1/Subscription Billing/App/Service Commitments/Tables/SubscriptionPackageLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,4 +308,12 @@ table 8056 "Subscription Package Line"
if (Format("Billing Base Period") <> '') and (Format("Billing Rhythm") <> '') then
DateFormulaManagement.CheckIntegerRatioForDateFormulas("Billing Base Period", FieldCaption("Billing Base Period"), "Billing Rhythm", FieldCaption("Billing Rhythm"));
end;

internal procedure GetInvoicingItemNo(Item: Record Item): Code[20]
begin
if Rec."Invoicing Item No." <> '' then
exit(Rec."Invoicing Item No.");
if Item.IsServiceCommitmentItem() then
exit(Item."No.");
end;
}
5 changes: 1 addition & 4 deletions src/Apps/W1/Subscription Billing/App/Service Objects/Tables/SubscriptionHeader.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,10 +1785,7 @@ table 8057 "Subscription Header"
ServiceCommitment.Template := ServiceCommPackageLine.Template;
ServiceCommitment.Description := ServiceCommPackageLine.Description;
ServiceCommitment."Invoicing via" := ServiceCommPackageLine."Invoicing via";
if Item.IsServiceCommitmentItem() then
ServiceCommitment."Invoicing Item No." := Item."No."
else
ServiceCommitment."Invoicing Item No." := ServiceCommPackageLine."Invoicing Item No.";
ServiceCommitment."Invoicing Item No." := ServiceCommPackageLine.GetInvoicingItemNo(Item);
ServiceCommitment."Customer Price Group" := ServiceCommitmentPackage."Price Group";

if ServiceAndCalculationStartDate <> 0D then
Expand Down
13 changes: 7 additions & 6 deletions src/Apps/W1/Subscription Billing/Test/Base/ContractTestLibrary.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ codeunit 139685 "Contract Test Library"
var
Item: Record Item;
begin
if (InvoicingVia = InvoicingVia::Contract) and (ItemNo = '') then begin
if (InvoicingVia = InvoicingVia::Contract) and (ItemNo = '') and not CreateDiscountLine then begin
CreateItemWithServiceCommitmentOption(Item, Enum::"Item Service Commitment Type"::"Invoicing Item");
ItemNo := Item."No.";
end;
Expand Down Expand Up @@ -780,11 +780,12 @@ codeunit 139685 "Contract Test Library"

CreateServiceCommitmentTemplate(ServiceCommitmentTemplate, '', LibraryRandom.RandDec(100, 2), NewInvoicingVia, Enum::"Calculation Base Type"::"Item Price", false);

if ServiceCommitmentTemplate."Invoicing via" = ServiceCommitmentTemplate."Invoicing via"::Contract then begin
CreateItemWithServiceCommitmentOption(Item2, Enum::"Item Service Commitment Type"::"Invoicing Item");
ServiceCommitmentTemplate.Validate("Invoicing Item No.", Item2."No.");
ServiceCommitmentTemplate.Modify(false);
end;
if ServiceCommitmentTemplate."Invoicing via" = ServiceCommitmentTemplate."Invoicing via"::Contract then
if not Item.IsServiceCommitmentItem() then begin
CreateItemWithServiceCommitmentOption(Item2, Enum::"Item Service Commitment Type"::"Invoicing Item");
ServiceCommitmentTemplate.Validate("Invoicing Item No.", Item2."No.");
ServiceCommitmentTemplate.Modify(false);
end;

CreateServiceCommitmentPackage(ServiceCommitmentPackage);

Expand Down
Loading