Update from DYCE Version 2025.8.0.0

Author: miljance

src/Apps/W1/Subscription Billing/App/APIs/Pages/SalesServiceCommitmentsAPI.Page.al

@@ -126,6 +126,12 @@ page 8019 "Sales Service Commitments API"
                 field(process; Rec.Process)
                 {
                 }
+                field(systemCreatedAt; Rec.SystemCreatedAt)
+                {
+                }
+                field(lastModifiedDateTime; Rec.SystemModifiedAt)
+                {
+                }
             }
         }
     }

src/Apps/W1/Subscription Billing/App/APIs/Pages/ServiceCommitmentsAPI.Page.al

@@ -178,6 +178,12 @@ page 8018 "Service Commitments API"
                 {
                 }
             }
+            field(systemCreatedAt; Rec.SystemCreatedAt)
+            {
+            }
+            field(lastModifiedDateTime; Rec.SystemModifiedAt)
+            {
+            }
         }
     }
 }

src/Apps/W1/Subscription Billing/App/APIs/Pages/ServiceObjectAPI.Page.al

@@ -187,6 +187,12 @@ page 8020 "Service Object API"
                 {
                 }
             }
+            field(systemCreatedAt; Rec.SystemCreatedAt)
+            {
+            }
+            field(lastModifiedDateTime; Rec.SystemModifiedAt)
+            {
+            }
         }
     }
 }

src/Apps/W1/Subscription Billing/App/Base/Codeunits/SubBillingInstallation.Codeunit.al

@@ -17,7 +17,7 @@ codeunit 8051 "Sub. Billing Installation"
         UpgradeTag.SetAllUpgradeTags();
     end;
 
-    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Company-Initialize", 'OnCompanyInitialize', '', false, false)]
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Company-Initialize", OnCompanyInitialize, '', false, false)]
     local procedure OnCompanyInitialize()
     var
         ServiceContractSetup: Record "Subscription Contract Setup";

src/Apps/W1/Subscription Billing/App/Base/Codeunits/UpgradeSubscriptionBilling.Codeunit.al

@@ -4,6 +4,7 @@ using System.Upgrade;
 #if not CLEANSCHEMA29
 using Microsoft.Finance.GeneralLedger.Setup;
 #endif
