Skip to content

Subscription Billing: respect Default Dimension Priorities on Subscription Lines #8115

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
Franco111000 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Subscription Billing: respect Default Dimension Priorities on Subscription Lines #8115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b5e03c
Subscription Billing: respect Default Dimension Priorities on Subscri…
Franco111000 May 12, 2026
4164523
Subscription Billing: switch to priority-aware merge that preserves c…
Franco111000 May 13, 2026
9e9dca3
Subscription Billing: extract shared dim-source helper and cover cros…
Franco111000 May 13, 2026
16d8dc1
Merge remote-tracking branch 'upstream/main' into fix-subscription-bi…
Franco111000 May 19, 2026
259972e
Merge remote-tracking branch 'upstream/main' into fix-subscription-bi…
Franco111000 May 27, 2026
911038d
Subscription Billing: add purchase-side priority test
Franco111000 May 27, 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
6 changes: 5 additions & 1 deletion src/Apps/W1/Subscription Billing/App/Customer Contracts/Tables/CustSubContractLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
namespace Microsoft.SubscriptionBilling;

using Microsoft.Finance.GeneralLedger.Account;
using Microsoft.Foundation.AuditCodes;
using Microsoft.Inventory.Item;
using Microsoft.Purchases.Vendor;
using System.Utilities;

table 8062 "Cust. Sub. Contract Line"
Expand Down Expand Up @@ -338,13 +340,15 @@ table 8062 "Cust. Sub. Contract Line"
var
VendorServiceCommitment: Record "Subscription Line";
VendorContract: Record "Vendor Subscription Contract";
SourceCodeSetup: Record "Source Code Setup";
begin
SourceCodeSetup.Get();
Comment thread
AndersLarsenMicrosoft marked this conversation as resolved.
VendorServiceCommitment.FilterOnServiceObjectAndPackage(ServiceCommitment."Subscription Header No.", ServiceCommitment.Template, ServiceCommitment."Subscription Package Code", Enum::"Service Partner"::Vendor);
if VendorServiceCommitment.FindSet() then
repeat
VendorServiceCommitment.SetDefaultDimensions(true);
if VendorContract.Get(VendorServiceCommitment."Subscription Contract No.") then
VendorServiceCommitment.GetCombinedDimensionSetID(VendorServiceCommitment."Dimension Set ID", VendorContract."Dimension Set ID");
VendorServiceCommitment.ApplyContractDimensions(VendorContract."Dimension Set ID", SourceCodeSetup.Purchases, Database::Vendor);
VendorServiceCommitment.Modify(false);
until VendorServiceCommitment.Next() = 0;
end;
Expand Down
4 changes: 3 additions & 1 deletion .../Subscription Billing/App/Customer Contracts/Tables/CustomerSubscriptionContract.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,6 +2090,7 @@ table 8052 "Customer Subscription Contract"
var
ServiceObject: Record "Subscription Header";
CustomerContract: Record "Customer Subscription Contract";
SourceCodeSetup: Record "Source Code Setup";
OldDimSetID: Integer;
InitHarmonizedBillingFields: Boolean;
begin
Expand All @@ -2109,7 +2110,8 @@ table 8052 "Customer Subscription Contract"
ServiceCommitment."Subscription Contract No." := CustomerContractLine."Subscription Contract No.";
ServiceCommitment."Subscription Contract Line No." := CustomerContractLine."Line No.";

ServiceCommitment.GetCombinedDimensionSetID(ServiceCommitment."Dimension Set ID", CustomerContract."Dimension Set ID");
SourceCodeSetup.Get();
ServiceCommitment.ApplyContractDimensions(CustomerContract."Dimension Set ID", SourceCodeSetup.Sales, Database::Customer);
if "Currency Code" <> ServiceCommitment."Currency Code" then begin
CalculateCurrencyFactor(ServiceCommitment."Subscription Line Start Date", CustomerContract."Currency Code");
ServiceCommitment.SetCurrencyData(CurrencyFactor, CurrencyFactorDate, CustomerContract."Currency Code");
Expand Down
12 changes: 10 additions & 2 deletions src/Apps/W1/Subscription Billing/App/Import/Codeunits/CreateSubContractLine.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
namespace Microsoft.SubscriptionBilling;

