Merge branch 'master' into 2145780

Author: tapanm-MSFT

powerapps-docs/developer/data-platform/configure-entity-relationship-cascading-behavior.md

@@ -50,8 +50,9 @@ The `CascadeConfiguration` (<xref:Microsoft.Xrm.Sdk.Metadata.CascadeConfiguratio
 |UserOwned|Cascade User Owned|Perform the action on all referencing table records owned by the same user as the referenced table record.|  
 
 >[!NOTE]
-> Cascading actions on Active records will only include records that have a Status Code of Active. Any other solution provided or custom status 
-> codes that indicate a record as live and in use will not be processed as an Active record for cascading purposes.
+> Cascading actions on active records will only include records that have a state code of "Active" and a status code of "Open". 
+> If custom status and state code labels are being used, this is the same as `statecode` value=0 and `statuscode` value=1 in most cases. 
+> Any other solution provided or custom status codes with values other than the above will not be processed as an active record for cascading purposes.
 
 
  The `CascadeConfiguration` (<xref:Microsoft.Xrm.Sdk.Metadata.CascadeConfiguration> class or <xref href="Microsoft.Dynamics.CRM.CascadeConfiguration?text=CascadeConfiguration ComplexType" />) contains the following properties representing actions that may be performed on the referenced table in the one-to-many relationship.  

powerapps-docs/developer/model-driven-apps/TOC.yml

@@ -6,17 +6,17 @@
   href: supported-customizations.md
 - name: Design app interface using code
   items:
-  - name: Customize entity forms
+  - name: Customize forms
     href: customize-entity-forms.md
     items:
     - name: Use IFRAME and web resource controls on a form
       href: use-iframe-and-web-resource-controls-on-a-form.md
-  - name: Customize entity views
+  - name: Customize views
     href: customize-entity-views.md
   - name: Open forms, views, dialogs, and reports with a URL
     href: open-forms-views-dialogs-reports-url.md
     items:
-    - name: Set field values using parameters passed to a form
+    - name: Set column values using parameters passed to a form
       href: set-field-values-using-parameters-passed-form.md
     - name: Configure a form to accept custom querystring parameters
       href: configure-form-accept-custom-querystring-parameters.md
@@ -81,7 +81,7 @@
     - name: Client-side events
       href: clientapi/reference/events.md
       items:
-      - name: Attribute OnChange event
+      - name: Column OnChange event
         href: clientapi/reference/events/attribute-onchange.md
       - name: Form OnLoad event
         href: clientapi/reference/events/form-onload.md

powerapps-docs/developer/model-driven-apps/clientapi/clientapi-form-context.md

@@ -1,6 +1,7 @@
 ---
 title: "Client API form context in model-driven apps| MicrosoftDocs"
-ms.date: 04/10/2019
+description: The Client API form context (**formContext**) provides a reference to the form or to an item on the form, such as, a quick view control or a row in an editable grid, against which the current code is executed.
+ms.date: 04/15/2021
 ms.service: powerapps
 ms.topic: "conceptual"
 applies_to: 
@@ -17,8 +18,6 @@ search.app:
 ---
 # Client API form context
 
-
-
 The Client API form context (**formContext**) provides a reference to the form or to an item on the form, such as, a quick view control or a row in an editable grid, against which the current code is executed.
 
 Earlier, the global **Xrm.Page** object was used to represent a form or an item on the form. With the latest version, the **Xrm.Page** object is [deprecated](/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated), and you should use the [getFormContext](reference/executioncontext/getFormContext.md) method of the passed in execution context object to return reference to the appropriate form or an item on the form. 
@@ -62,19 +61,20 @@ Use the **data** and **ui** objects under the **formContext** object to programm
 
 ![formContext object model](../media/ClientAPI-formContextModel.png)
 
-### data object
+[!INCLUDE[cc-terminology](../../data-platform/includes/cc-terminology.md)]
 
+### data object
 
-Provides properties and methods to work with the data on a form, including entity data and data in the business process flow control. Contains the following objects:
+Provides properties and methods to work with the data on a form, including table data and data in the business process flow control. Contains the following objects:
 
 
 | **Object**  | **Description**|
 |--|--|
-|attributes|Collection of non-entity data on the form. Items in this collection are of the same type as the attributes collection, but they are not attributes of the form entity. <br/>More information: [Collections](collections.md)|
-|entity|Provides methods to retrieve information specific to the record displayed on the page, the save method, and a collection of all the attributes included on the form. Attribute data is limited to attributes represented by fields on the form. <br/>More information: [formContext.data.entity](formContext-data-entity.md)|
-|process|Provides objects and methods to interact with the business process flow data on a form.<br/>More information: [formContext.data.process](formContext-data-process.md)|
+|attributes|Collection of non-table data on the form. Items in this collection are of the same type as the column collection, but they are not columns of the form table. <br/>More information: [Collections](reference/collections.md)|
+|entity|Provides methods to retrieve information specific to the record displayed on the page, the save method, and a collection of all the columns included on the form. Column data is limited to columns represented on the form. <br/>More information: [formContext.data.entity](reference/formContext-data-entity.md)|
+|process|Provides objects and methods to interact with the business process flow data on a form.<br/>More information: [formContext.data.process](reference/formContext-data-process.md)|
 
-It also provides an **attributes** collection for accessing non-entity bound control. See the **Collections in the formContext object model** section later in this topic.
+It also provides an **attributes** collection for accessing non-table bound control. See the **Collections in the formContext object model** section later in this topic.
 
 More information: [formContext.data](reference/formContext-data.md) 
 
@@ -99,10 +99,10 @@ reference)](reference/collections.md).
 
 | **Collection**  | **Description**|
 |-----------------|----------------|