+using Microsoft.Sales.Document;
 
 codeunit 8032 "Upgrade Subscription Billing"
 {
@@ -25,6 +26,8 @@ codeunit 8032 "Upgrade Subscription Billing"
         MoveCustContrDimensionToServiceContractSetup();
 #endif
         UpdateCreateContractDeferralsFlag();
+        DeleteSalesSubscriptionLinesConnectedToDeletedQuote();
+        RemoveDocumentNoFromBillingLines();
     end;
 
 #if not CLEANSCHEMA29
@@ -257,8 +260,68 @@ codeunit 8032 "Upgrade Subscription Billing"
         exit('MS-XXXXXX-UpdateCreateContractDeferralsFlag-20250321');
     end;
 
+    local procedure DeleteSalesSubscriptionLinesConnectedToDeletedQuote()
+    var
+        SalesSubscriptionLine: Record "Sales Subscription Line";
+        SalesHeader: Record "Sales Header";
+        UpgradeTag: Codeunit "Upgrade Tag";
+    begin
+        if UpgradeTag.HasUpgradeTag(DeleteSalesSubscriptionLinesConnectedToDeletedQuoteTag()) then
+            exit;
+
+        SalesSubscriptionLine.SetRange("Document Type", "Sales Document Type"::Quote);
+        if SalesSubscriptionLine.FindSet() then
+            repeat
+                if not SalesHeader.Get(SalesHeader."Document Type"::Quote, SalesSubscriptionLine."Document No.") then
+                    SalesSubscriptionLine.Delete(false);
+            until SalesSubscriptionLine.Next() = 0;
+
+        UpgradeTag.SetUpgradeTag(DeleteSalesSubscriptionLinesConnectedToDeletedQuoteTag());
+    end;
+
+    local procedure DeleteSalesSubscriptionLinesConnectedToDeletedQuoteTag(): Text[250]
+    begin
+        exit('MS-XXXXXX-DeleteSalesSubscriptionLinesConnectedToDeletedQuoteTag-20250819');
+    end;
+
+    local procedure RemoveDocumentNoFromBillingLines()
+    var
+        BillingLine: Record "Billing Line";
+        SalesHeader: Record "Sales Header";
+        UpgradeTag: Codeunit "Upgrade Tag";
+    begin
+        if UpgradeTag.HasUpgradeTag(RemoveDocumentNoFromBillingLinesTag()) then
+            exit;
+
+        BillingLine.SetRange(Partner, BillingLine.Partner::Customer);
+        BillingLine.SetFilter("Document No.", '<>%1', '');
+        if BillingLine.FindSet() then
+            repeat
+                case BillingLine."Document Type" of
+                    BillingLine."Document Type"::Invoice:
+                        if not SalesHeader.Get(SalesHeader."Document Type"::Invoice, BillingLine."Document No.") then begin
+                            BillingLine."Document Type" := BillingLine."Document Type"::None;
+                            BillingLine."Document No." := '';
+                            BillingLine.Modify(false);
+                        end;
+                    BillingLine."Document Type"::"Credit Memo":
+                        if not SalesHeader.Get(SalesHeader."Document Type"::"Credit Memo", BillingLine."Document No.") then begin
+                            BillingLine."Document Type" := BillingLine."Document Type"::None;
+                            BillingLine."Document No." := '';
+                            BillingLine.Modify(false);
+                        end;
+                end;
+            until BillingLine.Next() = 0;
+
+        UpgradeTag.SetUpgradeTag(RemoveDocumentNoFromBillingLinesTag());
+    end;
+
+    local procedure RemoveDocumentNoFromBillingLinesTag(): Text[250]
+    begin
+        exit('MS-XXXXXX-RemoveDocumentNoFromBillingLines-20250819');
+    end;
 
-    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", 'OnGetPerCompanyUpgradeTags', '', false, false)]
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", OnGetPerCompanyUpgradeTags, '', false, false)]
     local procedure RegisterPerCompanyTags(var PerCompanyUpgradeTags: List of [Code[250]])
     begin
 #if not CLEANSCHEMA29

src/Apps/W1/Subscription Billing/App/Billing/Codeunits/BillingCorrection.Codeunit.al

@@ -3,6 +3,8 @@ namespace Microsoft.SubscriptionBilling;
 using Microsoft.Utilities;
 using Microsoft.Sales.Document;
 using Microsoft.Purchases.Document;
+using Microsoft.Purchases.History;
+using Microsoft.Sales.History;
 
 codeunit 8061 "Billing Correction"
 {
@@ -13,56 +15,6 @@ codeunit 8061 "Billing Correction"
         RelatedDocumentLineExistErr: Label 'The %1 %2 already exists for the Subscription Line. Please post or delete this %1 first.', Comment = '%1=Document Type, %2=Document No.';
         CopyingErr: Label 'Copying documents with a link to a contract is not allowed. To create contract invoices, please use the "Recurring Billing" page. For cancelling a contract invoice, please use the "Create Corrective Credit Memo" function in the posted invoice.';
 
-    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnBeforeUpdateSalesLine, '', false, false)]
-    local procedure TrasnferContractFieldsBeforeUpdateSalesLine(var ToSalesLine: Record "Sales Line"; var FromSalesLine: Record "Sales Line"; FromSalesDocType: Option; var FromSalesHeader: Record "Sales Header")
-    begin
-        if not FromSalesHeader."Recurring Billing" then
-            exit;
-        if FromSalesDocType <> Enum::"Sales Document Type From"::"Posted Invoice".AsInteger() then
-            Error(CopyingErr);
-        if ToSalesLine."Document Type" <> Enum::"Sales Document Type"::"Credit Memo" then
-            Error(CopyingErr);
-        ToSalesLine."Recurring Billing from" := FromSalesLine."Recurring Billing from";
-        ToSalesLine."Recurring Billing to" := FromSalesLine."Recurring Billing to";
-        ToSalesLine."Discount" := FromSalesLine."Discount";
-    end;
-
-    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnAfterInsertToSalesLine, '', false, false)]
-    local procedure CreateBillingLineFromBillingLineArchiveAfterInsertToSalesLine(var ToSalesLine: Record "Sales Line"; FromSalesLine: Record "Sales Line"; DocLineNo: Integer; FromSalesHeader: Record "Sales Header")
-    var
-        ServiceCommitment: Record "Subscription Line";
-        BillingLine: Record "Billing Line";
-        BillingLineArchive: Record "Billing Line Archive";
-        IsHandled: Boolean;
-    begin
-        OnBeforeCreateBillingLineFromBillingLineArchiveAfterInsertToSalesLine(ToSalesLine, IsHandled);
-        if IsHandled then
-            exit;
-        FilterBillingLineArchiveOnSalesLineOrPurchLine(ToSalesLine, BillingLineArchive, FromSalesHeader."No.", DocLineNo);
-        if BillingLineArchive.IsEmpty() then
-            exit;
-
-        ToSalesLine.TestField("Recurring Billing from");
-        ToSalesLine.TestField("Recurring Billing to");
-
-        if BillingLineArchive.FindFirst() then begin
-            ServiceCommitment.SetRange("Subscription Contract No.", BillingLineArchive."Subscription Contract No.");
-            ServiceCommitment.SetRange("Subscription Contract Line No.", BillingLineArchive."Subscription Contract Line No.");
-            ServiceCommitment.FindFirst();
-            if ServiceCommitment."Next Billing Date" - 1 > ToSalesLine."Recurring Billing to" then
-                Error(NewerInvoiceExistErr, ServiceCommitment."Next Billing Date");
-        end;
-
-        BillingLine.SetRange("Document Type", Enum::"Rec. Billing Document Type"::Invoice, Enum::"Rec. Billing Document Type"::"Credit Memo");
-        BillingLine.SetFilter("Document No.", '<>%1', ToSalesLine."Document No.");
-        BillingLine.SetRange("Subscription Contract No.", BillingLineArchive."Subscription Contract No.");
-        BillingLine.SetRange("Subscription Contract Line No.", BillingLineArchive."Subscription Contract Line No.");
-
-        if BillingLine.FindFirst() then
-            Error(RelatedDocumentLineExistErr, BillingLine."Document Type", BillingLine."Document No.");
-        CreateBillingLineFromBillingLineArchive(ToSalesLine, ServiceCommitment, FromSalesHeader."No.", DocLineNo);
-    end;
-
     local procedure CreateBillingLineFromBillingLineArchive(RecVariant: Variant; var ServiceCommitment: Record "Subscription Line"; FromDocumentNo: Code[20]; DocLineNo: Integer)
     var
         BillingLine: Record "Billing Line";
