Skip to content

[Master] Different source reference on reservation entries created directly from Job Planning Line and via a warehouse pick. #8905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shikhverma wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[Master] Different source reference on reservation entries created directly from Job Planning Line and via a warehouse pick. #8905

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
038cb8f
Initial Commit: 625654
Shikhverma Jun 30, 2026
d16fcb2
Update
Shikhverma Jul 2, 2026
5dde30f
update1
Shikhverma Jul 3, 2026
2b993c8
Comment Resolved
Shikhverma Jul 8, 2026
cba3f28
Merge branch 'microsoft:main' into bugs/Bug-625654-DifferentSourceRef…
Shikhverma Jul 8, 2026
9c99601
update
Shikhverma Jul 8, 2026
42899ca
Merge branch 'microsoft:main' into bugs/Bug-625654-DifferentSourceRef…
Shikhverma Jul 8, 2026
a7b8337
Done
Shikhverma Jul 13, 2026
caf1205
Updated
Shikhverma Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions src/Layers/AT/BaseApp/OtherCapabilities/Upgrade/UpgradeBaseApp.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ using Microsoft.Sales.Setup;
using Microsoft.Service.History;
using Microsoft.Utilities;
using Microsoft.Warehouse.Activity;
using Microsoft.Warehouse.Request;
using Microsoft.Warehouse.Structure;
using Microsoft.Warehouse.Worksheet;
using System.Automation;
using System.Environment;
using System.Environment.Configuration;
Expand Down Expand Up @@ -245,6 +247,7 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeFinancialReportAuditLogAddRetentionPolicy();
UpgradeZeroClosedBankAccountLedgerEntries();
UpgradeDepreciationBooksGLIntegration();
UpgradeWarehouseActivitySourceTypeForJobPlanningLine();
end;

local procedure ClearTemporaryTables()
Expand Down Expand Up @@ -4002,6 +4005,53 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetDepreciationBooksGLIntegrationUpgradeTag());
end;

local procedure UpgradeWarehouseActivitySourceTypeForJobPlanningLine()
var
WarehouseActivityLine: Record "Warehouse Activity Line";
WhseWorksheetLine: Record "Whse. Worksheet Line";
WarehouseRequest: Record "Warehouse Request";
UpgradeTag: Codeunit "Upgrade Tag";
UpgradeTagDefinitions: Codeunit "Upgrade Tag Definitions";
WarehouseActivityLineDataTransfer: DataTransfer;
WhseWorksheetLineDataTransfer: DataTransfer;
WarehouseRequestDataTransfer: DataTransfer;
begin
// Upgrade legacy Job-related warehouse records to use the new Source Type and Source Subtype values
// Old format: Source Type = Database::Job (167), Source Subtype = 0
// New format: Source Type = Database::"Job Planning Line" (1003), Source Subtype = Order (2)
if UpgradeTag.HasUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag()) then
exit;

// Upgrade Warehouse Activity Line
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
if not WarehouseActivityLine.IsEmpty() then begin
WarehouseActivityLineDataTransfer.SetTables(Database::"Warehouse Activity Line", Database::"Warehouse Activity Line");
WarehouseActivityLineDataTransfer.AddFieldValue(WarehouseActivityLine.FieldNo("Source Type"), WarehouseActivityLine.FieldNo("Source Subtype"));
WarehouseActivityLineDataTransfer.CopyFields();
end;

// Upgrade Whse. Worksheet Line
WhseWorksheetLine.SetRange("Source Type", Database::Job);
WhseWorksheetLine.SetRange("Source Subtype", 0);
if not WhseWorksheetLine.IsEmpty() then begin
WhseWorksheetLineDataTransfer.SetTables(Database::"Whse. Worksheet Line", Database::"Whse. Worksheet Line");
WhseWorksheetLineDataTransfer.AddFieldValue(WhseWorksheetLine.FieldNo("Source Type"), WhseWorksheetLine.FieldNo("Source Subtype"));
WhseWorksheetLineDataTransfer.CopyFields();
end;

