Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace Microsoft.SubscriptionBilling;

using Microsoft.Finance.Dimension;
using Microsoft.Inventory.Item;

page 8080 "Closed Cust. Cont. Line Subp."
Expand Down Expand Up @@ -298,6 +299,24 @@ page 8080 "Closed Cust. Cont. Line Subp."
Visible = false;
Editable = false;
}
field("Shortcut Dimension 1 Code"; ServiceCommitment."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 1 Code';
CaptionClass = '1,2,1';
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = false;
}
field("Shortcut Dimension 2 Code"; ServiceCommitment."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 2 Code';
CaptionClass = '1,2,2';
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = false;
}
}
}
}
Expand All @@ -309,6 +328,21 @@ page 8080 "Closed Cust. Cont. Line Subp."
{
Caption = 'Contract Line';
Image = "Item";
action(Dimensions)
{
AccessByPermission = tabledata Dimension = R;
ApplicationArea = Dimensions;
Caption = 'Dimensions';
Image = Dimensions;
Scope = Repeater;
ShortcutKey = 'Shift+Ctrl+D';
ToolTip = 'View or edit dimensions, such as area, project, or department, that you can assign to sales and purchase documents to distribute costs and analyze transaction history.';

trigger OnAction()
begin
ServiceCommitment.EditDimensionSet();
end;
}
action(ShowArchivedBillingLines)
{
Caption = 'Archived Billing Lines';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,50 @@ page 8068 "Customer Contract Line Subp."
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Currency Factor Date"));
end;
}
field("Shortcut Dimension 1 Code"; ServiceCommitment."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 1 Code';
CaptionClass = '1,2,1';
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;

trigger OnLookup(var Text: Text): Boolean
begin
DimMgt.LookupDimValueCode(1, ServiceCommitment."Shortcut Dimension 1 Code");
Text := ServiceCommitment."Shortcut Dimension 1 Code";
exit(true);
end;

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Shortcut Dimension 1 Code"));
end;
}
field("Shortcut Dimension 2 Code"; ServiceCommitment."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 2 Code';
CaptionClass = '1,2,2';
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;

trigger OnLookup(var Text: Text): Boolean
begin
DimMgt.LookupDimValueCode(2, ServiceCommitment."Shortcut Dimension 2 Code");
Text := ServiceCommitment."Shortcut Dimension 2 Code";
exit(true);
end;

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Shortcut Dimension 2 Code"));
end;
}
}
}
}
Expand Down Expand Up @@ -616,6 +660,7 @@ page 8068 "Customer Contract Line Subp."