@@ -176,17 +128,11 @@ codeunit 8061 "Billing Correction"
         BillingLineArchive.SetRange("Billing to", RRef.Field(8053).Value, RRef.Field(8054).Value);
     end;
 
-    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnBeforeUpdatePurchLine, '', false, false)]
-    local procedure TrasnferContractFieldsBeforeUpdatePurchaseLine(var ToPurchLine: Record "Purchase Line"; var FromPurchLine: Record "Purchase Line"; var FromPurchHeader: Record "Purchase Header"; FromPurchDocType: Option)
+    local procedure GetAndCheckServiceCommitmentIfNewerInvoiceExists(var ServiceCommitment: Record "Subscription Line"; SubscriptionLineEntryNo: Integer; RecurringBillingToDate: Date)
     begin
-        if not FromPurchHeader."Recurring Billing" then
-            exit;
-        if FromPurchDocType <> Enum::"Purchase Document Type From"::"Posted Invoice".AsInteger() then
-            Error(CopyingErr);
-        if ToPurchLine."Document Type" <> Enum::"Purchase Document Type"::"Credit Memo" then
-            Error(CopyingErr);
-        ToPurchLine."Recurring Billing from" := FromPurchLine."Recurring Billing from";
-        ToPurchLine."Recurring Billing to" := FromPurchLine."Recurring Billing to";
+        ServiceCommitment.Get(SubscriptionLineEntryNo);
+        if ServiceCommitment."Next Billing Date" - 1 > RecurringBillingToDate then
+            Error(NewerInvoiceExistErr, ServiceCommitment."Next Billing Date");
     end;
 
     [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnAfterInsertToPurchLine, '', false, false)]
@@ -201,13 +147,11 @@ codeunit 8061 "Billing Correction"
             exit;
         ToPurchLine.TestField("Recurring Billing from");
         ToPurchLine.TestField("Recurring Billing to");
-        if BillingLineArchive.FindFirst() then begin
-            ServiceCommitment.SetRange("Subscription Contract No.", BillingLineArchive."Subscription Contract No.");
-            ServiceCommitment.SetRange("Subscription Contract Line No.", BillingLineArchive."Subscription Contract Line No.");
-            ServiceCommitment.FindFirst();
-            if ServiceCommitment."Next Billing Date" - 1 > ToPurchLine."Recurring Billing to" then
-                Error(NewerInvoiceExistErr, ServiceCommitment."Next Billing Date");
-        end;
+        if BillingLineArchive.FindFirst() then
+            GetAndCheckServiceCommitmentIfNewerInvoiceExists(ServiceCommitment, BillingLineArchive."Subscription Line Entry No.", ToPurchLine."Recurring Billing to");
+
+        if (BillingLineArchive."Subscription Contract No." = '') or (BillingLineArchive."Subscription Contract Line No." = 0) then
+            exit;
 
         BillingLine.SetRange("Document Type", Enum::"Rec. Billing Document Type"::Invoice, Enum::"Rec. Billing Document Type"::"Credit Memo");
         BillingLine.SetFilter("Document No.", '<>%1', ToPurchLine."Document No.");
