Merge branch 'live' into shubham1172/time-zone-entities

Author: phecke

powerapps-docs/developer/common-data-service/use-webhooks.md

@@ -2,7 +2,7 @@
 title: "Use webhooks to create external handlers for server events (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "You can send data about events that occur on the server to a web application using webhooks. Webhooks is a lightweight HTTP pattern for connecting Web APIs and services with a publish/subscribe model. webhook senders notify receivers about events by making requests to receiver endpoints with some information about the events." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 09/04/2019
+ms.date: 08/29/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -74,8 +74,7 @@ Other data you can expect to find passed to your service is in the table below:
 
 |Key|Value Description|
 |---------|---------|
-|`x-request-id`|A unique identifier for the request|
-|`x-ms-dynamics-organization`|The name of the tenant sending the request|
+|`x-ms-dynamics-organization`|The ___domain name of the environment sending the request|
 |`x-ms-dynamics-entity-name`|The logical name of the entity passed in the execution context data.|
 |`x-ms-dynamics-request-name`|The name of the Event that the webhook step was registered for.|
 |`x-ms-correlation-request-id`|Unique identifier for tracking any type of extension. This property is used by the platform for infinite loop prevention. In most cases, this property can be ignored. This value may be used when working with technical support because it can be used to query telemetry to understand what occurred during the entire operation.

powerapps-docs/developer/common-data-service/webapi/setup-postman-environment.md

@@ -10,9 +10,9 @@ ms.tgt_pltfrm:
 ms.topic: article
 ms.assetid: 955BA444-A53D-4843-9429-833B1636E2B4
 caps.latest.revision: 7
-author: susikka
-ms.author: susikka
-manager: shujoshi
+author: JimDaly
+ms.author: jdaly
+manager: ryjones
 search.audienceType: 
   - developer
 search.app: 

powerapps-docs/developer/model-driven-apps/clientapi/reference/formContext-data-process/setActiveProcessInstance.md

@@ -28,7 +28,7 @@ search.app:
 
 |Name|Type|Required|Description|
 |--|--|--|--|
-|processId|String|Yes|The Id of the process instance to set as the active instance.|
+|processInstanceId|String|Yes|The Id of the process instance to set as the active instance.|
 |callbackFunction|Function|No|A function to call when the operation is complete. This callback function is passed one of the following string values to indicate whether the operation succeeded:<br/>- **success**: The operation succeeded.<br/>- **invalid**: The processInstanceId isn’t valid or the process isn’t enabled.|
 
 ### Related topics

powerapps-docs/maker/common-data-service/data-platform-complex-entities.md

@@ -1,13 +1,12 @@
 ---
-title: Complex entities requiring Power Apps Plan 2 licenses | Microsoft Docs
+title: Complex entities requiring Power Apps licenses | Microsoft Docs
 description: A list of complex entities in Common Data Service that require a Power Apps Plan 2 license.
-author: lancedMicrosoft
-manager: kvivek
+author: KumarVivek
 ms.service: powerapps
 ms.component: cds
 ms.topic: reference
-ms.date: 04/15/2020
-ms.author: lanced
+ms.date: 08/28/2020
+ms.author: kvivek
 search.audienceType: 
   - maker
 search.app: 
@@ -18,7 +17,7 @@ search.app:
 # Complex entities and licensing
 
 > [!IMPORTANT]
-> *This topic is applicable only for older Power Apps Plan 1 and Plan 2 licenses.* 
+> *This topic is applicable only for older Power Apps Plan 1 and Plan 2 licenses.*
 >
 > Complex entities are applicable *only* for the older Power Apps Plan 1 and Plan 2 licenses, and not for the latest Power Apps per app and Power Apps per user plans.
 > 
@@ -35,10 +34,10 @@ Entities that include the following complex server-side logic require users of a
 To know whether or not you've added complex business logic to your entities, review the list of plug-in assemblies and workflows configured in your environment.
 
 ## Complex entities installed with Dynamics 365 apps
-The following table lists entities that contain complex server-side logic out-of-the-box as part of the installation of model-driven applications in Dynamics 365, such as Dynamics 365 Sales and Dynamics 365 Customer Service. This list is intended as a guide. Depending on which Dynamics 365 apps and versions are installed in your environment, the list of complex entities may vary.
+The following table lists entities that contain complex server-side logic out-of-the-box as part of the installation of customer engagement apps in Dynamics 365 (Dynamics 365 Sales, Customer Service, Field Service, Marketing, and Project Service Automation). This list is intended as a guide. Depending on the Dynamics 365 apps and versions installed in your environment, the list of complex entities may vary.
 
 > [!NOTE]