var
ContractsGeneralMgt: Codeunit "Sub. Contracts General Mgt.";
DimMgt: Codeunit DimensionManagement;
NextBillingDateStyleExpr: Text;
ContractLineQty: Decimal;
VariantCode: Code[10];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,18 @@ page 8069 "Serv. Comm. WO Cust. Contract"
ContactManagement.OpenContactCard(ServiceObject."End-User Contact No.");
end;
}
field("Shortcut Dimension 1 Code"; Rec."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Visible = false;
Editable = false;
}
field("Shortcut Dimension 2 Code"; Rec."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Visible = false;
Editable = false;
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,16 @@ page 8064 "Service Commitments"
ApplicationArea = All;
ToolTip = 'Specifies the sequence number of the related reference.';
}
field("Shortcut Dimension 1 Code"; Rec."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Visible = false;
}
field("Shortcut Dimension 2 Code"; Rec."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Visible = false;
}

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ page 8014 "Service Commitments List"
}
field("Shortcut Dimension 1 Code"; Rec."Shortcut Dimension 1 Code")
{
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
ApplicationArea = Dimensions;
Visible = false;
}
field("Shortcut Dimension 2 Code"; Rec."Shortcut Dimension 2 Code")
{
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
ApplicationArea = Dimensions;
Visible = false;
}
field("Price (LCY)"; Rec."Price (LCY)")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ table 8059 "Subscription Line"
{
CaptionClass = '1,2,1';
Caption = 'Shortcut Dimension 1 Code';
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
TableRelation = "Dimension Value".Code where("Global Dimension No." = const(1),
Blocked = const(false));

Expand All @@ -312,6 +313,7 @@ table 8059 "Subscription Line"
{
CaptionClass = '1,2,2';
Caption = 'Shortcut Dimension 2 Code';
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
TableRelation = "Dimension Value".Code where("Global Dimension No." = const(2),
Blocked = const(false));

Expand Down Expand Up @@ -1051,6 +1053,10 @@ table 8059 "Subscription Line"
Validate("Unit Cost (LCY)", "Unit Cost (LCY)");
FieldNo("Create Contract Deferrals"):
Validate("Create Contract Deferrals", "Create Contract Deferrals");
FieldNo("Shortcut Dimension 1 Code"):
Validate("Shortcut Dimension 1 Code", "Shortcut Dimension 1 Code");
FieldNo("Shortcut Dimension 2 Code"):
Validate("Shortcut Dimension 2 Code", "Shortcut Dimension 2 Code");
end;
Modify(true);
end;
Expand All @@ -1066,7 +1072,7 @@ table 8059 "Subscription Line"

OldDimSetID := "Dimension Set ID";
"Dimension Set ID" := DimMgt.EditDimensionSet(
"Dimension Set ID", "Subscription Header No." + '' + Format("Entry No."),
"Dimension Set ID", "Subscription Header No." + ' ' + FieldCaption("Entry No.") + ' ' + Format("Entry No."),
"Shortcut Dimension 1 Code", "Shortcut Dimension 2 Code");

if OldDimSetID <> "Dimension Set ID" then begin
Expand All @@ -1083,8 +1089,10 @@ table 8059 "Subscription Line"
OnBeforeValidateShortcutDimCode(Rec, xRec, FieldNumber, ShortcutDimCode);
OldDimSetID := "Dimension Set ID";
DimMgt.ValidateShortcutDimValues(FieldNumber, ShortcutDimCode, "Dimension Set ID");
if OldDimSetID <> "Dimension Set ID" then
if OldDimSetID <> "Dimension Set ID" then begin
Modify();
UpdateRelatedVendorServiceCommDimensions(OldDimSetID, "Dimension Set ID");
end;

OnAfterValidateShortcutDimCode(Rec, xRec, FieldNumber, ShortcutDimCode);
end;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
namespace Microsoft.SubscriptionBilling;

using Microsoft.Finance.Dimension;

page 8089 "Closed Vend. Cont. Line Subp."
{

Expand Down Expand Up @@ -288,6 +290,24 @@ page 8089 "Closed Vend. Cont. Line Subp."
Visible = false;
Editable = false;
}
field("Shortcut Dimension 1 Code"; ServiceCommitment."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 1 Code';
CaptionClass = '1,2,1';
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = false;
}
field("Shortcut Dimension 2 Code"; ServiceCommitment."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 2 Code';
CaptionClass = '1,2,2';
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = false;
}
}
}
}
Expand All @@ -299,6 +319,21 @@ page 8089 "Closed Vend. Cont. Line Subp."
{
Caption = 'Contract Line';
Image = "Item";
action(Dimensions)
{
AccessByPermission = tabledata Dimension = R;
ApplicationArea = Dimensions;
Caption = 'Dimensions';
Image = Dimensions;
Scope = Repeater;
ShortcutKey = 'Shift+Ctrl+D';
ToolTip = 'View or edit dimensions, such as area, project, or department, that you can assign to sales and purchase documents to distribute costs and analyze transaction history.';

trigger OnAction()
begin
ServiceCommitment.EditDimensionSet();
end;
}
action(ShowArchivedBillingLines)
{
Caption = 'Archived Billing Lines';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,18 @@ page 8076 "Serv. Comm. WO Vend. Contract"
ContactManagement.OpenContactCard(ServiceObject."End-User Contact No.");
end;
}
field("Shortcut Dimension 1 Code"; Rec."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Visible = false;
Editable = false;
}
field("Shortcut Dimension 2 Code"; Rec."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Visible = false;
Editable = false;
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,50 @@ page 8078 "Vendor Contract Line Subpage"
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Currency Factor Date"));
end;
}
field("Shortcut Dimension 1 Code"; ServiceCommitment."Shortcut Dimension 1 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 1 Code';
CaptionClass = '1,2,1';
ToolTip = 'Specifies the code for Shortcut Dimension 1, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;

trigger OnLookup(var Text: Text): Boolean
begin
DimMgt.LookupDimValueCode(1, ServiceCommitment."Shortcut Dimension 1 Code");
Text := ServiceCommitment."Shortcut Dimension 1 Code";
exit(true);
end;

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Shortcut Dimension 1 Code"));
end;
}
field("Shortcut Dimension 2 Code"; ServiceCommitment."Shortcut Dimension 2 Code")
{
ApplicationArea = Dimensions;
Caption = 'Shortcut Dimension 2 Code';
CaptionClass = '1,2,2';
ToolTip = 'Specifies the code for Shortcut Dimension 2, which is one of two global dimension codes that you set up in the General Ledger Setup window.';
Visible = false;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;

trigger OnLookup(var Text: Text): Boolean
begin
DimMgt.LookupDimValueCode(2, ServiceCommitment."Shortcut Dimension 2 Code");
Text := ServiceCommitment."Shortcut Dimension 2 Code";
exit(true);
end;

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Shortcut Dimension 2 Code"));
end;
}
}
}
}
Expand Down Expand Up @@ -582,6 +626,7 @@ page 8078 "Vendor Contract Line Subpage"

var
ContractsGeneralMgt: Codeunit "Sub. Contracts General Mgt.";
DimMgt: Codeunit DimensionManagement;
NextBillingDateStyleExpr: Text;
IsDiscountLine: Boolean;
IsCommentLineEditable: Boolean;
Expand Down
Loading
Loading