@@ -218,6 +162,99 @@ codeunit 8061 "Billing Correction"
         CreateBillingLineFromBillingLineArchive(ToPurchLine, ServiceCommitment, FromPurchaseHeader."No.", DocLineNo);
     end;
 
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnAfterInsertToSalesLine, '', false, false)]
+    local procedure CreateBillingLineFromBillingLineArchiveAfterInsertToSalesLine(var ToSalesLine: Record "Sales Line"; DocLineNo: Integer; FromSalesHeader: Record "Sales Header")
+    var
+        SubscriptionLine: Record "Subscription Line";
+        BillingLine: Record "Billing Line";
+        BillingLineArchive: Record "Billing Line Archive";
+        IsHandled: Boolean;
+    begin
+        OnBeforeCreateBillingLineFromBillingLineArchiveAfterInsertToSalesLine(ToSalesLine, IsHandled);
+        if IsHandled then
+            exit;
+        FilterBillingLineArchiveOnSalesLineOrPurchLine(ToSalesLine, BillingLineArchive, FromSalesHeader."No.", DocLineNo);
+        if BillingLineArchive.IsEmpty() then
+            exit;
+
+        ToSalesLine.TestField("Recurring Billing from");
+        ToSalesLine.TestField("Recurring Billing to");
+
+        if BillingLineArchive.FindFirst() then
+            GetAndCheckServiceCommitmentIfNewerInvoiceExists(SubscriptionLine, BillingLineArchive."Subscription Line Entry No.", ToSalesLine."Recurring Billing to");
+
+        if (BillingLineArchive."Subscription Contract No." = '') or (BillingLineArchive."Subscription Contract Line No." = 0) then
+            exit;
+
+        BillingLine.SetRange("Document Type", Enum::"Rec. Billing Document Type"::Invoice, Enum::"Rec. Billing Document Type"::"Credit Memo");
+        BillingLine.SetFilter("Document No.", '<>%1', ToSalesLine."Document No.");
+        BillingLine.SetRange("Subscription Contract No.", BillingLineArchive."Subscription Contract No.");
+        BillingLine.SetRange("Subscription Contract Line No.", BillingLineArchive."Subscription Contract Line No.");
+
+        if BillingLine.FindFirst() then
+            Error(RelatedDocumentLineExistErr, BillingLine."Document Type", BillingLine."Document No.");
+        CreateBillingLineFromBillingLineArchive(ToSalesLine, SubscriptionLine, FromSalesHeader."No.", DocLineNo);
+    end;
+
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnCopyPurchInvLinesToDocOnAfterTransferFields, '', false, false)]
+    local procedure FindSubscriptionLineFromBillingLineArchiveForPurchase(var FromPurchaseLine: Record "Purchase Line"; var FromPurchInvLine: Record "Purch. Inv. Line")
+    var
+        BillingLineArchive: Record "Billing Line Archive";
+        SubscriptionLine: Record "Subscription Line";
+    begin
+        if FromPurchInvLine."Subscription Contract No." = '' then
+            exit;
+        if FromPurchInvLine."Subscription Contract Line No." = 0 then
+            exit;
+        BillingLineArchive.FilterBillingLineArchiveOnDocument("Rec. Billing Document Type"::Invoice, FromPurchInvLine."Document No.");
+        BillingLineArchive.FilterBillingLineArchiveOnContractLine("Service Partner"::Vendor, FromPurchInvLine."Subscription Contract No.", FromPurchInvLine."Subscription Contract Line No.");
+        if not BillingLineArchive.FindFirst() then
+            exit;
+        if not SubscriptionLine.Get(BillingLineArchive."Subscription Line Entry No.") then
+            exit;
+    end;
+
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnBeforeCopySalesInvLinesToBuffer, '', false, false)]
+    local procedure FindSubscriptionLineFromBillingLineArchiveForSales(var FromSalesLine: Record "Sales Line"; var FromSalesInvLine: Record "Sales Invoice Line")
+    var
+        BillingLineArchive: Record "Billing Line Archive";
+        SubscriptionLine: Record "Subscription Line";
+    begin
+        if FromSalesInvLine."Subscription Contract No." = '' then
+            exit;
+        if FromSalesInvLine."Subscription Contract Line No." = 0 then
+            exit;
+        BillingLineArchive.FilterBillingLineArchiveOnDocument("Rec. Billing Document Type"::Invoice, FromSalesInvLine."Document No.");
+        BillingLineArchive.FilterBillingLineArchiveOnContractLine("Service Partner"::Customer, FromSalesInvLine."Subscription Contract No.", FromSalesInvLine."Subscription Contract Line No.");
+        if not BillingLineArchive.FindFirst() then
+            exit;
+        if not SubscriptionLine.Get(BillingLineArchive."Subscription Line Entry No.") then
+            exit;
+    end;
+
+
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnBeforeUpdatePurchLine, '', false, false)]
+    local procedure TransferContractFieldsBeforeUpdatePurchaseLine(var ToPurchLine: Record "Purchase Line"; var FromPurchHeader: Record "Purchase Header"; FromPurchDocType: Option)
+    begin
+        if not FromPurchHeader."Recurring Billing" then
+            exit;
+        if FromPurchDocType <> Enum::"Purchase Document Type From"::"Posted Invoice".AsInteger() then
+            Error(CopyingErr);
+        if ToPurchLine."Document Type" <> Enum::"Purchase Document Type"::"Credit Memo" then
+            Error(CopyingErr);
+    end;
+
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"Copy Document Mgt.", OnBeforeUpdateSalesLine, '', false, false)]
+    local procedure TransferContractFieldsBeforeUpdateSalesLine(var ToSalesLine: Record "Sales Line"; FromSalesDocType: Option; var FromSalesHeader: Record "Sales Header")
+    begin
+        if not FromSalesHeader."Recurring Billing" then
+            exit;
+        if FromSalesDocType <> Enum::"Sales Document Type From"::"Posted Invoice".AsInteger() then
+            Error(CopyingErr);
+        if ToSalesLine."Document Type" <> Enum::"Sales Document Type"::"Credit Memo" then
+            Error(CopyingErr);
+    end;
+
     [IntegrationEvent(false, false)]
     local procedure OnAfterCreateBillingLineFromBillingLineArchive(var RRef: RecordRef; BillingLineArchive: Record "Billing Line Archive")
     begin