using Microsoft.Foundation.AuditCodes;
using Microsoft.Purchases.Vendor;
using Microsoft.Sales.Customer;

codeunit 8007 "Create Sub. Contract Line"
{
TableNo = "Imported Subscription Line";
Expand Down Expand Up @@ -70,6 +74,7 @@ codeunit 8007 "Create Sub. Contract Line"
local procedure CreateCustomerContractLine()
var
CustomerContractLine: Record "Cust. Sub. Contract Line";
SourceCodeSetup: Record "Source Code Setup";
OldDimSetID: Integer;
begin
OnBeforeCreateCustomerContractLine(ServiceCommitment, ImportedServiceCommitment);
Expand All @@ -86,7 +91,8 @@ codeunit 8007 "Create Sub. Contract Line"
OldDimSetID := ServiceCommitment."Dimension Set ID";
ServiceCommitment."Subscription Contract No." := CustomerContractLine."Subscription Contract No.";
ServiceCommitment."Subscription Contract Line No." := CustomerContractLine."Line No.";
ServiceCommitment.GetCombinedDimensionSetID(ServiceCommitment."Dimension Set ID", CustomerContract."Dimension Set ID");
SourceCodeSetup.Get();
ServiceCommitment.ApplyContractDimensions(CustomerContract."Dimension Set ID", SourceCodeSetup.Sales, Database::Customer);
ServiceCommitment.Modify(true);
ServiceCommitment.UpdateRelatedVendorServiceCommDimensions(OldDimSetID, ServiceCommitment."Dimension Set ID");
end;
Expand Down Expand Up @@ -117,6 +123,7 @@ codeunit 8007 "Create Sub. Contract Line"
local procedure CreateVendorContractLine()
var
VendorContractLine: Record "Vend. Sub. Contract Line";
SourceCodeSetup: Record "Source Code Setup";
begin
OnBeforeCreateVendorContractLine(ServiceCommitment, ImportedServiceCommitment);
if ImportedServiceCommitment.IsContractCommentLine() then
Expand All @@ -132,7 +139,8 @@ codeunit 8007 "Create Sub. Contract Line"
ServiceCommitment."Subscription Contract No." := VendorContractLine."Subscription Contract No.";
ServiceCommitment."Subscription Contract Line No." := VendorContractLine."Line No.";

ServiceCommitment.GetCombinedDimensionSetID(ServiceCommitment."Dimension Set ID", VendorContract."Dimension Set ID");
SourceCodeSetup.Get();
ServiceCommitment.ApplyContractDimensions(VendorContract."Dimension Set ID", SourceCodeSetup.Purchases, Database::Vendor);
ServiceCommitment.Modify(false);
VendorContractLine.UpdateServiceCommitmentDimensions();
end;
Expand Down
66 changes: 51 additions & 15 deletions src/Apps/W1/Subscription Billing/App/Service Commitments/Tables/SubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ namespace Microsoft.SubscriptionBilling;
using Microsoft.Finance.Currency;
using Microsoft.Finance.Dimension;
using Microsoft.Finance.GeneralLedger.Account;
using Microsoft.Foundation.AuditCodes;
using Microsoft.Foundation.Calendar;
using Microsoft.Inventory.Item;
using Microsoft.Purchases.Vendor;
using Microsoft.Sales.Customer;
using Microsoft.Sales.Document;
using Microsoft.Sales.Pricing;
using System.Utilities;
Expand Down Expand Up @@ -1099,24 +1102,51 @@ table 8059 "Subscription Line"

internal procedure SetDefaultDimensions(UseSource: Boolean)
var
ServiceObject: Record "Subscription Header";
DefaultDimSource: List of [Dictionary of [Integer, Code[20]]];
begin
AddDefaultDimensionSources(DefaultDimSource, UseSource);
"Dimension Set ID" := DimMgt.GetDefaultDimID(DefaultDimSource, '', "Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code", 0, 0);
DimMgt.UpdateGlobalDimFromDimSetID("Dimension Set ID", "Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code");
end;

internal procedure ApplyContractDimensions(ContractDimSetID: Integer; SourceCode: Code[10]; ContractPartnerTableID: Integer)
Comment thread
JesperSchulz marked this conversation as resolved.
var
DefaultDimSource: List of [Dictionary of [Integer, Code[20]]];
HighPriorityDimSource: List of [Dictionary of [Integer, Code[20]]];
DimSetIDArr: array[10] of Integer;
TempDimValue1: Code[20];
TempDimValue2: Code[20];
begin
DimSetIDArr[1] := "Dimension Set ID";
DimSetIDArr[2] := ContractDimSetID;

AddDefaultDimensionSources(DefaultDimSource, true);

if DimMgt.GetTableIDsForHigherPriorities(DefaultDimSource, HighPriorityDimSource, SourceCode, ContractPartnerTableID) then
DimSetIDArr[3] :=
DimMgt.GetRecDefaultDimID(
Rec, CurrFieldNo, HighPriorityDimSource, SourceCode,
TempDimValue1, TempDimValue2, 0, 0);

"Dimension Set ID" :=
DimMgt.GetCombinedDimensionSetID(DimSetIDArr, "Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code");
end;

local procedure AddDefaultDimensionSources(var DefaultDimSource: List of [Dictionary of [Integer, Code[20]]]; UseSource: Boolean)
var
ServiceObject: Record "Subscription Header";
begin
if Rec."Invoicing Item No." <> '' then
DimMgt.AddDimSource(DefaultDimSource, Database::Item, Rec."Invoicing Item No.");

if UseSource then begin
ServiceObject.Get("Subscription Header No.");
case ServiceObject.Type of
ServiceObject.Type::Item:
DimMgt.AddDimSource(DefaultDimSource, Database::Item, ServiceObject."Source No.");
ServiceObject.Type::"G/L Account":
DimMgt.AddDimSource(DefaultDimSource, Database::"G/L Account", ServiceObject."Source No.");
end;
end;

"Dimension Set ID" := DimMgt.GetDefaultDimID(DefaultDimSource, '', "Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code", 0, 0);
DimMgt.UpdateGlobalDimFromDimSetID("Dimension Set ID", "Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code");
if UseSource then
if ServiceObject.Get("Subscription Header No.") then
case ServiceObject.Type of
ServiceObject.Type::Item:
DimMgt.AddDimSource(DefaultDimSource, Database::Item, ServiceObject."Source No.");
ServiceObject.Type::"G/L Account":
DimMgt.AddDimSource(DefaultDimSource, Database::"G/L Account", ServiceObject."Source No.");
end;
end;

internal procedure GetCombinedDimensionSetID(DimSetID1: Integer; DimSetID2: Integer)
Expand Down Expand Up @@ -1230,18 +1260,24 @@ table 8059 "Subscription Line"
end;

internal procedure UpdateFromCustomerContract(CustomerContract: Record "Customer Subscription Contract")
var
SourceCodeSetup: Record "Source Code Setup";
begin
"Currency Code" := CustomerContract."Currency Code";
InitCurrencyData();
GetCombinedDimensionSetID("Dimension Set ID", CustomerContract."Dimension Set ID");
SourceCodeSetup.Get();
Comment thread
JesperSchulz marked this conversation as resolved.
ApplyContractDimensions(CustomerContract."Dimension Set ID", SourceCodeSetup.Sales, Database::Customer);
"Exclude from Price Update" := CustomerContract.DefaultExcludeFromPriceUpdate;
end;

internal procedure UpdateFromVendorContract(VendorContract: Record "Vendor Subscription Contract")
var
SourceCodeSetup: Record "Source Code Setup";
begin
"Currency Code" := VendorContract."Currency Code";
InitCurrencyData();
GetCombinedDimensionSetID("Dimension Set ID", VendorContract."Dimension Set ID");
SourceCodeSetup.Get();
ApplyContractDimensions(VendorContract."Dimension Set ID", SourceCodeSetup.Purchases, Database::Vendor);
"Exclude from Price Update" := VendorContract.DefaultExcludeFromPriceUpdate;
end;

Expand Down
9 changes: 7 additions & 2 deletions src/Apps/W1/Subscription Billing/App/Vendor Contracts/Tables/VendSubContractLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
namespace Microsoft.SubscriptionBilling;

using Microsoft.Finance.GeneralLedger.Account;
using Microsoft.Foundation.AuditCodes;
using Microsoft.Inventory.Item;
using Microsoft.Sales.Customer;
using System.Utilities;

table 8065 "Vend. Sub. Contract Line"
Expand Down Expand Up @@ -306,6 +308,7 @@ table 8065 "Vend. Sub. Contract Line"
ServiceCommitment: Record "Subscription Line";
CustomerServiceCommitment: Record "Subscription Line";
CustomerContract: Record "Customer Subscription Contract";
SourceCodeSetup: Record "Source Code Setup";
begin
if Rec."Subscription Header No." = '' then
exit;
Expand All @@ -315,8 +318,10 @@ table 8065 "Vend. Sub. Contract Line"
ServiceCommitment.SetDefaultDimensions(true);
CustomerServiceCommitment.FilterOnServiceObjectAndPackage(Rec."Subscription Header No.", ServiceCommitment.Template, ServiceCommitment."Subscription Package Code", Enum::"Service Partner"::Customer);
if CustomerServiceCommitment.FindFirst() then
if CustomerContract.Get(CustomerServiceCommitment."Subscription Contract No.") then
ServiceCommitment.GetCombinedDimensionSetID(ServiceCommitment."Dimension Set ID", CustomerContract."Dimension Set ID");
if CustomerContract.Get(CustomerServiceCommitment."Subscription Contract No.") then begin
SourceCodeSetup.Get();
ServiceCommitment.ApplyContractDimensions(CustomerContract."Dimension Set ID", SourceCodeSetup.Sales, Database::Customer);
end;
ServiceCommitment.Modify(false);
end;

Expand Down
4 changes: 3 additions & 1 deletion ...s/W1/Subscription Billing/App/Vendor Contracts/Tables/VendorSubscriptionContract.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,7 @@ table 8063 "Vendor Subscription Contract"
var
ServiceObject: Record "Subscription Header";
VendorContract: Record "Vendor Subscription Contract";
SourceCodeSetup: Record "Source Code Setup";
begin
ServiceObject.Get(ServiceCommitment."Subscription Header No.");
VendorContractLine.InitFromServiceCommitment(ServiceCommitment, ContractNo);
Expand All @@ -1607,7 +1608,8 @@ table 8063 "Vendor Subscription Contract"
ServiceCommitment."Subscription Contract Line No." := VendorContractLine."Line No.";

VendorContract.Get(ServiceCommitment."Subscription Contract No.");
ServiceCommitment.GetCombinedDimensionSetID(ServiceCommitment."Dimension Set ID", VendorContract."Dimension Set ID");
SourceCodeSetup.Get();
ServiceCommitment.ApplyContractDimensions(VendorContract."Dimension Set ID", SourceCodeSetup.Purchases, Database::Vendor);
if "Currency Code" <> ServiceCommitment."Currency Code" then begin
CalculateCurrencyFactor(ServiceCommitment."Subscription Line Start Date", VendorContract."Currency Code");
ServiceCommitment.SetCurrencyData(CurrencyFactor, CurrencyFactorDate, VendorContract."Currency Code");
Expand Down
Loading
Loading