From 2e1ed6b7ade85c58f15562e6ba06503b7d849c7e Mon Sep 17 00:00:00 2001
From: Darrick <darjoo@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:16:00 +0100
Subject: [PATCH] Merge daaa832916b8c936c81d5b74cc68796dab29ebc4 into
 e683b8cd6780e8ae9acbddf1f0a12f0482bc1a7d

---
 .../App/Email/src/EmailInstaller.Codeunit.al  | 41 +------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/System Application/App/Email/src/EmailInstaller.Codeunit.al b/src/System Application/App/Email/src/EmailInstaller.Codeunit.al
index 692a12320f..567b5c1af0 100644
--- a/src/System Application/App/Email/src/EmailInstaller.Codeunit.al	
+++ b/src/System Application/App/Email/src/EmailInstaller.Codeunit.al	
@@ -31,7 +31,6 @@ codeunit 1596 "Email Installer"
     procedure AddRetentionPolicyAllowedTables()
     begin
         AddRetentionPolicyAllowedTables(false);
-        CreateRetentionPolicySetup(false);
     end;
 
     procedure AddRetentionPolicyAllowedTables(ForceUpdate: Boolean)
@@ -47,59 +46,21 @@ codeunit 1596 "Email Installer"
 
         RetenPolAllowedTables.AddAllowedTable(Database::"Email Outbox", Field.FieldNo(SystemCreatedAt), 7);
         RetenPolAllowedTables.AddAllowedTable(Database::"Sent Email", Field.FieldNo(SystemCreatedAt), 7);
+        RetenPolAllowedTables.AddAllowedTable(Database::"Email Inbox", Field.FieldNo(SystemCreatedAt), 2);
 
         if IsInitialSetup then
             UpgradeTag.SetUpgradeTag(GetEmailTablesAddedToAllowedListUpgradeTag());
     end;
 
-    procedure CreateRetentionPolicySetup(ForceUpdate: Boolean)
-    var
-        Field: Record Field;
-        RetentionPolicySetup: Record "Retention Policy Setup";
-        RetenPolAllowedTables: Codeunit "Reten. Pol. Allowed Tables";
-        RetentionPolicySetupCU: Codeunit "Retention Policy Setup";
-        UpgradeTag: Codeunit "Upgrade Tag";
-        DateFormula: DateFormula;
-        IsInitialSetup: Boolean;
-    begin
-        IsInitialSetup := not UpgradeTag.HasUpgradeTag(GetEmailInboxPolicyAddedToAllowedListUpgradeTag());
-        if not (IsInitialSetup or ForceUpdate) then
-            exit;
-
-        if not RetenPolAllowedTables.AddAllowedTable(Database::"Email Inbox", Field.FieldNo(SystemCreatedAt), 2) then
-            exit;
-
-        RetentionPolicySetup.SetRange("Table Id", Database::"Email Inbox");
-        if not RetentionPolicySetup.IsEmpty() then
-            exit;
-
-        Evaluate(DateFormula, '<-2D>');
-
-        RetentionPolicySetup.Validate("Table Id", Database::"Email Inbox");
-        RetentionPolicySetup.Validate("Apply to all records", true);
-        RetentionPolicySetup.Validate("Retention Period", RetentionPolicySetupCU.FindOrCreateRetentionPeriod('2 DAYS', "Retention Period Enum"::"Custom", DateFormula));
-        RetentionPolicySetup.Validate(Enabled, true);
-        RetentionPolicySetup.Insert(true);
-
-        if IsInitialSetup then
-            UpgradeTag.SetUpgradeTag(GetEmailInboxPolicyAddedToAllowedListUpgradeTag());
-    end;
-
     local procedure GetEmailTablesAddedToAllowedListUpgradeTag(): Code[250]
     begin
         exit('MS-373161-EmailLogEntryAdded-20201005');
     end;
 
-    local procedure GetEmailInboxPolicyAddedToAllowedListUpgradeTag(): Code[250]
-    begin
-        exit('MS-539754-EmailInboxPolicyAdded-20240827');
-    end;
-
     [EventSubscriber(ObjectType::Codeunit, Codeunit::"Reten. Pol. Allowed Tables", OnRefreshAllowedTables, '', false, false)]
     local procedure AddAllowedTablesOnRefreshAllowedTables()
     begin
         AddRetentionPolicyAllowedTables(true);
-        CreateRetentionPolicySetup(true);
     end;
 
     [EventSubscriber(ObjectType::Codeunit, Codeunit::"System Initialization", OnAfterLogin, '', false, false)]