// Upgrade Warehouse Request
WarehouseRequest.SetRange("Source Type", Database::Job);
WarehouseRequest.SetRange("Source Subtype", 0);
if not WarehouseRequest.IsEmpty() then begin
WarehouseRequestDataTransfer.SetTables(Database::"Warehouse Request", Database::"Warehouse Request");
WarehouseRequestDataTransfer.AddFieldValue(WarehouseRequest.FieldNo("Source Type"), WarehouseRequest.FieldNo("Source Subtype"));
WarehouseRequestDataTransfer.CopyFields();
end;

UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

local procedure SEPACAMT05300108(): Code[20]
begin
exit('SEPA CAMT 053-08');
Expand Down
50 changes: 50 additions & 0 deletions src/Layers/BE/BaseApp/OtherCapabilities/Upgrade/UpgradeBaseApp.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ using Microsoft.Sales.Setup;
using Microsoft.Service.History;
using Microsoft.Utilities;
using Microsoft.Warehouse.Activity;
using Microsoft.Warehouse.Request;
using Microsoft.Warehouse.Structure;
using Microsoft.Warehouse.Worksheet;
using System.Automation;
using System.Environment;
using System.Environment.Configuration;
Expand Down Expand Up @@ -255,6 +257,7 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeFinancialReportAuditLogAddRetentionPolicy();
UpgradeZeroClosedBankAccountLedgerEntries();
UpgradeDepreciationBooksGLIntegration();
UpgradeWarehouseActivitySourceTypeForJobPlanningLine();
end;

local procedure ClearTemporaryTables()
Expand Down Expand Up @@ -4114,6 +4117,53 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetDepreciationBooksGLIntegrationUpgradeTag());
end;

local procedure UpgradeWarehouseActivitySourceTypeForJobPlanningLine()
var
WarehouseActivityLine: Record "Warehouse Activity Line";
WhseWorksheetLine: Record "Whse. Worksheet Line";
WarehouseRequest: Record "Warehouse Request";
UpgradeTag: Codeunit "Upgrade Tag";
UpgradeTagDefinitions: Codeunit "Upgrade Tag Definitions";
WarehouseActivityLineDataTransfer: DataTransfer;
WhseWorksheetLineDataTransfer: DataTransfer;
WarehouseRequestDataTransfer: DataTransfer;
begin
// Upgrade legacy Job-related warehouse records to use the new Source Type and Source Subtype values
// Old format: Source Type = Database::Job (167), Source Subtype = 0
// New format: Source Type = Database::"Job Planning Line" (1003), Source Subtype = Order (2)
if UpgradeTag.HasUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag()) then
exit;

// Upgrade Warehouse Activity Line
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
if not WarehouseActivityLine.IsEmpty() then begin
WarehouseActivityLineDataTransfer.SetTables(Database::"Warehouse Activity Line", Database::"Warehouse Activity Line");
WarehouseActivityLineDataTransfer.AddFieldValue(WarehouseActivityLine.FieldNo("Source Type"), WarehouseActivityLine.FieldNo("Source Subtype"));
WarehouseActivityLineDataTransfer.CopyFields();
end;

// Upgrade Whse. Worksheet Line
WhseWorksheetLine.SetRange("Source Type", Database::Job);
WhseWorksheetLine.SetRange("Source Subtype", 0);
if not WhseWorksheetLine.IsEmpty() then begin
WhseWorksheetLineDataTransfer.SetTables(Database::"Whse. Worksheet Line", Database::"Whse. Worksheet Line");
WhseWorksheetLineDataTransfer.AddFieldValue(WhseWorksheetLine.FieldNo("Source Type"), WhseWorksheetLine.FieldNo("Source Subtype"));
WhseWorksheetLineDataTransfer.CopyFields();
end;

// Upgrade Warehouse Request
WarehouseRequest.SetRange("Source Type", Database::Job);
WarehouseRequest.SetRange("Source Subtype", 0);
if not WarehouseRequest.IsEmpty() then begin
WarehouseRequestDataTransfer.SetTables(Database::"Warehouse Request", Database::"Warehouse Request");
WarehouseRequestDataTransfer.AddFieldValue(WarehouseRequest.FieldNo("Source Type"), WarehouseRequest.FieldNo("Source Subtype"));
WarehouseRequestDataTransfer.CopyFields();
end;

UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

local procedure SEPACAMT05300108(): Code[20]
begin
exit('SEPA CAMT 053-08');
Expand Down
9 changes: 8 additions & 1 deletion src/Layers/BE/BaseApp/OtherCapabilities/Upgrade/UpgradeTagDefinitions.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ codeunit 9998 "Upgrade Tag Definitions"
PerCompanyUpgradeTags.Add(GetServiceShptLineFieldsUpgradeTag());
PerCompanyUpgradeTags.Add(GetZeroClosedBankAccountLedgerEntriesUpgradeTag());
PerCompanyUpgradeTags.Add(GetDepreciationBooksGLIntegrationUpgradeTag());
PerCompanyUpgradeTags.Add(GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", 'OnGetPerDatabaseUpgradeTags', '', false, false)]
Expand Down Expand Up @@ -1372,4 +1373,10 @@ codeunit 9998 "Upgrade Tag Definitions"
begin
exit('MS-626097-DepreciationBooksGLIntegrationUpgradeTag-20260319');
end;
}

internal procedure GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag(): Code[250]
begin
// Upgrade legacy Job-related warehouse records from (Database::Job, 0) to (Database::"Job Planning Line", Order)
exit('MS-625654-WarehouseActivitySourceTypeForJobPlanningLineUpgradeTag-20260518');
end;
}
50 changes: 50 additions & 0 deletions src/Layers/CH/BaseApp/OtherCapabilities/Upgrade/UpgradeBaseApp.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ using Microsoft.Sales.Setup;
using Microsoft.Service.History;
using Microsoft.Utilities;
using Microsoft.Warehouse.Activity;
using Microsoft.Warehouse.Request;
using Microsoft.Warehouse.Structure;
using Microsoft.Warehouse.Worksheet;
using System.Automation;
using System.Environment;
using System.Environment.Configuration;
Expand Down Expand Up @@ -257,6 +259,7 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeFinancialReportAuditLogAddRetentionPolicy();
UpgradeZeroClosedBankAccountLedgerEntries();
UpgradeDepreciationBooksGLIntegration();
UpgradeWarehouseActivitySourceTypeForJobPlanningLine();
end;

local procedure ClearTemporaryTables()
Expand Down Expand Up @@ -4068,6 +4071,53 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetDepreciationBooksGLIntegrationUpgradeTag());
end;

local procedure UpgradeWarehouseActivitySourceTypeForJobPlanningLine()
var
WarehouseActivityLine: Record "Warehouse Activity Line";
WhseWorksheetLine: Record "Whse. Worksheet Line";
WarehouseRequest: Record "Warehouse Request";
UpgradeTag: Codeunit "Upgrade Tag";
UpgradeTagDefinitions: Codeunit "Upgrade Tag Definitions";
WarehouseActivityLineDataTransfer: DataTransfer;
WhseWorksheetLineDataTransfer: DataTransfer;
WarehouseRequestDataTransfer: DataTransfer;
begin
// Upgrade legacy Job-related warehouse records to use the new Source Type and Source Subtype values
// Old format: Source Type = Database::Job (167), Source Subtype = 0
// New format: Source Type = Database::"Job Planning Line" (1003), Source Subtype = Order (2)
if UpgradeTag.HasUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag()) then
exit;

// Upgrade Warehouse Activity Line
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
if not WarehouseActivityLine.IsEmpty() then begin
WarehouseActivityLineDataTransfer.SetTables(Database::"Warehouse Activity Line", Database::"Warehouse Activity Line");
WarehouseActivityLineDataTransfer.AddFieldValue(WarehouseActivityLine.FieldNo("Source Type"), WarehouseActivityLine.FieldNo("Source Subtype"));
WarehouseActivityLineDataTransfer.CopyFields();
end;