-| [attributes](reference/attributes.md)  | Two objects contain an attributes collection:<br/><br/>- **formContext.data.attributes** collection provides access to non-entity bound attributes.<br/><br/>- **formContext.data.entity.attributes** collection provides access to each entity attribute that is available on the form. Only those attributes that correspond to fields added to the form are available.| 
-| [controls](reference/controls.md)  | Three objects contain a controls collection:<br/><br/> - **formContext.ui.controls**: Provides access to each control present on the form.<br/><br/>- **formContext.data.entity.attribute.controls**: Because an attribute may have more than one control on the form, this collection provides access to each of them. This collection will contain only one item unless multiple controls for the attribute are added to the form.<br/><br/>- **formContext.ui.tabs.sections.controls**: This collection only contains the controls found in the section.|
+| [attributes](reference/attributes.md)  | Two objects contain a column collection:<br/><br/>- **formContext.data.attributes** collection provides access to non-table bound columns.<br/><br/>- **formContext.data.entity.attributes** collection provides access to each table column that is available on the form. Only those columns added to the form are available.| 
+| [controls](reference/controls.md)  | Three objects contain a controls collection:<br/><br/> - **formContext.ui.controls**: Provides access to each control present on the form.<br/><br/>- **formContext.data.entity.attribute.controls**: Because a column may have more than one control on the form, this collection provides access to each of them. This collection will contain only one item unless multiple controls for the column are added to the form.<br/><br/>- **formContext.ui.tabs.sections.controls**: This collection only contains the controls found in the section.|
 |**formContext.data.process.**[stages](reference/formContext-data-process/process/getStages.md) and **formContext.data.process**.[steps](reference/formContext-data-process/stage/getSteps.md)| Provides access to stages and steps collection in a business process flow. These also allow for adding and removing of items from the collection.|
-|**formContext.ui.formSelector.**[items](reference/formContext-ui-formselector.md)|When multiple forms are provided for an entity, you can associate each form with security roles. When the security roles associated with a user enable them to see more than one form, the **formContext.ui.formSelector.items** collection provides access to each form definition available to that user.|
+|**formContext.ui.formSelector.**[items](reference/formContext-ui-formselector.md)|When multiple forms are provided for a table, you can associate each form with security roles. When the security roles associated with a user enable them to see more than one form, the **formContext.ui.formSelector.items** collection provides access to each form definition available to that user.|
 |**formContext.ui.navigation.**[items](reference/formContext-ui-navigation.md)|The **formContext.ui.navigation.items** collection provides access to navigation items that are defined using the navigation area of the form editor. People navigate to these using the command bar.|
 | **formContext.ui.**[quickForms](reference/formContext-ui-quickForms.md) | Provides methods to access all the quick view controls and its constituent controls on the Customer Enagagement forms.| **Xrm.Page.ui.tabs** collection provides access to each of these tabs.|
 | **formContext.ui.**[tabs](reference/formContext-ui-tabs.md) | You can organize each form by using one or more tabs. This collection provides access to each of these tabs.|