->  If you are using the Common Data Service and have not installed a Dynamics 365 application or third-party solution, your environment will not have entities containing complex server side logic.
+>  If you are using the Common Data Service and have not installed a Dynamics 365 app or third-party solution, your environment won't have entities containing complex server-side logic.
 
 * Account
 * Agreement

powerapps-docs/maker/common-data-service/data-platform-entity-licenses.md

@@ -1,11 +1,12 @@
 ---
 title: License requirements for entities| Microsoft Docs
-description: An explanation of license requirements for entities within Common Data Service.
-author: KumarVivek
+description: An explanation of license requirements for entities with complex business logic and restricted entities in Common Data Service.
+author: MicroSri
 ms.service: powerapps
 ms.topic: conceptual
-ms.date: 04/15/2020
-ms.author: kvivek
+ms.date: 08/28/2020
+ms.author: sriknair
+ms.reviewer: kvivek
 search.audienceType: 
   - maker
 search.app: 
@@ -15,86 +16,87 @@ search.app:
 
 # License requirements for entities
 
-> [!IMPORTANT]
-> This topic is out-of-date and will be updated soon to reflect the latest licensing changes that are applicable starting October 1, 2019. For the latest information on licensing requirements for entities, see the [Power Apps licensing guide](https://go.microsoft.com/fwlink/p/?linkid=2085130).
+App makers can use most of the entities available within Common Data Service (including custom entities and entities that are part of the Common Data Model) to create apps and flows for users who have a Power Apps or Power Automate license. 
 
-App makers can use most of the entities available within Common Data Service (including custom entities and entities that are part of the Common Data Model) to create apps and flows for users who have a Power Apps Plan 1 or Power Automate Plan 1 license. In some cases, entities contain complex business logic or are tied to Dynamics 365 applications that require app users to have a specific license. 
-
-
-|Entity    |Description    |Requirement    |
-|---------|---------|---------|
-|Entities with complex business logic   | These are entities that use complex server-side business logic. For example, any entity that uses a real-time workflow or code plug-in.       |  [Power Apps Plan 2](https://powerapps.microsoft.com/pricing/) or [Flow Plan 2](https://flow.microsoft.com/pricing/)        |
-|Restricted entities  |  These are entities that are not standard with Common Data Service but are included in a model-driven app available in Dynamics 365 (such as Dynamics 365 Sales or Dynamics 365 Customer Service) or a third-party solution. For example, the knowledge article, goal, and entitlement entities.     |  [A Dynamics 365 plan](https://dynamics.microsoft.com/pricing/)      | 
-
-
-> [!NOTE]
-> Apps and flows that use these entities require the app and flow user to be licensed appropriately-not the maker or developer of the app or flow.
+In some cases, entities contain complex business logic or are tied to customer engagement apps in Dynamics 365 (Dynamics 365 Sales, Customer Service, Field Service, Marketing, or Project Service Automation) that require app users to have a specific license. This topic provides licensing information for entities with complex business logic and entities that are tied to Dynamics 365 apps (termed as restricted entities).
 
 ## Entities with complex business logic
-Entities that include the following complex server-side logic require users of an app or flow that uses these entities to have a Power Apps Plan 2 or Power Automate Plan 2 license:
+Entities that include the following complex server-side logic require users of an app or flow that uses these entities to have a [Power Apps](https://powerapps.microsoft.com/pricing/) or [Power Automate](https://flow.microsoft.com/pricing/) license:
 
-* Code plug-ins (for more information, see [Plug-in development](/powerapps/developer/common-data-service/plug-ins))
-* Real-time workflows (for more information, see [Workflow processes](/flow/workflow-processes))
+- Code plug-ins (for more information, see [Plug-in development](/powerapps/developer/common-data-service/plug-ins))
+- Real-time workflows (for more information, see [Workflow processes](/flow/workflow-processes))
 
     > [!NOTE]
     >  Only workflows that are converted to a real-time workflow are considered real-time and synchronous. Workflows that are run in the background can still be used with the appropriate Power Apps plan and do not require additional licenses.
 
-To know whether or not you added complex business logic to your entities, review the list of plug-in assemblies and workflows configured in your environment. For the list of entities which may contain server side logic after installing a model-driven application in Dynamics 365 (such as Dynamics 365 Sales or Dynamics 365 Customer Service), see [Complex entities requiring Power Apps Plan 2 licenses](data-platform-complex-entities.md)  
+To know whether or not you added complex business logic to your entities, review the list of plug-in assemblies and workflows configured in your environment. For the list of entities which may contain server side logic after installing a Dynamics 365 app (such as Dynamics 365 Sales or Dynamics 365 Customer Service), see [Complex entities requiring Power Apps or Power Automate licenses](data-platform-complex-entities.md)  
 
 ### Impacting license requirements when adding complex business logic
+
 App makers can add code plug-ins and real-time workflows to entities within Common Data Service, but doing so could change the license requirements for users of apps already deployed. App makers should be cautious when adding complex business logic to an entity and should first check which apps use the entity and whether users of those apps have the appropriate licenses.
 
 ## Restricted entities
-Certain entities that are tied to the functionality of Dynamics 365 applications require app users to have the corresponding license for that application if they want to create, update, or delete records within the entities. For a full list of restricted entities, see [Restricted entities requiring Dynamics 365 licenses](data-platform-restricted-entities.md).
+
+Restricted entities are not standard entities within Common Data Service, but are included in one of the customer engagement apps in Dynamics 365 (Dynamics 365 Sales, Customer Service, Field Service, Marketing, or Project Service Automation) or a third-party solution. For example, the knowledge article, goal, and entitlement entities.
+
+> [!NOTE]
+> Apps and flows that use these entities require the app and flow user to be licensed appropriately-not the maker or developer of the app or flow.
+
+Entities that are tied to the functionality of Dynamics 365 apps (such as Dynamics 365 Sales or Dynamics 365 Customer Service) require app users to have the corresponding license for that application if they want to create, update, or delete records within the entities. For a full list of restricted entities, see [Restricted entities requiring Dynamics 365 licenses](data-platform-restricted-entities.md).
 
 ## Licensing examples
 Barb and Isaac are creating apps in Power Apps using Common Data Service to store their data.
 
-Barb is creating two canvas apps:
+### Entity creation
 
-* App 1 – uses the Appointment entity along with a custom entity that stores related information
-* App 2 – uses the Appointment entity along with the Incident entity, which is a restricted entity
+-	No user can create a new restricted entity; Microsoft reserves the right to create and define them for Dynamics 365 apps (such as Dynamics 365 Sales or Dynamics 365 Customer Service)
 
-Isaac is creating two model-driven apps:
+-	Users can create custom entities with Dynamics 365, Power Apps, or Power Automate license
 
-* App 3 – uses the Appointment entity along with a custom entity that stores related information
-* App 4 – uses the Appointment entity along with the Incident entity, which is a restricted entity
+-	For existing restricted entities, a user can add rows with the appropriate Dynamics 365 app license
 
-Barb and Isaac need the following licenses:
-* Barb needs a Power Apps Plan 1 license to create canvas apps using Common Data Service. If she needs to create a database or create a custom entity, she would need a Power Apps Plan 2 license.
+### Create apps using Power Apps
 
-* Isaac needs a Power Apps Plan 2 license to build model- driven apps.
+-	Barb and Isaac can create a canvas or model-driven app accessing restricted entities with a Dynamics 365 license
 
-App users need the following licenses:
-* App 1 users only need a Power Apps Plan 1 or Plan 2 license, since the app doesn't contain any entities with complex business logic or restricted entities.
+-	Barb and Isaac can create a canvas or model driven app accessing custom entities with either Dynamics 365 or Power Apps license
 
-* App 2 users need a Dynamics 365 Customer Service, Enterprise edition license (or a Dynamics 365 or Dynamics 365 Customer Engagement plan), since the app includes a restricted entity.
+### Use apps
 
-* App 3 users need a Power Apps Plan 2 license, since it's a model-driven app.
+Barb wants to use two canvas apps:
+-	App 1 – uses the Appointment entity along with a custom entity that stores related information
 
-* App 4 users need a Dynamics 365 for Customer Service, Enterprise edition license (or a Dynamics 365 or Dynamics 365 Customer Engagement plan), since the app includes a restricted entity.
+-	App 2 – uses the Appointment entity along with the Work Order entity, which is a restricted entity
 
-    The Dynamics 365 for Customer Service plan includes a Power Apps Plan 2 license, which allows users to run model-driven apps.
+Isaac wants to use two model-driven apps:
+-	App 3 – uses the Appointment entity along with a custom entity that stores related information
 
-Now, let's see what happens when Isaac adds a real-time workflow to the custom entity that both Barb and Isaac are using in their apps.
+-	App 4 – uses the Appointment entity along with the Work Order entity, which is a restricted entity
 
 Barb and Isaac need the following licenses:
-* Barb still needs a Power Apps Plan 1 license to create canvas apps using Common Data Service.
+- Barb can use App 1 with a Dynamics 365 app license or a Power Apps license.
 
-* Isaac still needs a Power Apps Plan 2 license to build model-driven apps.
+-	Barb can use App 2 only with a Dynamics 365 app license because there is a restricted entity accessed by the app.
 
-App users need the following licenses:
-* App 1 users now need a Power Apps Plan 2 license, since the app contains an entity with a real-time workflow.
+-	Isaac can use App 3 with a Dynamics 365 app license or a Power Apps license. 
 
-* App 2 users still need a Dynamics 365 for Customer Service, Enterprise edition license (or a Dynamics 365 or Dynamics 365 Customer Engagement plan), since the app includes a restricted entity. 
+-	Isaac can use App 4 only with a Dynamics 365 app license because there is a restricted entity accessed by the app.
 
-* App 3 users still need a Power Apps Plan 2 license, since it's a model-driven app.
+### Create flows using Power Automate
 
-* App 4 users still need a Dynamics 365 for Customer Service, Enterprise edition license (or a Dynamics 365 or Dynamics 365 Customer Engagement plan), since the app includes a restricted entity.
+Now, let's see what happens when Isaac adds a real-time workflow to the custom entity that both Barb and Isaac are using in their apps.
+-	Isaac can create a workflow accessing restricted entities with a Dynamics 365 app license
 
-    The Dynamics 365 for Customer Service plan includes a Power Apps Plan 2 license, which allows users to run model-driven apps.
+-	Barb and Isaac can create a workflow accessing custom entities with either Dynamics 365 app or Power Automate license 
+
+### Use flows
+-	Barb or Isaac can run the workflow accessing restricted entities with a Dynamics 365 app license
+
+-	Barb or Isaac can run the workflow accessing custom entities with either Dynamics 365 app or Power Automate license
 
-The only app impacted by this change is App 1, which previously required a Power Apps Plan 1 license, but now requires a Power Apps Plan 2 license, since it contains an entity with complex business logic. 
 
 ## More about licensing
-For more information about Power Apps and Dynamics 365 licenses, see [Licensing overview](../../administrator/pricing-billing-skus.md).
+
+For more information about licensing, see [Licensing overview](/power-platform/admin/pricing-billing-skus).
+
+For the latest information on licensing requirements for entities, see the [Power Apps licensing guide](https://go.microsoft.com/fwlink/p/?linkid=2085130).

powerapps-docs/maker/common-data-service/data-platform-restricted-entities.md

@@ -17,13 +17,13 @@ search.app:
 
 App makers, who are building custom apps, can use all of the Common Data Service entities available within [Common Data Model](https://docs.microsoft.com/common-data-model/) to create apps and flows for users who have any version of Power Apps license.  
 
-However, a smaller set of entities tied to Dynamics 365 products require canvas and model-driven app users to have a license for the corresponding Dynamics 365 product if they need to create, update, or delete records within the entities. These are referred to as restricted entities.
+However, a smaller set of entities tied to Dynamics 365 apps (Dynamics 365 Sales, Customer Service, Field Service, Marketing, or Project Service Automation) require canvas and model-driven app users to have a license for the corresponding Dynamics 365 app if they need to create, update, or delete records within the entities. These are referred to as restricted entities.
 
-Entities may be restricted to a Dynamics 365 license for the following reasons:
+Entities may be restricted to a Dynamics 365 app license for the following reasons:
 * The entity is used to store and maintain product-specific configuration data that should typically be not used outside of the application.
 * The entity is accompanied by advanced logic that creates and maintains data in a specific way when used within a Dynamics 365 product.
 
-If an app or flow only reads information from an entity, a Dynamics 365 license is not required and an appropriate Power Apps or Power Automate license is all that's needed.
+If an app or flow only reads information from an entity, a Dynamics 365 app license is not required and an appropriate Power Apps or Power Automate license is all that's needed.
 
 ## Restricted entities for create, update, and delete operations
 The following table lists the restricted entities and the associated Dynamics 365 license requirements for users who create, update, or delete data stored within these entities.