Skip to content

Correct auto format for Calculation Base Amount and related fields #5723

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
miljance wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Correct auto format for Calculation Base Amount and related fields #5723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Apps/W1/Subscription Billing/App/Contract Renewal/Pages/ContractRenewalSelection.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ page 8006 "Contract Renewal Selection"
StyleExpr = LineFormatStyleExpression;
ToolTip = 'Specifies the base amount from which the price will be calculated.';
BlankZero = true;
AutoFormatType = 2;
AutoFormatExpression = TempServiceCommitment."Currency Code";
}
field("Calculation Base %"; TempServiceCommitment."Calculation Base %")
{
Expand Down
2 changes: 1 addition & 1 deletion ...Apps/W1/Subscription Billing/App/Contract Renewal/Tables/PlannedSubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ table 8002 "Planned Subscription Line"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";

trigger OnValidate()
Expand Down
4 changes: 2 additions & 2 deletions src/Apps/W1/Subscription Billing/App/ContractAnalysis/SubContrAnalysisEntry.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ table 8019 "Sub. Contr. Analysis Entry"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";
}
field(10; "Calculation Base %"; Decimal)
Expand Down Expand Up @@ -198,7 +198,7 @@ table 8019 "Sub. Contr. Analysis Entry"
Caption = 'Calculation Base Amount (LCY)';
Editable = false;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = '';
}
field(38; Discount; Boolean)
Expand Down
18 changes: 18 additions & 0 deletions src/Apps/W1/Subscription Billing/App/Customer Contracts/Pages/ClosedCustContLineSubp.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
ToolTip = 'Specifies the base amount from which the price will be calculated.';
BlankZero = true;
Editable = false;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Calculation Base %"; ServiceCommitment."Calculation Base %")
{
Expand All @@ -127,13 +129,17 @@ page 8080 "Closed Cust. Cont. Line Subp."
ToolTip = 'Specifies the percent at which the price of the Subscription Line will be calculated. 100% means that the price corresponds to the Base Price.';
BlankZero = true;
Editable = false;
DecimalPlaces = 0 : 5;
AutoFormatType = 0;
}
field(Price; ServiceCommitment.Price)
{
Caption = 'Price';
ToolTip = 'Specifies the price of the Subscription Line with quantity of 1 in the billing period. The price is calculated from Base Price and Base Price %.';
Editable = false;
BlankZero = true;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Price (LCY)"; ServiceCommitment."Price (LCY)")
{
Expand All @@ -142,6 +148,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
Visible = false;
BlankZero = true;
Editable = false;
AutoFormatType = 2;
AutoFormatExpression = '';
}
field("Discount %"; ServiceCommitment."Discount %")
{
Expand All @@ -151,6 +159,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
MinValue = 0;
MaxValue = 100;
Editable = false;
DecimalPlaces = 0 : 5;
AutoFormatType = 0;
}
field("Discount Amount"; ServiceCommitment."Discount Amount")
{
Expand All @@ -159,6 +169,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
BlankZero = true;
MinValue = 0;
Editable = false;
AutoFormatType = 1;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Discount Amount (LCY)"; ServiceCommitment."Discount Amount (LCY)")
{
Expand All @@ -174,6 +186,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
ToolTip = 'Specifies the amount for the Subscription Line including discount.';
BlankZero = true;
Editable = false;
AutoFormatType = 1;
AutoFormatExpression = '';
}
field("Service Amount (LCY)"; ServiceCommitment."Amount (LCY)")
{
Expand All @@ -182,6 +196,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
Visible = false;
BlankZero = true;
Editable = false;
AutoFormatType = 1;
AutoFormatExpression = '';
}
field("Billing Base Period"; ServiceCommitment."Billing Base Period")
{
Expand Down Expand Up @@ -272,6 +288,8 @@ page 8080 "Closed Cust. Cont. Line Subp."
Visible = false;
BlankZero = true;
Editable = false;
DecimalPlaces = 0 : 15;
AutoFormatType = 0;
}
field("Currency Factor Date"; ServiceCommitment."Currency Factor Date")
{
Expand Down
24 changes: 24 additions & 0 deletions ...pps/W1/Subscription Billing/App/Customer Contracts/Pages/CustomerContractLineSubp.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";

trigger OnValidate()
begin
Expand All @@ -173,6 +175,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
DecimalPlaces = 0 : 5;
AutoFormatType = 0;

trigger OnValidate()
begin
Expand All @@ -182,6 +186,9 @@ page 8068 "Customer Contract Line Subp."
field("Unit Cost (LCY)"; ServiceCommitment."Unit Cost (LCY)")
{
ToolTip = 'Specifies the unit cost of the item.';
AutoFormatType = 2;
AutoFormatExpression = '';

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Unit Cost (LCY)"));
Expand All @@ -193,6 +200,8 @@ page 8068 "Customer Contract Line Subp."
ToolTip = 'Specifies the price of the Subscription Line with quantity of 1 in the billing period. The price is calculated from Base Price and Base Price %.';
Editable = false;
BlankZero = true;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Price (LCY)"; ServiceCommitment."Price (LCY)")
{
Expand All @@ -202,6 +211,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
AutoFormatType = 2;
AutoFormatExpression = '';

trigger OnValidate()
begin
Expand All @@ -217,6 +228,8 @@ page 8068 "Customer Contract Line Subp."
MaxValue = 100;
Editable = (not IsCommentLineEditable) and (not IsDiscountLine);
Enabled = (not IsCommentLineEditable) and (not IsDiscountLine);
DecimalPlaces = 0 : 5;
AutoFormatType = 0;

trigger OnValidate()
begin
Expand All @@ -231,6 +244,8 @@ page 8068 "Customer Contract Line Subp."
MinValue = 0;
Editable = (not IsCommentLineEditable) and (not IsDiscountLine);
Enabled = (not IsCommentLineEditable) and (not IsDiscountLine);
AutoFormatType = 1;
AutoFormatExpression = ServiceCommitment."Currency Code";

trigger OnValidate()
begin
Expand All @@ -245,6 +260,9 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = (not IsCommentLineEditable) and (not IsDiscountLine);
Enabled = (not IsCommentLineEditable) and (not IsDiscountLine);
AutoFormatType = 1;
AutoFormatExpression = '';

trigger OnValidate()
begin
UpdateServiceCommitmentOnPage(ServiceCommitment.FieldNo("Discount Amount (LCY)"));
Expand All @@ -257,6 +275,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
AutoFormatType = 1;
AutoFormatExpression = ServiceCommitment."Currency Code";

trigger OnValidate()
begin
Expand All @@ -271,6 +291,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
AutoFormatType = 1;
AutoFormatExpression = '';

trigger OnValidate()
begin
Expand Down Expand Up @@ -445,6 +467,8 @@ page 8068 "Customer Contract Line Subp."
BlankZero = true;
Editable = not IsCommentLineEditable;
Enabled = not IsCommentLineEditable;
DecimalPlaces = 0 : 15;
AutoFormatType = 0;

trigger OnValidate()
begin
Expand Down
10 changes: 10 additions & 0 deletions src/Apps/W1/Subscription Billing/App/Customer Contracts/Pages/CustomerContractLines.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ page 8075 "Customer Contract Lines"
ToolTip = 'Specifies the price of the Subscription Line with quantity of 1 in the billing period. The price is calculated from Base Price and Base Price %.';
Editable = false;
BlankZero = true;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Discount %"; ServiceCommitment."Discount %")
{
Expand All @@ -121,12 +123,16 @@ page 8075 "Customer Contract Lines"
ToolTip = 'Specifies the amount of the discount for the Subscription Line.';
BlankZero = true;
MinValue = 0;
AutoFormatType = 1;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Service Amount"; ServiceCommitment.Amount)
{
Caption = 'Amount';
ToolTip = 'Specifies the amount for the Subscription Line including discount.';
BlankZero = true;
AutoFormatType = 1;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Next Billing Date"; ServiceCommitment."Next Billing Date")
{
Expand All @@ -141,13 +147,17 @@ page 8075 "Customer Contract Lines"
Caption = 'Calculation Base Amount';
ToolTip = 'Specifies the base amount from which the price will be calculated.';
BlankZero = true;
AutoFormatType = 2;
AutoFormatExpression = ServiceCommitment."Currency Code";
}
field("Calculation Base %"; ServiceCommitment."Calculation Base %")
{
MinValue = 0;
Caption = 'Calculation Base %';
ToolTip = 'Specifies the percent at which the price of the Subscription Line will be calculated. 100% means that the price corresponds to the Base Price.';
BlankZero = true;
DecimalPlaces = 0 : 5;
AutoFormatType = 0;
}
field("Billing Base Period"; ServiceCommitment."Billing Base Period")
{
Expand Down
2 changes: 1 addition & 1 deletion src/Apps/W1/Subscription Billing/App/Import/Tables/ImportedSubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ table 8009 "Imported Subscription Line"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";
}
field(16; "Calculation Base %"; Decimal)
Expand Down
4 changes: 2 additions & 2 deletions ...W1/Subscription Billing/App/Sales Service Commitments/Tables/SalesSubLineArchive.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ table 8069 "Sales Sub. Line Archive"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";
}
field(16; "Calculation Base %"; Decimal)
Expand All @@ -95,7 +95,7 @@ table 8069 "Sales Sub. Line Archive"
MinValue = 0;
MaxValue = 100;
BlankZero = true;
DecimalPlaces = 0 : 2;
DecimalPlaces = 0 : 5;
AutoFormatType = 0;
}
field(19; "Discount Amount"; Decimal)
Expand Down
2 changes: 1 addition & 1 deletion .../Subscription Billing/App/Sales Service Commitments/Tables/SalesSubscriptionLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ table 8068 "Sales Subscription Line"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";

trigger OnValidate()
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -83,7 +83,7 @@ table 8059 "Subscription Line"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";

trigger OnValidate()
Expand Down
2 changes: 1 addition & 1 deletion ...s/W1/Subscription Billing/App/Service Commitments/Tables/SubscriptionLineArchive.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ table 8073 "Subscription Line Archive"
Caption = 'Calculation Base Amount';
MinValue = 0;
BlankZero = true;
AutoFormatType = 1;
AutoFormatType = 2;
AutoFormatExpression = Rec."Currency Code";
}
field(12; "Calculation Base %"; Decimal)
Expand Down
Loading