diff --git a/src/Apps/W1/Subcontracting/App/src/Manufacturing/SubcWorkCenterCard.PageExt.al b/src/Apps/W1/Subcontracting/App/src/Manufacturing/SubcWorkCenterCard.PageExt.al index 207736251a5..c0563c1d568 100644 --- a/src/Apps/W1/Subcontracting/App/src/Manufacturing/SubcWorkCenterCard.PageExt.al +++ b/src/Apps/W1/Subcontracting/App/src/Manufacturing/SubcWorkCenterCard.PageExt.al @@ -5,6 +5,7 @@ namespace Microsoft.Manufacturing.Subcontracting; using Microsoft.Manufacturing.WorkCenter; +using Microsoft.Purchases.Document; pageextension 99001506 "Subc. Work Center Card" extends "Work Center Card" { @@ -49,12 +50,24 @@ pageextension 99001506 "Subc. Work Center Card" extends "Work Center Card" RunPageLink = "Work Center No." = field("No."); ToolTip = 'View the Subcontracting WIP Entries that track work-in-progress quantities at this work center''s subcontracting location.'; } + action("Subcontractor Dispatch List") + { + ApplicationArea = Subcontracting; + Caption = 'Subcontractor - Dispatch List'; + Enabled = IsSubcontractingWorkCenter; + Image = Print; + ToolTip = 'Print the dispatching list for the subcontractor assigned to this work center.'; + + trigger OnAction() + var + PurchaseHeader: Record "Purchase Header"; + begin + PurchaseHeader.SetRange("Buy-from Vendor No.", Rec."Subcontractor No."); + Report.Run(Report::"Subc. Dispatching List", true, false, PurchaseHeader); + end; + } } } - modify("Subcontractor - Dispatch List") - { - Enabled = IsSubcontractingWorkCenter; - } } trigger OnOpenPage() @@ -77,6 +90,7 @@ pageextension 99001506 "Subc. Work Center Card" extends "Work Center Card" end; var + SubcNotificationMgmt: Codeunit "Subc. Notification Mgmt."; #if not CLEAN29 #pragma warning disable AL0432 SubcFeatureFlagHandler: Codeunit "Subc. Feature Flag Handler"; @@ -84,5 +98,4 @@ pageextension 99001506 "Subc. Work Center Card" extends "Work Center Card" SubcontractingEnabled: Boolean; #endif IsSubcontractingWorkCenter: Boolean; - SubcNotificationMgmt: Codeunit "Subc. Notification Mgmt."; } diff --git a/src/Apps/W1/Subcontracting/Test/Tests/SubcSubcontractingUITest.Codeunit.al b/src/Apps/W1/Subcontracting/Test/Tests/SubcSubcontractingUITest.Codeunit.al index 71214ce9867..49163dd0407 100644 --- a/src/Apps/W1/Subcontracting/Test/Tests/SubcSubcontractingUITest.Codeunit.al +++ b/src/Apps/W1/Subcontracting/Test/Tests/SubcSubcontractingUITest.Codeunit.al @@ -453,7 +453,7 @@ codeunit 139990 "Subc. Subcontracting UI Test" WorkCenterCard.GotoRecord(WorkCenter); // [THEN] Subcontractor - Dispatch List action is not enabled - Assert.IsFalse(WorkCenterCard."Subcontractor - Dispatch List".Enabled(), SubcontractingActionsEnabledErr); + Assert.IsFalse(WorkCenterCard."Subcontractor Dispatch List".Enabled(), SubcontractingActionsEnabledErr); WorkCenterCard.Close(); end; @@ -476,7 +476,7 @@ codeunit 139990 "Subc. Subcontracting UI Test" WorkCenterCard.GotoRecord(WorkCenter); // [THEN] Subcontractor - Dispatch List action is enabled - Assert.IsTrue(WorkCenterCard."Subcontractor - Dispatch List".Enabled(), SubcontractingActionsNotEnabledErr); + Assert.IsTrue(WorkCenterCard."Subcontractor Dispatch List".Enabled(), SubcontractingActionsNotEnabledErr); WorkCenterCard.Close(); end; diff --git a/src/Layers/IT/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al b/src/Layers/IT/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al index d22cc5d91fa..54960ca4056 100644 --- a/src/Layers/IT/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al +++ b/src/Layers/IT/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al @@ -11,7 +11,9 @@ using Microsoft.Manufacturing.Comment; #if not CLEAN27 using Microsoft.Manufacturing.Document; #endif +#if not CLEAN29 using Microsoft.Manufacturing.Reports; +#endif page 99000754 "Work Center Card" { @@ -357,18 +359,23 @@ page 99000754 "Work Center Card" } #endif } +#if not CLEAN29 area(reporting) { action("Subcontractor - Dispatch List") { ApplicationArea = Manufacturing; - Caption = 'Subcontractor - Dispatch List'; + Caption = 'Subcontractor - Dispatch List (Obsolete)'; Image = "Report"; //The property 'PromotedCategory' can only be set if the property 'Promoted' is set to 'true' //PromotedCategory = "Report"; RunObject = Report "Subcontractor - Dispatch List"; + ObsoleteState = Pending; + ObsoleteReason = 'This report is obsolete. Use the "Subcontractor - Dispatch List (New)" report instead from Subcontracting app.'; + ObsoleteTag = '29.0'; } } +#endif area(Promoted) { group(Category_Process) diff --git a/src/Layers/W1/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al b/src/Layers/W1/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al index 20af8ae8e70..e98f29a0caf 100644 --- a/src/Layers/W1/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al +++ b/src/Layers/W1/BaseApp/Manufacturing/WorkCenter/WorkCenterCard.Page.al @@ -8,7 +8,9 @@ using Microsoft.Finance.Dimension; using Microsoft.Inventory.Location; using Microsoft.Manufacturing.Capacity; using Microsoft.Manufacturing.Comment; +#if not CLEAN29 using Microsoft.Manufacturing.Reports; +#endif page 99000754 "Work Center Card" { @@ -333,18 +335,23 @@ page 99000754 "Work Center Card" end; } } +#if not CLEAN29 area(reporting) { action("Subcontractor - Dispatch List") { ApplicationArea = Manufacturing; - Caption = 'Subcontractor - Dispatch List'; + Caption = 'Subcontractor - Dispatch List (Obsolete)'; Image = "Report"; //The property 'PromotedCategory' can only be set if the property 'Promoted' is set to 'true' //PromotedCategory = "Report"; RunObject = Report "Subcontractor - Dispatch List"; + ObsoleteState = Pending; + ObsoleteReason = 'This report is obsolete. Use the "Subcontractor - Dispatch List (New)" report instead from Subcontracting app.'; + ObsoleteTag = '29.0'; } } +#endif area(Promoted) { group(Category_Process)