powerapps-docs/developer/model-driven-apps/clientapi/events-forms-grids.md

@@ -1,6 +1,7 @@
 ---
 title: "Events in forms and grids in model-driven apps| MicrosoftDocs"
-ms.date: 01/13/2021
+description: All client-side code is initiated by events. In model-driven apps, you associate a specific function in a JavaScript library to be executed when an event occurs. This function is called an *event handler*.
+ms.date: 04/15/2021
 ms.service: powerapps
 ms.topic: "reference"
 ms.assetid: 9fb38429-55ef-45ce-a3a3-e649e1be89d0
@@ -19,6 +20,8 @@ All client-side code is initiated by events. In model-driven apps, you associate
 
 You can associate event handlers to only some events using the UI. For events that are not available to be associated through UI, Client API provides methods that can be used to attach event handlers to such events. 
 
+[!INCLUDE[cc-terminology](../../data-platform/includes/cc-terminology.md)]
+
 ## Add or remove event handler function to event using UI
 
 ### [Legacy](#tab/add-event-handlers-legacy)

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Utility/getGlobalContext/organizationSettings.md

@@ -128,6 +128,34 @@ Returns the ID of the current organization.
 
 **Description**: Id of the current organization.
 
+## isTrialOrganization
+
+Returns a boolean indicating whether the organization is a trial organization.
+
+### Syntax
+
+`organizationSettings.isTrialOrganization`
+
+### Return Value
+
+**Type**: Boolean
+
+**Description**: **true** if the organization is a trial organization; **false** otherwise.
+
+## organizationExpiryDate
+
+Returns the expiry date of the current organization if it is a trial organization.
+
+### Syntax
+
+`organizationSettings.organizationExpiryDate`
+
+### Return Value
+
+**Type**: Date
+
+**Description**: Returns a `Date` object with the organization's expiry date if it is a trial organizaiton. Returns NULL if the organization is not a trial organization.
+
 ## uniqueName 
 
 Returns the unique name of the current organization.

powerapps-docs/developer/model-driven-apps/clientapi/reference/attributes.md

@@ -1,6 +1,6 @@
 ---
-title: "Attributes in model-driven apps| MicrosoftDocs"
-description: "Learn about working with attributes in model-driven apps using client API."
+title: "Columns in model-driven apps| MicrosoftDocs"
+description: "Learn about working with columns in model-driven apps using client API."
 ms.date: 10/31/2018
 ms.service: powerapps
 ms.topic: "reference"
@@ -15,19 +15,19 @@ search.app:
   - PowerApps
   - D365CE
 ---
-# Attributes (Client API reference)
+# Columns (Client API reference)
 
+Columns contain data in the model-driven apps form or grids. Use the `formContext.data.entity.attributes` collection or the `formContext.getAttribute` shortcut method to access a collection of columns. For more information about collections, see [Collections (Client API reference)](collections.md). 
 
+To access a column within the collection, you pass either the name (string) or the index value (number) of the column as an argument to the method. For example: `formContext.getAttribute(arg)`
 
-Attributes contain data in the model-driven apps form or grids. Use the `formContext.data.entity.attributes` collection or the `formContext.getAttribute` shortcut method to access a collection of attributes. For more information about collections, see [Collections (Client API reference)](collections.md). 
+Columns are categorized by type. You can determine the type of the column by using the [getAttributeType](attributes/getAttributeType.md) method. Certain column methods are only available for specific types of columns.
 
-To access an attribute within the collection, you pass either the name (string) or the index value (number) of the attribute as an argument to the method. For example: `formContext.getAttribute(arg)`
+[!INCLUDE[cc-terminology](../../../data-platform/includes/cc-terminology.md)]
 
-Attributes are categorized by type. You can determine the type of an attribute by using the [getAttributeType](attributes/getAttributeType.md) method. Certain attribute methods are only available for specific types of attributes.
+This topic provides information about the methods available per column type. 
 
-This topic provides information about the methods available per attribute type. 
-
-## All attribute types
+## All column types
 
 <table>
 <tr>
@@ -66,20 +66,20 @@ This topic provides information about the methods available per attribute type.
 </table>
 
 
-## Boolean attribute type
+## Boolean column type
 
-In addition to the methods available for all attribute types as explained earlier, the following method is available only for the **boolean** attribute:
+In addition to the methods available for all column types as explained earlier, the following method is available only for the **boolean** column:
 
 - [getInitialValue](attributes/getInitialValue.md)
 
