Skip to content

[Master]-Subscription Billing: Items created from Catalogue Items are deleted after deleting a Contract Invoice #7398

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

Merged
djukicmilica merged 1 commit into from
Mar 27, 2026
+30 −60
Merged

[Master]-Subscription Billing: Items created from Catalogue Items are deleted after deleting a Contract Invoice #7398

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
90 changes: 30 additions & 60 deletions src/Apps/W1/Subscription Billing/Test/Billing/RecurringBillingDocsTest.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ using Microsoft.Finance.GeneralLedger.Journal;
using Microsoft.Foundation.UOM;
using Microsoft.Inventory.Item;
using Microsoft.Inventory.Item.Attribute;
using Microsoft.Inventory.Item.Catalog;
using Microsoft.Pricing.Asset;
using Microsoft.Pricing.PriceList;
using Microsoft.Pricing.Source;
Expand Down Expand Up @@ -68,6 +67,7 @@ codeunit 139687 "Recurring Billing Docs Test"
LibraryVariableStorage: Codeunit "Library - Variable Storage";
IsInitialized: Boolean;
NoContractLinesFoundErr: Label 'No contract lines were found that can be billed with the specified parameters.', Locked = true;
ItemDeletedErr: Label 'Item created from catalog item should not be deleted when the billing invoice is deleted.', Locked = true;
StrMenuHandlerStep: Integer;

#region Tests
Expand Down Expand Up @@ -2372,84 +2372,54 @@ codeunit 139687 "Recurring Billing Docs Test"
Assert.ExpectedError(StrSubstNo(ItemUOMDoesNotExistErr, MockServiceObject."No.", MockServiceObject."Unit of Measure", Item."No."));
end;

// [Test] Disabled - test is broken, tracked for fix. See: https://github.com/microsoft/BCApps/issues/
[HandlerFunctions('MessageHandler,CreateBillingDocumentPageHandler')]
[Test]
[HandlerFunctions('ExchangeRateSelectionModalPageHandler,MessageHandler,CreateBillingDocumentPageHandler')]
procedure CatalogSubscriptionItemNotDeletedOnInvoiceDeletion()
var
ItemTempl: Record "Item Templ.";
NonstockItem: Record "Nonstock Item";
CatalogItem: Record Item;
Customer: Record Customer;
ItemServCommitmentPackage: Record "Item Subscription Package";
ServiceCommPackageLine: Record "Subscription Package Line";
ServiceCommitmentPackage2: Record "Subscription Package";
ServiceCommitmentTemplate2: Record "Sub. Package Line Template";
InvoicingItem: Record Item;
LibraryTemplates: Codeunit "Library - Templates";
Salesline2: Record "Sales Line";
Item: Record Item;
NextBillingToDate: Date;
ItemNo: Code[20];
begin
// [SCENARIO] When an item is created from a catalog item and used in a subscription contract,
// [SCENARIO 625680] When an item is created from a catalog item and used in a subscription contract,
// deleting the invoice draft should NOT automatically delete the item.
Initialize();
ContractTestLibrary.DeleteAllContractRecords();

// [GIVEN] Create a Non-Inventory Item Template with Subscription Option = "Service Commitment Item"
LibraryTemplates.CreateItemTemplateWithData(ItemTempl);
ItemTempl.Validate("Inventory Posting Group", '');
ItemTempl.Validate(Type, "Item Type"::"Non-Inventory");
ItemTempl.Validate("Subscription Option", "Item Service Commitment Type"::"Service Commitment Item");
ItemTempl.Modify(false);

// [GIVEN] Create a catalog item (Nonstock Item) using the template - this creates an Item automatically
LibraryInventory.CreateNonStockItemWithItemTemplateCode(NonstockItem, ItemTempl.Code);
NonstockItem.Get(NonstockItem."Entry No.");
CatalogItem.Get(NonstockItem."Item No.");
ItemNo := CatalogItem."No.";
CatalogItem.TestField("Subscription Option", "Item Service Commitment Type"::"Service Commitment Item");

// [GIVEN] Create Subscription Package with invoicing item and assign to the catalog item
ContractTestLibrary.CreateServiceCommitmentTemplate(ServiceCommitmentTemplate2, '', LibraryRandom.RandDec(100, 2),
Enum::"Invoicing Via"::Contract, Enum::"Calculation Base Type"::"Item Price", false);
ContractTestLibrary.CreateItemWithServiceCommitmentOption(InvoicingItem, Enum::"Item Service Commitment Type"::"Invoicing Item");
ServiceCommitmentTemplate2.Validate("Invoicing Item No.", InvoicingItem."No.");
ServiceCommitmentTemplate2.Modify(false);
ContractTestLibrary.CreateServiceCommitmentPackage(ServiceCommitmentPackage2);
ContractTestLibrary.CreateServiceCommitmentPackageLine(ServiceCommitmentPackage2.Code, ServiceCommitmentTemplate2.Code,
ServiceCommPackageLine, '<1Y>', '<1M>', Enum::"Service Partner"::Customer, '<1M>');
ContractTestLibrary.AssignItemToServiceCommitmentPackage(CatalogItem, ServiceCommitmentPackage2.Code);

