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

src/Apps/W1/Subscription Billing/App/Import/Codeunits/CreateSubscriptionLine.Codeunit.al

@@ -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.");
@@ -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;

src/Apps/W1/Subscription Billing/App/Import/Tables/ImportedSubscriptionLine.Table.al

@@ -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;
 }

src/Apps/W1/Subscription Billing/App/Sales Service Commitments/Codeunits/SalesSubscriptionLineMgmt.Codeunit.al

@@ -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

src/Apps/W1/Subscription Billing/App/Service Commitments/Tables/SubscriptionPackageLine.Table.al

@@ -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;
 }

src/Apps/W1/Subscription Billing/App/Service Objects/Tables/SubscriptionHeader.Table.al

@@ -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

src/Apps/W1/Subscription Billing/Test/Base/ContractTestLibrary.Codeunit.al

@@ -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;
@@ -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);
 

src/Apps/W1/Subscription Billing/Test/Billing/AutomatedBillingTest.Codeunit.al

@@ -77,6 +77,7 @@ codeunit 148455 "Automated Billing Test"
     var
         CustomerSubscriptionContract: Record "Customer Subscription Contract";
         SubscriptionHeader: Record "Subscription Header";
+        SubscriptionLine: Record "Subscription Line";
         BillingTemplate: Record "Billing Template";
         BillingLine: Record "Billing Line";
         SalesHeader: Record "Sales Header";
@@ -87,8 +88,16 @@ codeunit 148455 "Automated Billing Test"
         // [GIVEN] A Billing Template with automation settings
         CreateBillingTemplateWithAutomation(BillingTemplate);
 
-        // [WHEN] Bill the contracts automatically
+        // [GIVEN] A contract with subscription lines starting today
         ContractTestLibrary.CreateCustomerContractAndCreateContractLinesForItems(CustomerSubscriptionContract, SubscriptionHeader, '');
+        SubscriptionLine.SetRange("Subscription Header No.", SubscriptionHeader."No.");
+        SubscriptionLine.FindSet();
+        repeat
+            SubscriptionLine.Validate("Subscription Line Start Date", Today());
+            SubscriptionLine.Modify(true);
+        until SubscriptionLine.Next() = 0;
+
+        // [WHEN] Bill the contracts automatically
         BillingTemplate.BillContractsAutomatically();
 
         // [THEN] Verify that Sales Header is created for the billed contract
@@ -118,8 +127,15 @@ codeunit 148455 "Automated Billing Test"
         CreateBillingTemplateWithAutomation(BillingTemplate);
         ContractTestLibrary.CreateCustomerContractAndCreateContractLinesForItems(CustomerSubscriptionContract, SubscriptionHeader, '');
 
-        // [GIVEN]Remove Item UOM to cause error during billing
+        // [GIVEN] Subscription lines starting today
         SubscriptionLine.SetRange("Subscription Header No.", SubscriptionHeader."No.");
+        SubscriptionLine.FindSet();
+        repeat
+            SubscriptionLine.Validate("Subscription Line Start Date", Today());
+            SubscriptionLine.Modify(true);
+        until SubscriptionLine.Next() = 0;
+
+        // [GIVEN] Remove Item UOM to cause error during billing
         SubscriptionLine.FindLast();
         ItemUnitOfMeasure.Get(SubscriptionLine."Invoicing Item No.", SubscriptionHeader."Unit of Measure");
         ItemUnitOfMeasure.Delete();

src/Apps/W1/Subscription Billing/Test/Billing/RecurringBillingDocsTest.Codeunit.al

@@ -1294,7 +1294,7 @@ codeunit 139687 "Recurring Billing Docs Test"
     end;
 
     [Test]
-    [HandlerFunctions('MessageHandler,GetVendorContractLinesProducesCorrectAmountsDuringSelectionPageHandler,ExchangeRateSelectionModalPageHandler')]
+    [HandlerFunctions('GetVendorContractLinesProducesCorrectAmountsDuringSelectionPageHandler')]
     procedure GetVendorContractLinesProducesCorrectAmountsDuringSelection()
     var
         Item: Record Item;
@@ -1306,7 +1306,7 @@ codeunit 139687 "Recurring Billing Docs Test"
         // [GIVEN] Setup Subscription with Subscription Line and assign it to Vendor Subscription Contract
         // [GIVEN] Create Purchase Invoice with Purchase Invoice Line
         ContractTestLibrary.DeleteAllContractRecords();
-        ContractTestLibrary.CreateVendor(Vendor);
+        ContractTestLibrary.CreateVendorInLCY(Vendor);
         ContractTestLibrary.CreateVendorContractAndCreateContractLinesForItems(VendorContract, ServiceObject, Vendor."No.");
         GetVendorContractServiceCommitment(VendorContract."No.");
         ServiceCommitment."Billing Rhythm" := ServiceCommitment."Billing Base Period";

src/Apps/W1/Subscription Billing/Test/Billing/RecurringBillingTest.Codeunit.al

@@ -601,7 +601,6 @@ codeunit 139688 "Recurring Billing Test"
     end;
 
     [Test]
-    [HandlerFunctions('ExchangeRateSelectionModalPageHandler,MessageHandler')]
     procedure CheckBillingLineUpdateRequiredOnModifyCustomerContractLine()
     var
         DiscountAmount: Decimal;
@@ -611,7 +610,7 @@ codeunit 139688 "Recurring Billing Test"
     begin
         Initialize();
 
-        ContractTestLibrary.CreateCustomer(Customer);
+        ContractTestLibrary.CreateCustomerInLCY(Customer);
         ContractTestLibrary.CreateCustomerContractAndCreateContractLinesForItems(CustomerContract, ServiceObject, Customer."No.");
         ContractTestLibrary.CreateBillingProposal(BillingTemplate, Enum::"Service Partner"::Customer);
         BillingLine.Reset();
@@ -656,7 +655,6 @@ codeunit 139688 "Recurring Billing Test"
     end;
 
     [Test]
-    [HandlerFunctions('ExchangeRateSelectionModalPageHandler,MessageHandler')]
     procedure CheckBillingLineUpdateRequiredOnModifyVendorContractLine()
     var
         DiscountAmount: Decimal;
@@ -666,7 +664,7 @@ codeunit 139688 "Recurring Billing Test"
     begin
         Initialize();
 
-        ContractTestLibrary.CreateVendor(Vendor);
+        ContractTestLibrary.CreateVendorInLCY(Vendor);
         ContractTestLibrary.CreateVendorContractAndCreateContractLinesForItems(VendorContract, ServiceObject, Vendor."No.");
         ContractTestLibrary.CreateBillingProposal(BillingTemplate, Enum::"Service Partner"::Vendor);
         BillingLine.Reset();

src/Apps/W1/Subscription Billing/Test/Contract Renewal/ContractRenewalTest.Codeunit.al

@@ -674,6 +674,8 @@ codeunit 139692 "Contract Renewal Test"
         Initialize();
         // [GIVEN] We Create all the needed data
         CreateBaseData();
+        CustomerContract.Validate("Currency Code", '');
+        CustomerContract.Modify(false);
         BaseCalculationPercentage := LibraryRandom.RandDecInDecimalRange(80, 100, 2);
         CalculationBaseAmount := LibraryRandom.RandDecInDecimalRange(80, 100, 2);
         // [WHEN] We run the action Contract Renewal Quote and change the values on Subscription, values are tested in a ContractRenewalSelectionModalPageHandler