// Upgrade Whse. Worksheet Line
WhseWorksheetLine.SetRange("Source Type", Database::Job);
WhseWorksheetLine.SetRange("Source Subtype", 0);
if not WhseWorksheetLine.IsEmpty() then begin
WhseWorksheetLineDataTransfer.SetTables(Database::"Whse. Worksheet Line", Database::"Whse. Worksheet Line");
WhseWorksheetLineDataTransfer.AddFieldValue(WhseWorksheetLine.FieldNo("Source Type"), WhseWorksheetLine.FieldNo("Source Subtype"));
WhseWorksheetLineDataTransfer.CopyFields();
end;

// Upgrade Warehouse Request
WarehouseRequest.SetRange("Source Type", Database::Job);
WarehouseRequest.SetRange("Source Subtype", 0);
if not WarehouseRequest.IsEmpty() then begin
WarehouseRequestDataTransfer.SetTables(Database::"Warehouse Request", Database::"Warehouse Request");
WarehouseRequestDataTransfer.AddFieldValue(WarehouseRequest.FieldNo("Source Type"), WarehouseRequest.FieldNo("Source Subtype"));
WarehouseRequestDataTransfer.CopyFields();
end;

UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

local procedure SEPACAMT05300108(): Code[20]
begin
exit('SEPA CAMT 053-08-CH');
Expand Down
50 changes: 50 additions & 0 deletions src/Layers/IT/BaseApp/OtherCapabilities/Upgrade/UpgradeBaseApp.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ using Microsoft.Sales.Setup;
using Microsoft.Service.History;
using Microsoft.Utilities;
using Microsoft.Warehouse.Activity;
using Microsoft.Warehouse.Request;
using Microsoft.Warehouse.Structure;
using Microsoft.Warehouse.Worksheet;
using System.Automation;
using System.Environment;
using System.Environment.Configuration;
Expand Down Expand Up @@ -251,6 +253,7 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeFinancialReportAuditLogAddRetentionPolicy();
UpgradeZeroClosedBankAccountLedgerEntries();
UpgradeDepreciationBooksGLIntegration();
UpgradeWarehouseActivitySourceTypeForJobPlanningLine();
end;

local procedure ClearTemporaryTables()
Expand Down Expand Up @@ -4133,6 +4136,53 @@ codeunit 104000 "Upgrade - BaseApp"
UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetDepreciationBooksGLIntegrationUpgradeTag());
end;

local procedure UpgradeWarehouseActivitySourceTypeForJobPlanningLine()
var
WarehouseActivityLine: Record "Warehouse Activity Line";
WhseWorksheetLine: Record "Whse. Worksheet Line";
WarehouseRequest: Record "Warehouse Request";
UpgradeTag: Codeunit "Upgrade Tag";
UpgradeTagDefinitions: Codeunit "Upgrade Tag Definitions";
WarehouseActivityLineDataTransfer: DataTransfer;
WhseWorksheetLineDataTransfer: DataTransfer;
WarehouseRequestDataTransfer: DataTransfer;
begin
// Upgrade legacy Job-related warehouse records to use the new Source Type and Source Subtype values
// Old format: Source Type = Database::Job (167), Source Subtype = 0
// New format: Source Type = Database::"Job Planning Line" (1003), Source Subtype = Order (2)
if UpgradeTag.HasUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag()) then
exit;

// Upgrade Warehouse Activity Line
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
if not WarehouseActivityLine.IsEmpty() then begin
WarehouseActivityLineDataTransfer.SetTables(Database::"Warehouse Activity Line", Database::"Warehouse Activity Line");
WarehouseActivityLineDataTransfer.AddFieldValue(WarehouseActivityLine.FieldNo("Source Type"), WarehouseActivityLine.FieldNo("Source Subtype"));
WarehouseActivityLineDataTransfer.CopyFields();
end;

// Upgrade Whse. Worksheet Line
WhseWorksheetLine.SetRange("Source Type", Database::Job);
WhseWorksheetLine.SetRange("Source Subtype", 0);
if not WhseWorksheetLine.IsEmpty() then begin
WhseWorksheetLineDataTransfer.SetTables(Database::"Whse. Worksheet Line", Database::"Whse. Worksheet Line");
WhseWorksheetLineDataTransfer.AddFieldValue(WhseWorksheetLine.FieldNo("Source Type"), WhseWorksheetLine.FieldNo("Source Subtype"));
WhseWorksheetLineDataTransfer.CopyFields();
end;