// [GIVEN] Create Service Object for the catalog item with subscription commitments
ContractTestLibrary.CreateServiceObjectForItem(ServiceObject, CatalogItem, false);
ServiceCommitmentPackage2.SetFilter(Code, ContractTestLibrary.GetPackageFilterForItem(ItemServCommitmentPackage, ServiceObject."Source No."));
ContractTestLibrary.InsertServiceCommitmentsFromServCommPackage(ServiceObject, WorkDate(), ServiceCommitmentPackage2);

// [GIVEN] Set up Customer and assign service object to Customer Subscription Contract
LibrarySales.CreateCustomer(Customer);
ContractTestLibrary.SetGeneralPostingSetup(Customer."Gen. Bus. Posting Group", CatalogItem."Gen. Prod. Posting Group", false, Enum::"Service Partner"::Customer);
ContractTestLibrary.SetGeneralPostingSetup(Customer."Gen. Bus. Posting Group", InvoicingItem."Gen. Prod. Posting Group", false, Enum::"Service Partner"::Customer);
ServiceObject.SetHideValidationDialog(true);
ServiceObject.Validate("End-User Customer No.", Customer."No.");
ServiceObject.Modify(false);
ContractTestLibrary.CreateCustomerContract(CustomerContract, Customer."No.");
ContractTestLibrary.AssignServiceObjectForItemToCustomerContract(CustomerContract, ServiceObject, false);

// [GIVEN] Create billing proposal and billing document (invoice)
// [GIVEN] Create a subscription contract with an item created from catalog, and create a billing proposal to generate an invoice. Then delete the invoice.
ContractTestLibrary.DeleteAllContractRecords();
ContractTestLibrary.CreateCustomerContractAndCreateContractLinesForItems(CustomerContract, ServiceObject, '', false);
GetCustomerContractServiceCommitment(CustomerContract."No.");
NextBillingToDate := ServiceCommitment."Next Billing Date";
LibraryVariableStorage.Enqueue(NextBillingToDate);

// [GIVEN] Create a billing proposal to generate an invoice for the subscription contract. This will create an item from catalog and link it to the invoice line.
BillingProposal.CreateBillingProposalFromContract(CustomerContract."No.", CustomerContract.GetFilter("Billing Rhythm Filter"), "Service Partner"::Customer);
BillingLine.Reset();
BillingLine.SetRange("Billing Template Code", '');
BillingLine.FindLast();
SalesHeader.Get(Enum::"Sales Document Type"::Invoice, BillingLine."Document No.");
Salesline2.Get(Salesline2."Document Type"::Invoice, SalesHeader."No.", BillingLine."Document Line No.");
Item.Get(Salesline2."No.");
ItemNo := Item."No.";
SalesHeader.Delete(true);
Item.Validate("Subscription Option", Item."Subscription Option"::"Service Commitment Item");
Item.Validate("Created From Nonstock Item", true);
Item.Modify(true);

// [GIVEN] Create a new billing proposal with the same subscription contract which will recreate the invoice and link it to the same item created from catalog.
LibraryVariableStorage.Enqueue(NextBillingToDate);
BillingProposal.CreateBillingProposalFromContract(CustomerContract."No.", CustomerContract.GetFilter("Billing Rhythm Filter"), "Service Partner"::Customer);

// [WHEN] Delete the sales invoice
// [WHEN] Delete the invoice created from the billing proposal.
BillingLine.Reset();
BillingLine.SetRange("Billing Template Code", '');
BillingLine.FindLast();
SalesHeader.Get(Enum::"Sales Document Type"::Invoice, BillingLine."Document No.");
SalesHeader.Delete(true);

// [THEN] The item created from catalog should NOT be deleted
Assert.IsTrue(CatalogItem.Get(ItemNo), 'Item created from catalog item should not be deleted when the billing invoice is deleted.');
CatalogItem.TestField("Subscription Option", "Item Service Commitment Type"::"Service Commitment Item");
// [THEN] The item created from catalog should NOT be deleted.
Item.Reset();
Assert.IsTrue(Item.Get(ItemNo), ItemDeletedErr);
end;

#endregion Tests
Expand Down
Loading