From c3a1fa7a9fcbf9c287776255811c4c6e6e1d7e8f Mon Sep 17 00:00:00 2001 From: Franco111000 Date: Sun, 5 Jul 2026 12:04:34 +0200 Subject: [PATCH 1/2] Align Bill-to Name 2 editability with the other bill-to address fields on sales documents The Bill-to Name 2 field on Sales Order, Sales Quote, Blanket Sales Order, and Sales Invoice was only editable with the Another Customer bill-to option. Every other field in the bill-to address group is editable when Custom Address is selected or when the bill-to customer differs from the sell-to customer. The field was missed when that editability logic was applied to the group. The same correction is propagated to the country layers that carry copies of these pages (APAC, BE, CH, ES, FR, GB, IT, NA, NL, NO, RU), and the existing bill-to editability tests now cover the field. --- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../APAC/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../BE/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../BE/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../CH/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../CH/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../CH/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../ES/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../ES/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../ES/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../FR/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../FR/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../IT/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../IT/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../IT/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../NA/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../NA/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../NA/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../NL/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../NL/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../NL/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../NO/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../NO/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../RU/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../RU/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../RU/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../BaseApp/Sales/Document/BlanketSalesOrder.Page.al | 4 ++-- .../W1/BaseApp/Sales/Document/SalesInvoice.Page.al | 4 ++-- .../W1/BaseApp/Sales/Document/SalesOrder.Page.al | 4 ++-- .../W1/BaseApp/Sales/Document/SalesQuote.Page.al | 4 ++-- .../W1/Tests/Misc/UTPageActionsControls.Codeunit.al | 12 ++++++++---- 38 files changed, 82 insertions(+), 78 deletions(-) diff --git a/src/Layers/APAC/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/APAC/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 46fd44bc39..86b8b365b2 100644 --- a/src/Layers/APAC/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/APAC/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -627,8 +627,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/APAC/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/APAC/BaseApp/Sales/Document/SalesInvoice.Page.al index 6c746c153c..bf0f561dcc 100644 --- a/src/Layers/APAC/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/APAC/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -817,8 +817,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/BE/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/BE/BaseApp/Sales/Document/SalesInvoice.Page.al index b97bf53762..5fc8ce2c6f 100644 --- a/src/Layers/BE/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/BE/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -823,8 +823,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/BE/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/BE/BaseApp/Sales/Document/SalesOrder.Page.al index 48d46aeb8c..d2671549ed 100644 --- a/src/Layers/BE/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/BE/BaseApp/Sales/Document/SalesOrder.Page.al @@ -838,8 +838,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/CH/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/CH/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 7d51acdca5..678448de4e 100644 --- a/src/Layers/CH/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/CH/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -663,8 +663,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/CH/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/CH/BaseApp/Sales/Document/SalesInvoice.Page.al index 40b07303f9..ca19b6a7a3 100644 --- a/src/Layers/CH/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/CH/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -817,8 +817,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/CH/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/CH/BaseApp/Sales/Document/SalesOrder.Page.al index 695f7799d2..13516d3423 100644 --- a/src/Layers/CH/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/CH/BaseApp/Sales/Document/SalesOrder.Page.al @@ -833,8 +833,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/CH/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/CH/BaseApp/Sales/Document/SalesQuote.Page.al index 3c144b2264..16dffbf082 100644 --- a/src/Layers/CH/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/CH/BaseApp/Sales/Document/SalesQuote.Page.al @@ -797,8 +797,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/ES/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/ES/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index c87cc9e896..ac424c47df 100644 --- a/src/Layers/ES/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/ES/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -638,8 +638,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/ES/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/ES/BaseApp/Sales/Document/SalesInvoice.Page.al index 5a49bdf7f2..20d9eac5f5 100644 --- a/src/Layers/ES/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/ES/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -845,8 +845,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/ES/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/ES/BaseApp/Sales/Document/SalesOrder.Page.al index 5c7f64678f..5b6994d98b 100644 --- a/src/Layers/ES/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/ES/BaseApp/Sales/Document/SalesOrder.Page.al @@ -844,8 +844,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/ES/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/ES/BaseApp/Sales/Document/SalesQuote.Page.al index 3542c159bc..ecc311553c 100644 --- a/src/Layers/ES/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/ES/BaseApp/Sales/Document/SalesQuote.Page.al @@ -810,8 +810,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/FR/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/FR/BaseApp/Sales/Document/SalesInvoice.Page.al index d4db1e9071..beadc0f20b 100644 --- a/src/Layers/FR/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/FR/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -822,8 +822,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/FR/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/FR/BaseApp/Sales/Document/SalesOrder.Page.al index 7b23fdeb97..8c7a87d368 100644 --- a/src/Layers/FR/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/FR/BaseApp/Sales/Document/SalesOrder.Page.al @@ -838,8 +838,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/GB/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/GB/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 54f5974371..02a3d8d566 100644 --- a/src/Layers/GB/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/GB/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -629,8 +629,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/IT/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/IT/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index d4f9a7deb9..f5eb1b55da 100644 --- a/src/Layers/IT/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/IT/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -668,8 +668,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/IT/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/IT/BaseApp/Sales/Document/SalesInvoice.Page.al index efe5bb32dc..98664e09f6 100644 --- a/src/Layers/IT/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/IT/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -887,8 +887,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/IT/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/IT/BaseApp/Sales/Document/SalesOrder.Page.al index f0f738c376..681077dcc7 100644 --- a/src/Layers/IT/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/IT/BaseApp/Sales/Document/SalesOrder.Page.al @@ -916,8 +916,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/IT/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/IT/BaseApp/Sales/Document/SalesQuote.Page.al index d954404705..fb523ee21b 100644 --- a/src/Layers/IT/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/IT/BaseApp/Sales/Document/SalesQuote.Page.al @@ -806,8 +806,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NA/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/NA/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index f353f7ea30..c8176d710c 100644 --- a/src/Layers/NA/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/NA/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -638,8 +638,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NA/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/NA/BaseApp/Sales/Document/SalesInvoice.Page.al index 880f06e8ae..13d6640ef8 100644 --- a/src/Layers/NA/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/NA/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -874,8 +874,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NA/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/NA/BaseApp/Sales/Document/SalesOrder.Page.al index 678aeb12b4..471124f0b9 100644 --- a/src/Layers/NA/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/NA/BaseApp/Sales/Document/SalesOrder.Page.al @@ -891,8 +891,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NA/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/NA/BaseApp/Sales/Document/SalesQuote.Page.al index aade6ec79e..42f68dfe9d 100644 --- a/src/Layers/NA/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/NA/BaseApp/Sales/Document/SalesQuote.Page.al @@ -803,8 +803,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NL/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/NL/BaseApp/Sales/Document/SalesInvoice.Page.al index 082a6ad083..546dcdefb7 100644 --- a/src/Layers/NL/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/NL/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -827,8 +827,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NL/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/NL/BaseApp/Sales/Document/SalesOrder.Page.al index a432585eaf..6c7fcce822 100644 --- a/src/Layers/NL/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/NL/BaseApp/Sales/Document/SalesOrder.Page.al @@ -842,8 +842,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NL/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/NL/BaseApp/Sales/Document/SalesQuote.Page.al index 3dad2ccd45..d102d7cbf9 100644 --- a/src/Layers/NL/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/NL/BaseApp/Sales/Document/SalesQuote.Page.al @@ -807,8 +807,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NO/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/NO/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 91fe4373f7..b1ed6a734d 100644 --- a/src/Layers/NO/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/NO/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -673,8 +673,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NO/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/NO/BaseApp/Sales/Document/SalesInvoice.Page.al index e5596d4712..6e3e2094a7 100644 --- a/src/Layers/NO/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/NO/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -821,8 +821,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/NO/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/NO/BaseApp/Sales/Document/SalesOrder.Page.al index 53d54646d1..a0eb41bbab 100644 --- a/src/Layers/NO/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/NO/BaseApp/Sales/Document/SalesOrder.Page.al @@ -833,8 +833,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/RU/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/RU/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 64d375674c..bac5b45fbe 100644 --- a/src/Layers/RU/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/RU/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -671,8 +671,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/RU/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/RU/BaseApp/Sales/Document/SalesInvoice.Page.al index d783f4ef08..c102a9f798 100644 --- a/src/Layers/RU/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/RU/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -842,8 +842,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/RU/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/RU/BaseApp/Sales/Document/SalesOrder.Page.al index e8d297b3a4..e118ed1059 100644 --- a/src/Layers/RU/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/RU/BaseApp/Sales/Document/SalesOrder.Page.al @@ -866,8 +866,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/RU/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/RU/BaseApp/Sales/Document/SalesQuote.Page.al index 8524c8c878..37e4012e4e 100644 --- a/src/Layers/RU/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/RU/BaseApp/Sales/Document/SalesQuote.Page.al @@ -807,8 +807,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/W1/BaseApp/Sales/Document/BlanketSalesOrder.Page.al b/src/Layers/W1/BaseApp/Sales/Document/BlanketSalesOrder.Page.al index 43a946eef6..e145cd508d 100644 --- a/src/Layers/W1/BaseApp/Sales/Document/BlanketSalesOrder.Page.al +++ b/src/Layers/W1/BaseApp/Sales/Document/BlanketSalesOrder.Page.al @@ -663,8 +663,8 @@ page 507 "Blanket Sales Order" { ApplicationArea = Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/W1/BaseApp/Sales/Document/SalesInvoice.Page.al b/src/Layers/W1/BaseApp/Sales/Document/SalesInvoice.Page.al index 03439b63c5..11b8c656ae 100644 --- a/src/Layers/W1/BaseApp/Sales/Document/SalesInvoice.Page.al +++ b/src/Layers/W1/BaseApp/Sales/Document/SalesInvoice.Page.al @@ -817,8 +817,8 @@ page 43 "Sales Invoice" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/W1/BaseApp/Sales/Document/SalesOrder.Page.al b/src/Layers/W1/BaseApp/Sales/Document/SalesOrder.Page.al index 2c72c6383e..884e7c74b3 100644 --- a/src/Layers/W1/BaseApp/Sales/Document/SalesOrder.Page.al +++ b/src/Layers/W1/BaseApp/Sales/Document/SalesOrder.Page.al @@ -832,8 +832,8 @@ page 42 "Sales Order" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = (BillToOptions = BillToOptions::"Another Customer"); - Enabled = (BillToOptions = BillToOptions::"Another Customer"); + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/W1/BaseApp/Sales/Document/SalesQuote.Page.al b/src/Layers/W1/BaseApp/Sales/Document/SalesQuote.Page.al index 8d47ca5826..0f85b607c0 100644 --- a/src/Layers/W1/BaseApp/Sales/Document/SalesQuote.Page.al +++ b/src/Layers/W1/BaseApp/Sales/Document/SalesQuote.Page.al @@ -797,8 +797,8 @@ page 41 "Sales Quote" { ApplicationArea = Basic, Suite; Caption = 'Name 2'; - Editable = BillToOptions = BillToOptions::"Another Customer"; - Enabled = BillToOptions = BillToOptions::"Another Customer"; + Editable = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); + Enabled = (BillToOptions = BillToOptions::"Custom Address") or (Rec."Bill-to Customer No." <> Rec."Sell-to Customer No."); Importance = Additional; QuickEntry = false; Visible = false; diff --git a/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al b/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al index c0135810d3..28957937e7 100644 --- a/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al +++ b/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al @@ -3406,7 +3406,8 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesQuotePage."Bill-to Name".Editable(), ''); - Assert.IsTrue(SalesQuotePage."Bill-to Address".Editable() and + Assert.IsTrue(SalesQuotePage."Bill-to Name 2".Editable() and + SalesQuotePage."Bill-to Address".Editable() and SalesQuotePage."Bill-to Address 2".Editable() and SalesQuotePage."Bill-to City".Editable() and SalesQuotePage."Bill-to County".Editable() and @@ -3437,7 +3438,8 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesOrderPage."Bill-to Name".Editable(), ''); - Assert.IsTrue(SalesOrderPage."Bill-to Address".Editable() and + Assert.IsTrue(SalesOrderPage."Bill-to Name 2".Editable() and + SalesOrderPage."Bill-to Address".Editable() and SalesOrderPage."Bill-to Address 2".Editable() and SalesOrderPage."Bill-to City".Editable() and SalesOrderPage."Bill-to County".Editable() and @@ -3468,7 +3470,8 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesInvoicePage."Bill-to Name".Editable(), ''); - Assert.IsTrue(SalesInvoicePage."Bill-to Address".Editable() and + Assert.IsTrue(SalesInvoicePage."Bill-to Name 2".Editable() and + SalesInvoicePage."Bill-to Address".Editable() and SalesInvoicePage."Bill-to Address 2".Editable() and SalesInvoicePage."Bill-to City".Editable() and SalesInvoicePage."Bill-to County".Editable() and @@ -3500,7 +3503,8 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(BlanketSalesOrderPage."Bill-to Name".Editable(), ''); - Assert.IsTrue(BlanketSalesOrderPage."Bill-to Address".Editable() and + Assert.IsTrue(BlanketSalesOrderPage."Bill-to Name 2".Editable() and + BlanketSalesOrderPage."Bill-to Address".Editable() and BlanketSalesOrderPage."Bill-to Address 2".Editable() and BlanketSalesOrderPage."Bill-to City".Editable() and BlanketSalesOrderPage."Bill-to Post Code".Editable() and From 14decc6b19cdb2975ffa1baa2fd2c0a1309a5024 Mon Sep 17 00:00:00 2001 From: Franco111000 Date: Tue, 7 Jul 2026 14:21:29 +0200 Subject: [PATCH 2/2] Assert Enabled state for Bill-to Name 2 in the bill-to editability tests Review feedback: the change touches both Editable and Enabled, so the four extended tests now assert both states for the field. --- src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al b/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al index 28957937e7..9c599268ce 100644 --- a/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al +++ b/src/Layers/W1/Tests/Misc/UTPageActionsControls.Codeunit.al @@ -3407,6 +3407,7 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesQuotePage."Bill-to Name".Editable(), ''); Assert.IsTrue(SalesQuotePage."Bill-to Name 2".Editable() and + SalesQuotePage."Bill-to Name 2".Enabled() and SalesQuotePage."Bill-to Address".Editable() and SalesQuotePage."Bill-to Address 2".Editable() and SalesQuotePage."Bill-to City".Editable() and @@ -3439,6 +3440,7 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesOrderPage."Bill-to Name".Editable(), ''); Assert.IsTrue(SalesOrderPage."Bill-to Name 2".Editable() and + SalesOrderPage."Bill-to Name 2".Enabled() and SalesOrderPage."Bill-to Address".Editable() and SalesOrderPage."Bill-to Address 2".Editable() and SalesOrderPage."Bill-to City".Editable() and @@ -3471,6 +3473,7 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(SalesInvoicePage."Bill-to Name".Editable(), ''); Assert.IsTrue(SalesInvoicePage."Bill-to Name 2".Editable() and + SalesInvoicePage."Bill-to Name 2".Enabled() and SalesInvoicePage."Bill-to Address".Editable() and SalesInvoicePage."Bill-to Address 2".Editable() and SalesInvoicePage."Bill-to City".Editable() and @@ -3504,6 +3507,7 @@ codeunit 134341 "UT Page Actions & Controls" // [THEN] Bill-to address fields are editable, and "Bill-to Name" field is not Assert.IsFalse(BlanketSalesOrderPage."Bill-to Name".Editable(), ''); Assert.IsTrue(BlanketSalesOrderPage."Bill-to Name 2".Editable() and + BlanketSalesOrderPage."Bill-to Name 2".Enabled() and BlanketSalesOrderPage."Bill-to Address".Editable() and BlanketSalesOrderPage."Bill-to Address 2".Editable() and BlanketSalesOrderPage."Bill-to City".Editable() and