// Upgrade Warehouse Request
WarehouseRequest.SetRange("Source Type", Database::Job);
WarehouseRequest.SetRange("Source Subtype", 0);
if not WarehouseRequest.IsEmpty() then begin
WarehouseRequestDataTransfer.SetTables(Database::"Warehouse Request", Database::"Warehouse Request");
WarehouseRequestDataTransfer.AddFieldValue(WarehouseRequest.FieldNo("Source Type"), WarehouseRequest.FieldNo("Source Subtype"));
WarehouseRequestDataTransfer.CopyFields();
end;

UpgradeTag.SetUpgradeTag(UpgradeTagDefinitions.GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

local procedure SEPACAMT05300108(): Code[20]
begin
exit('SEPA CAMT 053-08');
Expand Down
6 changes: 6 additions & 0 deletions src/Layers/IT/BaseApp/OtherCapabilities/Upgrade/UpgradeTagDefinitions.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ codeunit 9998 "Upgrade Tag Definitions"
PerCompanyUpgradeTags.Add(GetZeroClosedBankAccountLedgerEntriesUpgradeTag());
PerCompanyUpgradeTags.Add(GetDepreciationBooksGLIntegrationUpgradeTag());
PerCompanyUpgradeTags.Add(GetLegacySubcontractingUpgradeTag());
PerCompanyUpgradeTags.Add(GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag());
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", 'OnGetPerDatabaseUpgradeTags', '', false, false)]
Expand Down Expand Up @@ -1273,4 +1274,9 @@ codeunit 9998 "Upgrade Tag Definitions"
exit('MS-406123-LegacySubcontracting-20260507');
end;

internal procedure GetWarehouseActivitySourceTypeForJobPlanningLineUpgradeTag(): Code[250]
begin
// Upgrade legacy Job-related warehouse records from (Database::Job, 0) to (Database::"Job Planning Line", Order)
exit('MS-625654-WarehouseActivitySourceTypeForJobPlanningLineUpgradeTag-20260518');
end;
}
4 changes: 2 additions & 2 deletions src/Layers/NA/BaseApp/Projects/Project/Job/JobCard.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,8 +1976,8 @@ page 88 "Job Card"

WarehouseActivityLine.Reset();
WarehouseActivityLine.SetCurrentKey("Source Type", "Source Subtype", "Source No.", "Source Line No.", "Source Subline No.", "Unit of Measure Code", "Action Type", "Breakbulk No.", "Original Breakbulk");
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
WarehouseActivityLine.SetFilter("Source Type", '%1|%2', Database::Job, Database::"Job Planning Line");
WarehouseActivityLine.SetFilter("Source Subtype", '%1|%2', 0, "Job Planning Line Status"::Order.AsInteger());
WarehouseActivityLine.SetRange("Source No.", Rec."No.");
if WarehouseActivityLine.FindSet() then
repeat
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/NA/BaseApp/Projects/Project/Job/JobList.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,8 +1075,8 @@ page 89 "Job List"

WarehouseActivityLine.Reset();
WarehouseActivityLine.SetCurrentKey("Source Type", "Source Subtype", "Source No.", "Source Line No.", "Source Subline No.", "Unit of Measure Code", "Action Type", "Breakbulk No.", "Original Breakbulk");
WarehouseActivityLine.SetRange("Source Type", Database::Job);
WarehouseActivityLine.SetRange("Source Subtype", 0);
WarehouseActivityLine.SetFilter("Source Type", '%1|%2', Database::Job, Database::"Job Planning Line");
WarehouseActivityLine.SetFilter("Source Subtype", '%1|%2', 0, "Job Planning Line Status"::Order.AsInteger());
WarehouseActivityLine.SetRange("Source No.", Rec."No.");
if WarehouseActivityLine.FindSet() then
repeat
Expand Down
Loading
Loading