Skip to content

Commit 8f6afde

Browse files
rename labor worksheet methods to subcontracting equivalents
- Updated method names to reflect subcontracting context for clarity. - Adjusted related references in setup and test code to maintain functionality.
1 parent c3da6f1 commit 8f6afde

8 files changed

Lines changed: 13 additions & 10 deletions

File tree

src/Apps/W1/Subcontracting/App/src/Install/SubcontractingCompInit.Codeunit.al

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ codeunit 99001503 "Subcontracting Comp. Init."
2323
ManufacturingSetup.Insert(true);
2424
end;
2525

26-
CreateLaborReqWkshTemplateAndNameAndUpdateSetup(ManufacturingSetup);
26+
CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup(ManufacturingSetup);
2727
ManufacturingSetup."Direct Transfer" := true;
2828
ManufacturingSetup."Create Prod. Order Info Line" := true;
2929
Evaluate(ManufacturingSetup."Subc. Inb. Whse. Handling Time", GetDefaultInboundWhseHandlingTime());
3030
ManufacturingSetup.Modify(true);
3131
end;
3232

33-
procedure CreateLaborReqWkshTemplateAndNameAndUpdateSetup(var ManufacturingSetup: Record "Manufacturing Setup")
33+
procedure CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup(var ManufacturingSetup: Record "Manufacturing Setup")
3434
var
3535
ReqWkshTemplate: Record "Req. Wksh. Template";
3636
RequisitionWkshName: Record "Requisition Wksh. Name";

src/Apps/W1/Subcontracting/App/src/Process/Prod Order Creation Wizard/Codeunits/SubcTempDataInitializer.Codeunit.al

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ codeunit 99001552 "Subc. Temp Data Initializer"
179179
begin
180180
ClearRoutingTables();
181181
GetManufacturingSetup();
182+
GetSubcManagementSetup();
182183

183184
ManufacturingSetup.TestField("Routing Nos.");
184185

src/Apps/W1/Subcontracting/App/src/Process/Reports/SubcCreateSubCReturnOrder.Report.al

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,9 @@ report 99001502 "Subc. Create SubCReturnOrder"
271271
if SubcontractingType = "Subcontracting Type"::Purchase then
272272
TransferFromLocationCode := "Purchase Line"."Location Code"
273273
else begin
274-
ManufacturingSetup.Get();
274+
if not ManufacturingSetup.Get() then
275+
Clear(ManufacturingSetup);
276+
275277
ManufacturingSetup.TestField("Subc. Comp. at Location");
276278
case ManufacturingSetup."Subc. Comp. at Location" of
277279
"Components at Location"::Purchase:

src/Apps/W1/Subcontracting/App/src/Setup/Tables/SubcManufacturingSetup.TableExt.al

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tableextension 99001501 "Subc. Manufacturing Setup" extends "Manufacturing Setup
2424
DataClassification = CustomerContent;
2525
#pragma warning disable AL0432
2626
#pragma warning disable AL0520
27-
TableRelation = "Req. Wksh. Template" where(Type = const("For. Labor"));
27+
TableRelation = "Req. Wksh. Template" where(Type = const(Subcontracting));
2828
#pragma warning restore AL0432
2929
#pragma warning restore AL0520
3030
}
@@ -34,7 +34,7 @@ tableextension 99001501 "Subc. Manufacturing Setup" extends "Manufacturing Setup
3434
DataClassification = CustomerContent;
3535
#pragma warning disable AL0432
3636
#pragma warning disable AL0520
37-
TableRelation = "Requisition Wksh. Name".Name where("Template Type" = const("For. Labor"),
37+
TableRelation = "Requisition Wksh. Name".Name where("Template Type" = const(Subcontracting),
3838
"Worksheet Template Name" = field("Subcontracting Template Name"));
3939
#pragma warning restore AL0432
4040
#pragma warning restore AL0520

src/Apps/W1/Subcontracting/Test/src/Codeunits/Libraries/SubcLibraryMfgManagement.Codeunit.al

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ codeunit 139984 "Subc. Library Mfg. Management"
202202
exit(ProdOrderRoutingLine."Routing Reference No.");
203203
end;
204204

205-
procedure CreateLaborReqWkshTemplateAndNameAndUpdateSetup()
205+
procedure CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup()
206206
var
207207
ReqWkshTemplate: Record "Req. Wksh. Template";
208208
RequisitionWkshName: Record "Requisition Wksh. Name";

src/Apps/W1/Subcontracting/Test/src/Codeunits/Libraries/SubcWarehouseLibrary.Codeunit.al

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,11 @@ codeunit 149908 "Subc. Warehouse Library"
421421
end;
422422

423423
/// <summary>
424-
/// Updates the subcontracting management setup with a labor requirement worksheet template and name. This is used to set up the subcontracting management parameters for testing scenarios that involve subcontracting and the use of labor requirement worksheets in the subcontracting process.
424+
/// Updates the subcontracting management setup with a subcontracting requirement worksheet template and name. This is used to set up the subcontracting management parameters for testing scenarios that involve subcontracting and the use of subcontracting requirement worksheets in the subcontracting process.
425425
/// </summary>
426426
procedure UpdateSubMgmtSetupWithReqWkshTemplate()
427427
begin
428-
SubcLibraryMfgManagement.CreateLaborReqWkshTemplateAndNameAndUpdateSetup();
428+
SubcLibraryMfgManagement.CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup();
429429
end;
430430

431431
// ========================================

src/Apps/W1/Subcontracting/Test/src/Codeunits/Tests/SubcSubcontractingSyncTest.Codeunit.al

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ codeunit 139992 "Subc. Subcontracting Sync Test"
432432

433433
local procedure UpdateSubMgmtSetupWithReqWkshTemplate()
434434
begin
435-
LibraryMfgManagement.CreateLaborReqWkshTemplateAndNameAndUpdateSetup();
435+
LibraryMfgManagement.CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup();
436436
end;
437437

438438
local procedure UpdateSubMgmtSetup_ComponentAtLocation(CompAtLocation: Enum "Components at Location")

src/Apps/W1/Subcontracting/Test/src/Codeunits/Tests/SubcSubcontractingTest.Codeunit.al

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2087,7 +2087,7 @@ Comment = '|%1 = Transfer Order No.';
20872087

20882088
local procedure UpdateSubMgmtSetupWithReqWkshTemplate()
20892089
begin
2090-
LibraryMfgManagement.CreateLaborReqWkshTemplateAndNameAndUpdateSetup();
2090+
LibraryMfgManagement.CreateSubcontractingReqWkshTemplateAndNameAndUpdateSetup();
20912091
end;
20922092

20932093
local procedure UpdateSubMgmtSetupTransferInfoLine(Update: Boolean)

0 commit comments

Comments
 (0)