-## Lookup attribute type
-In addition to the methods available for all attribute types as explained earlier, the following method is available only for the **lookup** attribute:
+## Lookup column type
+In addition to the methods available for all column types as explained earlier, the following method is available only for the **lookup** column:
 
 - [getIsPartyList](attributes/getIsPartyList.md)
 
-## MultiSelectOptionSet and OptionSet attribute types
+## Choices and choice column types
 
-In addition to the methods available for all attribute types as explained earlier, the following methods are available only for the **multiselectoption** and **optionset** attributes:
+In addition to the methods available for all column types as explained earlier, the following methods are available only for the **choices** and **choice** columns:
 
 <table>
 <tr>
@@ -95,8 +95,9 @@ In addition to the methods available for all attribute types as explained earlie
 </tr>
 </table>
 
-## Number attribute type (decimal, double, integer, money)
-The following methods are available only for the **decimal**,  **double**, and **integer** attributes:
+## Number column type (decimal, double, integer, money)
+
+The following methods are available only for the **decimal**,  **double**, and **integer** columns:
 
 <table>
 <tr>
@@ -111,18 +112,16 @@ The following methods are available only for the **decimal**,  **double**, and *
 </tr>
 </table>
 
-## String attribute type
-In addition to the methods available for all attribute types as explained earlier, the following method is available only for the **string** attribute:
+## String column type
+In addition to the methods available for all column types as explained earlier, the following method is available only for the **string** column:
 
 - [getMaxLength](attributes/getMaxLength.md)
 
 
 ### Related topics
 
-[Composite attributes](composite-attributes.md)
-
-[Understand Xrm object model](../understand-clientapi-object-model.md)
-
+[Composite columns](composite-attributes.md)<br/>
+[Understand Xrm object model](../understand-clientapi-object-model.md)<br/>
 [Controls (Client API reference)](controls.md)
 
 

powerapps-docs/developer/model-driven-apps/clientapi/reference/attributes/getIsPartyList.md

@@ -1,6 +1,7 @@
 ---
 title: "getIsPartyList (Client API reference)| MicrosoftDocs"
-ms.date: 10/31/2018
+description: Returns a boolean value indicating whether the lookup represents a partylist lookup.
+ms.date: 04/15/2021
 ms.service: powerapps
 ms.topic: "reference"
 applies_to: "Dynamics 365 (online)"
@@ -16,23 +17,23 @@ search.app:
 ---
 # getIsPartyList (Client API reference)
 
+Returns a Boolean value indicating whether the lookup represents a partylist lookup. Partylist lookups allow for multiple records to be set, such as the **To:** column for an email table record.
 
-
-Returns a Boolean value indicating whether the lookup represents a partylist lookup. Partylist lookups allow for multiple records to be set, such as the **To:** field for an email entity record.
-
-## Attribute types supported
+## Column types supported
 
 Lookup
 
 ## Syntax
 
 `formContext.getAttribute(arg).getIsPartyList()`
 
+[!INCLUDE[cc-terminology](../../../../data-platform/includes/cc-terminology.md)]
+
 ## Return Value
 
 **Type**: Boolean. 
 
-**Description**: True if the lookup attribute is a partylist, otherwise false.
+**Description**: True if the lookup column is a partylist, otherwise false.
 
 
 

powerapps-docs/developer/model-driven-apps/clientapi/reference/attributes/getParent.md

@@ -1,6 +1,7 @@
 ---
 title: "getParent (Client API reference)| MicrosoftDocs"
-ms.date: 10/31/2018
+description: Returns the formContext.data.entity object that is the parent to all the columns.
+ms.date: 04/15/2021
 ms.service: powerapps
 ms.topic: "reference"
 applies_to: "Dynamics 365 (online)"
@@ -16,18 +17,18 @@ search.app:
 ---
 # getParent (Client API reference)
 
+Returns the `formContext.data.entity` object that is the parent to all the columns. 
 
-
-Returns the `formContext.data.entity` object that is the parent to all attributes. 
-
-## Attribute types supported
+## Column types supported
 
 All
 
 ## Syntax
 
 `formContext.getAttribute(arg).getParent()`
 
+[!INCLUDE[cc-terminology](../../../../data-platform/includes/cc-terminology.md)]
+
 ## Return Value
 
 **Type**: `formContext.data.entity` object.