src/Apps/W1/Subscription Billing/App/Billing/Codeunits/CreateBillingDocuments.Codeunit.al

@@ -14,12 +14,20 @@ codeunit 8060 "Create Billing Documents"
     trigger OnRun()
     var
         BillingLine: Record "Billing Line";
+        PartnerFilter: Text;
+        ShowNotification: Boolean;
     begin
         BillingLine.Copy(Rec);
+        PartnerFilter := BillingLine.GetFilter(Partner);
+        ShowNotification := PartnerFilter <> BillingLine.GetFilters();
+        BillingLine.Reset();
+        BillingLine.SetFilter(Partner, PartnerFilter);
         BillingLine.SetRange("Document Type", Enum::"Rec. Billing Document Type"::None);
         if CreateContractInvoice then
             BillingLine.SetRange("Billing Template Code", '');
         CreateBillingDocuments(BillingLine);
+        if ShowNotification and (not CreateContractInvoice) then
+            ShowFiltersIgnoredNotification();
     end;
 
     local procedure CreateBillingDocuments(var BillingLine: Record "Billing Line")
@@ -1024,6 +1032,17 @@ codeunit 8060 "Create Billing Documents"
         OnAfterIsNewHeaderNeededPerContract(CreateNewHeader, TempBillingLine, PreviousSubContractNo);
     end;
 
+    local procedure ShowFiltersIgnoredNotification()
+    var
+        FiltersIgnoredMsg: Label 'You have set filters on the Recurring Billing page. The filters were ignored to maintain data consistency.';
+        FiltersIgnoredNotification: Notification;
+    begin
+        FiltersIgnoredNotification.Message(FiltersIgnoredMsg);
+        FiltersIgnoredNotification.Scope := NotificationScope::LocalScope;
+        FiltersIgnoredNotification.Send();
+    end;
+
+
     internal procedure ErrorIfItemUnitOfMeasureCodeDoesNotExist(ItemNo: Code[20]; ServiceObject: Record "Subscription Header")
     var
         ItemUnitOfMeasure: Record "Item Unit of Measure";