diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md index 0ae8b338d8..6f1deba6b9 100644 --- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md +++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md @@ -37,8 +37,8 @@ Additionally, note that Surface Hub requires the following open ports: If you are using Surface Hub with Skype for Business, you will need to open additional ports. Please follow the guidance below: - If you use Skype for Business Online, see [Office 365 IP URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US). -- If you use Skype for Business Server, see [Skype for Business Server: Ports and protocols for internal servers](https://technet.microsoft.com/library/gg398833.aspx). -- If you use a hybrid of Skype for Business Online and Skype for Business Server, you need to open all documented ports from [Office 365 IP URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US) and [Skype for Business Server: Ports and protocols for internal servers](https://technet.microsoft.com/library/gg398833.aspx). +- If you use Skype for Business Server, see [Skype for Business Server: Ports and protocols for internal servers](https://docs.microsoft.com/SkypeForBusiness/plan-your-deployment/network-requirements/ports-and-protocols). +- If you use a hybrid of Skype for Business Online and Skype for Business Server, you need to open all documented ports from [Office 365 IP URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US) and [Skype for Business Server: Ports and protocols for internal servers](https://docs.microsoft.com/SkypeForBusiness/plan-your-deployment/network-requirements/ports-and-protocols?toc=/SkypeForBusiness/toc.json&bc=/SkypeForBusiness/breadcrumb/toc.json). Microsoft collects diagnostic data to help improve your Surface Hub experience. Add these sites to your allow list: - Diagnostic data client endpoint: `https://vortex.data.microsoft.com/` diff --git a/devices/surface/battery-limit.md b/devices/surface/battery-limit.md index dce83705cc..b1a34e4f19 100644 --- a/devices/surface/battery-limit.md +++ b/devices/surface/battery-limit.md @@ -19,7 +19,7 @@ Battery Limit option is a UEFI setting that changes how the Surface device batte Setting the device on Battery Limit changes the protocol for charging the device battery. When Battery Limit is enabled, the battery charge will be limited to 50% of its maximum capacity. The charge level reported in Windows will reflect this limit. Therefore, it will show that the battery is charged up to 50% and will not charge beyond this limit. If you enable Battery Limit while the device is above 50% charge, the Battery icon will show that the device is plugged in but discharging until the device reaches 50% of its maximum charge capacity. -Adding the Battery Limit option to Surface UEFI will require a [Surface UEFI firmware update](update.md), which will be made available through Windows Update or via the MSI driver and firmware packages on the Microsoft Download Center. Check [Enable "Battery Limit" for Surface devices that have to be plugged in for extended periods of time](https://support.microsoft.com/help/4464941) for the specific Surface UEFI version required for each device and supported devices. Currently, Battery Limit is only supported on Surface Pro 4 and Surface Pro 3. However, the setting will be available in the future on other Surface device models. +Adding the Battery Limit option to Surface UEFI requires a [Surface UEFI firmware update](update.md), available through Windows Update or via the MSI driver and firmware packages on the Microsoft Download Center. Check [Enable "Battery Limit" for Surface devices that have to be plugged in for extended periods of time](https://support.microsoft.com/help/4464941) for the specific Surface UEFI version required for each supported device. Currently, Battery Limit is supported on a subset of Surface devices and will be available in the future on other Surface device models. ## Enabling Battery Limit in Surface UEFI (Surface Pro 4 and later) diff --git a/devices/surface/wake-on-lan-for-surface-devices.md b/devices/surface/wake-on-lan-for-surface-devices.md index c584cc40bb..907ab49ce6 100644 --- a/devices/surface/wake-on-lan-for-surface-devices.md +++ b/devices/surface/wake-on-lan-for-surface-devices.md @@ -23,17 +23,22 @@ Surface devices that run Windows 10, version 1607 (also known as Windows 10 Anni The following devices are supported for WOL: -* Surface Book 2 -* Surface Pro with LTE Advanced (Model 1807) -* Surface Pro (Model 1796) -* Surface Laptop -* Surface Book -* Surface Pro 4 -* Surface 3 -* Surface Pro 3 * Surface Ethernet adapter +* Surface USB-C to Ethernet and USB Adapter * Surface Dock * Surface Docking Station for Surface Pro 3 +* Surface 3 +* Surface Pro 3 +* Surface Pro 4 +* Surface Pro (5th Gen) +* Surface Pro (5th Gen) with LTE Advanced +* Surface Book +* Surface Laptop (1st Gen) +* Surface Pro 6 +* Surface Book 2 +* Surface Laptop 2 +* Surface Go +* Surface Go with LTE Advanced ## WOL driver diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md index 40e34de9cd..9d1acc0a3c 100644 --- a/education/windows/configure-windows-for-education.md +++ b/education/windows/configure-windows-for-education.md @@ -33,16 +33,6 @@ In Windows 10, version 1703 (Creators Update), it is straightforward to configur | **Bing search advertising** | Ad free search with Bing | Disables ads when searching the internet with Bing in Microsoft Edge | Depending on your specific requirements, there are different ways to configure this as detailed in [Ad-free search with Bing](#ad-free-search-with-bing) | Depending on your specific requirements, there are different ways to configure this as detailed in [Ad-free search with Bing](#ad-free-search-with-bing) | Depending on your specific requirements, there are different ways to configure this as detailed in [Ad-free search with Bing](#ad-free-search-with-bing) | | **Apps** | **SetEduPolicies** | Preinstalled apps like Microsoft Edge, Movies & TV, Groove, and Skype become education ready

* Any app can detect Windows is running in an education ready configuration through [IsEducationEnvironment](https://docs.microsoft.com/uwp/api/windows.system.profile.educationsettings) | This is already set | This is already set | The policy must be set | -## Considerations for diagnostic data in Windows 10 Education -Your diagnostic data settings and how you configure them depend on the version of Windows 10 Education you're running. - -- For Windows 10 Education, version 1703 and version 1709, the diagnostic data level is set to Basic *only if* the computer is provisioned for Education, which you do setting **SharedPC\SetEduPolicies** to TRUE. This, in turn, sets the **System\AllowTelemetry** group policy to Basic. If the computer isn't provisioned or if the diagnostic level is not set via Group Policy, MDM, or OOBE (note that Azure AD-joined computers won't show OOBE consent form), the computer will fall back to Full diagnostic data collection. You can use [Setup School PC](use-set-up-school-pcs-app.md) to provision the computer. - -- For Windows 10 Education, version 1803, and later, setting **SharedPC\SetEduPolicies** to TRUE does *not* set the **System\AllowTelemetry** to Basic. Unless you set the diagnostic level via Group Policy, MDM, or OOBE, the computer will fall back to Full diagnostic data collection. For these computers, set the diagnostic level using [Group Policy](https://docs.microsoft.com/windows/privacy/configure-windows-diagnostic-data-in-your-organization#use-group-policy-to-set-the-diagnostic-data-level) or [MDM](https://docs.microsoft.com/windows/privacy/configure-windows-diagnostic-data-in-your-organization#use-mdm-to-set-the-diagnostic-data-level). - -- If you modify the diagnostic data level for Windows 10 Education, version 1703 and version 1709, those modifications are saved when you upgrade to version 1803 or later. - - ## Recommended configuration It is easy to be education ready when using Microsoft products. We recommend the following configuration: @@ -119,7 +109,7 @@ Set **Computer Configuration > Administrative Templates > Windows Components > S ## SetEduPolicies **SetEduPolicies** is a policy that applies a set of configuration behaviors to Windows. It is a policy node in the [SharedPC configuration service provider](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/sharedpc-csp). -Use one of the following methods to set this policy. +Use one of these methods to set this policy. ### MDM - Intune for Education automatically sets this policy in the **All devices** group policy configuration. diff --git a/education/windows/set-up-school-pcs-azure-ad-join.md b/education/windows/set-up-school-pcs-azure-ad-join.md index ecfbf5b1fc..98cc4a6b9c 100644 --- a/education/windows/set-up-school-pcs-azure-ad-join.md +++ b/education/windows/set-up-school-pcs-azure-ad-join.md @@ -1,5 +1,5 @@ --- -title: Azure AD Join with Setup School PCs app +title: Azure AD Join with Set up School PCs app description: Describes how Azure AD Join is configured in the Set up School PCs app. keywords: shared cart, shared PC, school, set up school pcs ms.prod: w10 diff --git a/mdop/appv-v5/how-to-convert-a-package-created-in-a-previous-version-of-app-v.md b/mdop/appv-v5/how-to-convert-a-package-created-in-a-previous-version-of-app-v.md index 3cb0a94237..a3969a0d7f 100644 --- a/mdop/appv-v5/how-to-convert-a-package-created-in-a-previous-version-of-app-v.md +++ b/mdop/appv-v5/how-to-convert-a-package-created-in-a-previous-version-of-app-v.md @@ -34,7 +34,13 @@ You must configure the package converter to always save the package ingredients 1. Install the App-V Sequencer on a computer in your environment. For information about how to install the Sequencer, see [How to Install the Sequencer](how-to-install-the-sequencer-beta-gb18030.md). -2. +2. Import the required Powershell Module + +```powershell +Import-Module AppVPkgConverter +``` + +3. The following cmdlets are available: diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md index d383fa3117..e42cdb492c 100644 --- a/store-for-business/TOC.md +++ b/store-for-business/TOC.md @@ -8,16 +8,16 @@ ### [Settings reference: Microsoft Store for Business and Education](settings-reference-microsoft-store-for-business.md) ## [Find and acquire apps](find-and-acquire-apps-overview.md) ### [Apps in the Microsoft Store for Business and Education](apps-in-microsoft-store-for-business.md) -### [Acquire apps in the Microsoft Store for Business and Education](acquire-apps-microsoft-store-for-business.md) +### [Acquire apps](acquire-apps-microsoft-store-for-business.md) ### [Working with line-of-business apps](working-with-line-of-business-apps.md) -## [Distribute apps to your employees from the Microsoft Store for Business and Education](distribute-apps-to-your-employees-microsoft-store-for-business.md) +## [Distribute apps](distribute-apps-to-your-employees-microsoft-store-for-business.md) ### [Distribute apps using your private store](distribute-apps-from-your-private-store.md) ### [Assign apps to employees](assign-apps-to-employees.md) ### [Distribute apps with a management tool](distribute-apps-with-management-tool.md) ### [Distribute offline apps](distribute-offline-apps.md) ## [Manage products and services](manage-apps-microsoft-store-for-business-overview.md) -### [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-microsoft-store-for-business.md) -### [Manage app orders in Microsoft Store for Business and Education](manage-orders-microsoft-store-for-business.md) +### [App inventory managemement](app-inventory-management-microsoft-store-for-business.md) +### [Manage orders](manage-orders-microsoft-store-for-business.md) ### [Manage access to private store](manage-access-to-private-store.md) ### [Manage private store settings](manage-private-store-settings.md) ### [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md) @@ -25,13 +25,17 @@ ### [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md) ### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md) ### [Working with solution providers in Microsoft Store for Business](work-with-partner-microsoft-store-business.md) +## [Billing and payments](billing-payments-overview.md) +### [Understand your invoice](billing-understand-your-invoice-msfb.md) +### [Payment methods](payment-methods.md) +### [Understand billing profiles](billing-profile.md) +## [Manage settings in the Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md) +### [Update account settings](update-microsoft-store-for-business-account-settings.md) +### [Manage user accounts ](manage-users-and-groups-microsoft-store-for-business.md) ## [Device Guard signing portal](device-guard-signing-portal.md) ### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md) ### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md) -## [Manage settings in the Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md) -### [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) -### [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-microsoft-store-for-business.md) -## [Troubleshoot Microsoft Store for Business](troubleshoot-microsoft-store-for-business.md) -## [Notifications in Microsoft Store for Business and Education](notifications-microsoft-store-business.md) -## [Change history for Microsoft Store for Business and Education](sfb-change-history.md) +## [Troubleshoot](troubleshoot-microsoft-store-for-business.md) +## [Notifications](notifications-microsoft-store-business.md) +## [Change history](sfb-change-history.md) diff --git a/store-for-business/billing-payments-overview.md b/store-for-business/billing-payments-overview.md new file mode 100644 index 0000000000..e3c23bf86e --- /dev/null +++ b/store-for-business/billing-payments-overview.md @@ -0,0 +1,26 @@ +--- +title: Billing and payments overview +description: Find topics about billing and payment support in Microsoft Store for Business. +keywords: billing, payment methods, invoices, credit card, debit card +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store +author: TrudyHa +ms.author: TrudyHa +ms.topic: conceptual +ms.localizationpriority: medium +ms.date: 03/01/2019 +--- + +# Billing and payments + +Access invoices and managed your payment methods. + +## In this section + +| Topic | Description | +| ----- | ----------- | +| [Understand your invoice](billing-understand-your-invoice-msfb.md) | Information about invoices provided by Microsoft Store for Business. | +| [Understand billing profiles](billing-profile.md) | Information about billing profiles and how they relate to invoices. | +| [Payment methods](payment-methods.md) | Information about managing payment methods. | \ No newline at end of file diff --git a/store-for-business/billing-profile.md b/store-for-business/billing-profile.md new file mode 100644 index 0000000000..56a0be9b64 --- /dev/null +++ b/store-for-business/billing-profile.md @@ -0,0 +1,43 @@ +--- +title: Understand billing profiles +description: Learn how billing profiles support invoices +keywords: billing profile, invoices, charges, managed charges +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store +author: trudyha +ms.author: TrudyHa +ms.topic: conceptual +ms.localizationpriority: medium +ms.date: 03/01/2019 +--- + +# Understand billing profiles +For commercial customers purchasing software or hardware products from Microsoft using a Microsoft customer agreement, billing profiles let you customeize what products are included on your invoice, and how you pay your invoices. + +Billing profiles include: +- **Payment methods** – Credit cards or check/wire transfer +- **Contact info** - Billing address and a contact name +- **Permissions** – Permissions that allow you to change the billing profile, pay bills, or use the payment method on the billing profile to make purchases + +Use billing profiles to control your purchases and customize your invoice. A monthly invoice is generated for the products bought using the billing profile. You can customize the invoice such as update the purchase order number and email invoice preference. + +A billing profile is automatically created for your billing account during your first purchase. You can create new billing profiles to set up additional invoices when you make a purchase. For example, you use different billing profiles when you make purchases for each department in your organization. On your next billing date, you'll receive an invoice for each billing profile. + +Roles on the billing profiles have permissions to control purchases, and view and manage invoices. Assign these roles to users who track, organize, and pay invoices like members of the procurement team in your organization. + +## View billing profile +**To view billing profiles** +1. Sign in to [Microsoft Store for Business]( https://businessstore.microsoft.com/), or M365 admin center. +2. Select **Manage**, and then select **Billing and payments**. +3. Select **Billing profiles**, and then select a billing profile from the list to see details. + - On **Overview**, you can edit billing profile details, and turn on or off sending an invoice by email. + - On **Permissions**, you can assign roles to users to pay invoices. + - On **Azure credit balance**, Azure customers can see transaction balance history for the azure credits used by that billing profile. + - On **Azure credits**, Azure customers can see a list of Azure credits associated with that billing profile, and their expiration dates. + +## Need help? Contact us. +If you have questions or need help with your Azure charges, [create a support request with Azure support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). + +If you have questions or need help with your invoice in Microsoft Store for Business, [create a support request with Store for Business support](https://businessstore.microsoft.com). diff --git a/store-for-business/billing-understand-your-invoice-msfb.md b/store-for-business/billing-understand-your-invoice-msfb.md new file mode 100644 index 0000000000..baa42e23a6 --- /dev/null +++ b/store-for-business/billing-understand-your-invoice-msfb.md @@ -0,0 +1,118 @@ +--- +title: Understand your Microsoft Customer Agreement invoice +description: Learn how to read and understand your MCA bill +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store +author: trudyha +ms.author: TrudyHa +ms.topic: conceptual +ms.localizationpriority: medium +ms.date: 03/01/2019 +--- + +# Understand your Microsoft Customer Agreement invoice + +The invoice provides a summary of your charges and provides instructions for payment. It’s available for +download in the Portable Document Format (.pdf) for commercial customers from Microsoft Store for Business [Microsoft Store for Business - Invoice](https://businessstore.microsoft.com/manage/payments-billing/invoices) or can be sent via email. This article applies to invoices generated for a Microsoft Customer Agreement billing account. Check if you have a [Microsoft Customer Agreement](https://businessstore.microsoft.com/manage/organization/agreements). + +## General invoice information +Invoices are your bill from Microsoft. A few things to note: + +- **Invoice schedule** - You’re invoiced on a monthly basis. You can find out which day of the month you receive invoices by checking invoice date under billing profile overview in [Microsoft Store for Business](https://businessstore.microsoft.com/manage/payments-billing/billing-profiles). Charges that occur between the end of the billing period and the invoice date are included in the next month's invoice, since they are in the next billing period. The billing period start and end dates for each invoice are listed in the invoice PDF above **Billing Summary**. +- **Billing profile** - Billing profiles are created during your purchase. Invoices are created for each billing profile. Billing profiles let you customize what products are purchased, how you pay for them, and who can make purchases. For more information, see [Understand billing profiles](billing-profile.md) +- **Items included** - Your invoice includes total charges for all first and third-party software and hardware products purchased under a Microsoft Customer Agreement. That includes items purchased from Microsoft Store for Business and Azure Marketplace. +- **Charges** - Your invoice provides information about products purchased and their related charges and taxes. Purchases are aggregated to provide a concise view of your bill. +- **International customers** - Charges on invoices for international customers are converted to their local currencies. Exchange rate information is listed at the bottom of the invoice. + +## Online invoice +For Store for Business customers, invoices are also available online. A few things to note: +- **Link to online invoice** - Available from your PDF invoice, and from an email notification. +- **Invoice details** - Expandable view of the charges on your invoice, so you can see more details for each item. +- **Pricing details** - Additional information including discounting and pricing details. +- **Pay online** - Option to make a payment online from the invoice. +- **Azure cost management** - For Azure customers, online invoices include a link to Azure cost management. + +**To view your online invoice** +1. Sign in to [Microsoft Store for Business]( https://businessstore.microsoft.com/). +2. Select **Manage**, and then select **Billing and payments**. +3. Select an invoice from the list to view your online invoice. + +## Detailed terms and descriptions of your invoice +The following sections list the important terms that you see on your +invoice and descriptions for each term. + +### Understand the invoice summary + +The **Invoice Summary** is on the top of the first page and shows information about your billing profile and how you pay. + +![Invoice summary section](images/invoicesummary.png) + + +| Term | Description | +| --- | --- | +| Sold to |Address of your legal entity, found in billing account properties| +| Bill to |Billing address of the billing profile receiving the invoice, found in billing profile properties| +| Billing Profile |The name of the billing profile receiving the invoice | +| P.O. number |An optional purchase order number, assigned by you for tracking | +| Invoice number |A unique, Microsoft-generated invoice number used for tracking purposes | +| Invoice date |Date that the invoice is generated, typically five to 12 days after end of the Billing cycle. You can check your invoice date in billing profile properties.| +| Payment terms |How you pay for your Microsoft bill. *Net 30 days* means you pay by check or wire transfer within 30 days of the invoice date. | + +### Understand the billing summary +The **Billing Summary** shows the charges against the billing profile since the previous billing period, any credits that were applied, tax, and the total amount due. + + +![Billing summary section](images/billingsummary.png) + +| Term | Description | +| --- | --- | +| Charges|Total number of Microsoft charges for this billing profile since the last billing period | +| Credits |Credits you received from returns | +| Azure credits applied |Your Azure credits that are automatically applied to Azure charges each billing period | +| Subtotal |The pre-tax amount due | +| Tax |The type and amount of tax that you pay, depending on the country of your billing profile. If you don't have to pay tax, then you won't see tax on your invoice. | +| Estimated total savings |The estimated total amount you saved from effective discounts. If applicable, effective discount rates are listed beneath the purchase line items in Details by Invoice Section. | + +### Understand your charges +You'll see the charges, tax, and the total amount due. Azure customers will also see the amount of Azure credits applied. + +`Total = Charges - Azure Credit + Tax` + +The details show the cost broken down by product order name. For Azure customers, this might be organized by invoice section. For more information about how invoice sections are used with Azure products, see [Understand invoice sections](https://docs.microsoft.com/azure/billing/billing-mca-overview#understand-invoice-sections). +Within each product order, cost is broken down by service family. + +The total amount due for each service family is calculated by subtracting Azure credits from credits/charges and adding tax: + +`Total = Charges/Credits - Azure Credit + Tax` + +![Details by invoice section](images/invoicesectiondetails.png) + +| Term |Description | +| --- | --- | +| Unit price | The effective unit price of the service (in pricing currency) that is used to the rate the usage. This is unique for a product, service family, meter, and offer. | +| Qty | Quantity purchased or consumed during the billing period | +| Charges/Credits | Net amount of charges after credits/refunds are applied | +| Azure Credit | The amount of Azure credits applied to the Charges/Credits| +| Tax rate | Tax rate(s) depending on country | +| Tax amount | Amount of tax applied to purchase based on tax rate | +| Total | The total amount due for the purchase | + +### How to pay +At the bottom of the invoice, there are instructions for paying your bill. You can pay by check, wire, or online. If you pay online, you can use a credit/debit card or Azure credits, if applicable. + +### Publisher information +If you have third-party services in your bill, the name and address of each publisher is listed at the bottom of your invoice. + +### Exchange rate +If prices were converted to your local currency, the exchange rates are listed in this section at the bottom of the invoice. All Azure charges are priced in USD and third-party services are priced in the seller's currency. + +## Next steps +If there are Azure charges on your invoice that you would like more details on, see [Understand the Azure charges on your Microsoft Customer Agreement invoice](https://docs.microsoft.com/en-us/azure/billing/billing-understand-your-invoice-mca). + +## Need help? Contact us. + +If you have questions or need help with your Azure charges, [create a support request with Azure support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). + +If you have questions or need help with your invoice in Microsoft Store for Business, [create a support request with Store for Business support](https://businessstore.microsoft.com/manage/support/summary). diff --git a/store-for-business/images/billing-acct-roles.png b/store-for-business/images/billing-acct-roles.png new file mode 100644 index 0000000000..6977bef250 Binary files /dev/null and b/store-for-business/images/billing-acct-roles.png differ diff --git a/store-for-business/images/billingsummary.png b/store-for-business/images/billingsummary.png new file mode 100644 index 0000000000..9f45179ead Binary files /dev/null and b/store-for-business/images/billingsummary.png differ diff --git a/store-for-business/images/invoicesectiondetails.png b/store-for-business/images/invoicesectiondetails.png new file mode 100644 index 0000000000..cdaac8423e Binary files /dev/null and b/store-for-business/images/invoicesectiondetails.png differ diff --git a/store-for-business/images/invoicesummary.png b/store-for-business/images/invoicesummary.png new file mode 100644 index 0000000000..c17e7f0713 Binary files /dev/null and b/store-for-business/images/invoicesummary.png differ diff --git a/store-for-business/images/purchasing-roles.png b/store-for-business/images/purchasing-roles.png new file mode 100644 index 0000000000..e45d9294f5 Binary files /dev/null and b/store-for-business/images/purchasing-roles.png differ diff --git a/store-for-business/manage-settings-microsoft-store-for-business.md b/store-for-business/manage-settings-microsoft-store-for-business.md index 995d597ff5..77cce4033a 100644 --- a/store-for-business/manage-settings-microsoft-store-for-business.md +++ b/store-for-business/manage-settings-microsoft-store-for-business.md @@ -10,7 +10,7 @@ author: TrudyHa ms.author: TrudyHa ms.topic: conceptual ms.localizationpriority: medium -ms.date: 10/17/2017 +ms.date: 2/19/2018 --- # Manage settings for Microsoft Store for Business and Education @@ -28,5 +28,6 @@ You can add users and groups, as well as update some of the settings associated | ----- | ----------- | | [Update Microsoft Store for Business and Education account settings](update-microsoft-store-for-business-account-settings.md) | **Billing - Account profile** in Microsoft Store for Business shows information about your organization that you can update. Payment options can be managed on **Billing - Payment methods**, and offline license settings can be managed on **Settings - Shop**. | | [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-microsoft-store-for-business.md) | Microsoft Store for Business manages permissions with a set of roles. You can [assign these roles to individuals in your organization](roles-and-permissions-microsoft-store-for-business.md) and to groups.| +| [Understand your invoice](billing-understand-your-invoice-msfb.md) | Information on invoices for products and services bought under the Microsoft Customer Agreement.| diff --git a/store-for-business/payment-methods.md b/store-for-business/payment-methods.md new file mode 100644 index 0000000000..e67c02d7b6 --- /dev/null +++ b/store-for-business/payment-methods.md @@ -0,0 +1,51 @@ +--- +title: Payment methods for commercial customers +description: Learn what payment methods are available in Store for Business and M365 admin center +keywords: payment method, credit card, debit card, add credit card, update payment method +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store +author: trudyha +ms.author: TrudyHa +ms.topic: conceptual +ms.localizationpriority: medium +ms.date: 03/01/2019 +--- + +# Payment methods +You can purchase products and services from Microsoft Store for Business using your credit card. You can enter your credit card information on **Payment methods**, or when you purchase an app. We currently accept these credit cards: +- VISA +- MasterCard +- Discover +- American Express +- Japan Commercial Bureau (JCB) + +> [!NOTE] +> Not all cards available in all countries. When you add a payment option, Microsoft Store for Business shows which cards are available in your region. + +## Add a payment method +**To add a new payment option** + +1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com). +2. Select **Manage**, select **Billing & payments**, and then select **Payments methods**. +3. Select **Add a payment options**, and then select the type of credit card that you want to add. +4. Add information to required fields, and then select **Add**. + +Once you select **Add**, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any issues. + +> [!NOTE] +> When adding credit or debit cards, you may be prompted to enter a CVV. The CVV is only used for verification purposes and is not stored in our systems after validation. + +## Edit payment method +**To update a payment option** + +1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com). +2. Click **Manage**, click **Billing & payments**, and then click **Payments methods**. +3. Select the payment option that you want to update, select the ellipses, and then choose **Edit payment method**. +4. Enter any updated information in the appropriate fields, and then se;ect**Save**. + +Once you click **Update**, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any problems. + +> [!NOTE] +> Certain actions, like updating or adding a payment option, require temporary “test authorization” transactions to validate the payment option. These may appear on your statement as $0.00 authorizations or as small pending transactions. These transactions are temporary and should not impact your account unless you make several changes in a short period of time, or have a low balance. \ No newline at end of file diff --git a/store-for-business/roles-and-permissions-microsoft-store-for-business.md b/store-for-business/roles-and-permissions-microsoft-store-for-business.md index 22e03ceda8..2b6e890314 100644 --- a/store-for-business/roles-and-permissions-microsoft-store-for-business.md +++ b/store-for-business/roles-and-permissions-microsoft-store-for-business.md @@ -1,6 +1,7 @@ --- title: Roles and permissions in Microsoft Store for Business and Education (Windows 10) description: The first person to sign in to Microsoft Store for Business or Microsoft Store for Education must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees. +keywords: roles, permissions ms.assetid: CB6281E1-37B1-4B8B-991D-BC5ED361F1EE ms.prod: w10 ms.mktglfcycl: manage @@ -10,17 +11,10 @@ author: TrudyHa ms.author: TrudyHa ms.topic: conceptual ms.localizationpriority: medium -ms.date: 8/7/2018 +ms.date: 03/01/2019 --- # Roles and permissions in Microsoft Store for Business and Education - - -**Applies to** - -- Windows 10 -- Windows 10 Mobile - The first person to sign in to Microsoft Store for Business or Microsoft Store for Education must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees. Microsoft Store for Business and Education has a set of roles that help admins and employees manage access to apps and tasks for Microsoft Store. Employees with these roles will need to use their Azure AD account to access the Store. Global Administrators and global user accounts that are used with other Microsoft services, such as Azure, or Office 365 can sign in to Microsoft Store. Global user accounts have some permissions in Microsoft Store, and Microsoft Store has a set of roles that help IT admins and employees manage access to apps and tasks for Microsoft Store. @@ -33,69 +27,60 @@ This table lists the global user accounts and the permissions they have in Micro | ------------------------------ | --------------------- | --------------------- | | Sign up for Microsoft Store for Business and Education | X | | Modify company profile settings | X | | -| Acquire apps | X | X | +| Purchase apps | X | X | | Distribute apps | X | X | | Purchase subscription-based software | X | X |   -- **Global Administrator** - IT Pros with this account have full access to Microsoft Store. They can do everything allowed in the Microsoft Store Admin role, plus they can sign up for Microsoft Store. +**Global Administrator** - IT Pros with this account have full access to Microsoft Store. They can do everything allowed in the Microsoft Store Admin role, plus they can sign up for Microsoft Store. -- **Billing Administrator** - IT Pros with this account have the same permissions as Microsoft Store Purchaser role. +**Billing Administrator** - IT Pros with this account have the same permissions as Microsoft Store Purchaser role. -## Microsoft Store roles and permissions - -Microsoft Store for Business has a set of roles that help IT admins and employees manage access to apps and tasks for Microsoft Store. Employees with these roles will need to use their Azure AD account to access Microsoft Store. +## Billing account roles and permissions +There are a set of roles, managed at your billing account level, that help IT admins and employees manage access to and tasks for Microsoft Store. Employees with these roles will need to use their Azure AD account to access Microsoft Store for Business. This table lists the roles and their permissions. -| | Admin | Purchaser | Device Guard signer | -| ------------------------------ | ------ | -------- | ------------------- | -| Assign roles | X | | | -| Manage Microsoft Store for Business and Education settings | X | | | -| Acquire apps | X | X | | -| Distribute apps | X | X | | -| Sign policies and catalogs | X | | | -| Sign Device Guard changes | X | | X | - +| Role | Buy from

Microsoft Store | Assign

roles | Edit

account | Sign

agreements | View

account | +| ------------------------| ------ | -------- | ------ | -------| -------- | +| Billing account owner | X | X | X | X | X | +| Billing account contributor | | | X | X | X | +| Billing account reader | | | | | X | +| Signatory | | | | X | X | + +## Purchasing roles and permissions +There are also a set of roles for purchasing and managing items bought. +This table lists the roles and their permissions. + +| Role | Buy from

Microsoft Store | Manage all items | Manage items

I buy | +| ------------| ------ | -------- | ------ | +| Purchaser | X | X | | +| Basic purchaser | X | | X | + +## Assign roles **To assign roles to people** -1. Sign in to Microsoft Store for Business or Microsoft Store for Education. +1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com). >[!Note] - >You need to be a Global Administrator, or have the Microsoft Store Admin role to access the **Permissions** page.  + >You need to be a Global Administrator, or have the Billing account owner role to access **Permissions**.  - To assign roles, you need to be a Global Administrator or a Store Administrator. - -2. Click **Settings**, and then choose **Permissions**. - - OR - - Click **Manage**, and then click **Permissions** on the left-hand menu. - - - -3. Click **Add people**, type a name, choose the role you want to assign, and click **Save** . - - - -4. If you don't find the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-microsoft-store-for-business.md). - +2. Select **Manage**, and then select **Permissions**. +3. On **Roles**, or **Purchasing roles**, select **Assing roles**. +4. Enter a name, choose the role you want to assign, and select **Save**. + If you don't find the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts](manage-users-and-groups-microsoft-store-for-business.md). \ No newline at end of file diff --git a/store-for-business/settings-reference-microsoft-store-for-business.md b/store-for-business/settings-reference-microsoft-store-for-business.md index 04db2ea942..fa03ac4ff7 100644 --- a/store-for-business/settings-reference-microsoft-store-for-business.md +++ b/store-for-business/settings-reference-microsoft-store-for-business.md @@ -10,23 +10,17 @@ author: TrudyHa ms.author: TrudyHa ms.topic: conceptual ms.localizationpriority: medium -ms.date: 11/01/2017 +ms.date: 03/01/2019 --- # Settings reference: Microsoft Store for Business and Education - -**Applies to** - -- Windows 10 -- Windows 10 Mobile - The Microsoft Store for Business and Education has a group of settings that admins use to manage the store. | Setting | Description | Location under **Manage** | | ------- | ----------- | ------------------------------ | -| Account information | Manage organization information. For more information, see [Manage settings for the Microsoft Store for Business and Education](update-microsoft-store-for-business-account-settings.md).| **Billing - Account profile** | -| Payment options | Manage payment options. For more information, see [Manage settings for the Microsoft Store for Business and Education](update-microsoft-store-for-business-account-settings.md#payment-options).| **Billing - Payment methods** | +| Billing account information | Manage organization information. For more information, see [Manage settings for the Microsoft Store for Business and Education](update-microsoft-store-for-business-account-settings.md).| **Billing accounts** | +| Payment options | Manage payment options. For more information, see [Manage settings for the Microsoft Store for Business and Education](payment-methods.md).| **Billing & payments - Payment methods** | | Private store | Update the name for your private store. The new name will be displayed on a tab in the Store. For more information, see [Manage private store settings](manage-private-store-settings.md). | **Settings - Distribute** | | Offline licensing | Configure whether or not to make offline-licensed apps available in the Microsoft Store for Business and Education. For more information, see [Distribute offline apps](distribute-offline-apps.md). | **Settings - Shop** | | Allow users to shop | Configure whether or not people in your organization or school can see and use the shop function in Store for Business or Store for Education. For more information, see [Allow users to shop](acquire-apps-microsoft-store-for-business.md#allow-users-to-shop). | **Settings - Shop** | @@ -34,5 +28,5 @@ The Microsoft Store for Business and Education has a group of settings that admi | App request | Configure whether or not people in your organization can request apps for admins to purchase. For more information, see [Distribute offline apps](acquire-apps-microsoft-store-for-business.md). | **Settings - Distribute** | | Management tools | Management tools that are synced with Azure AD are listed on this page. You can choose one to use for managing app updates and distribution. For more information, see [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md). | **Settings - Distribute** | | Device Guard signing | Use the Device Guard signing portal to add unsigned apps to a code integrity policy, or to sign code integrity policies. For more information, see [Device Guard signing portal](device-guard-signing-portal.md). | **Settings - Devices** | -| Permissions | Manage permissions for your employees. For more information, see [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md). | **Permissions - Roles** and **Permissions - Blocked basic purchasers** | +| Permissions | Manage permissions for your employees. For more information, see [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md). | **Permissions - Roles**, **Permissions - Purchasing roles**, and **Permissions - Blocked basic purchasers** | | Line-of-business (LOB) publishers | Invite devs to become LOB publishers for your organization. Existing LOB publishers are listed on the page, and you can deactivate or invite them again. For more information, see [Work with line-of-business apps](working-with-line-of-business-apps.md). | **Permissions - Line-of-business apps** | diff --git a/store-for-business/update-microsoft-store-for-business-account-settings.md b/store-for-business/update-microsoft-store-for-business-account-settings.md index 3ac104dedf..46dd73d807 100644 --- a/store-for-business/update-microsoft-store-for-business-account-settings.md +++ b/store-for-business/update-microsoft-store-for-business-account-settings.md @@ -1,6 +1,7 @@ --- -title: Update Microsoft Store for Business and Microsoft Store for Education account settings (Windows 10) -description: The Account information page in Microsoft Store for Business and Microsoft Store for Education shows information about your organization that you can update, including country or region, organization name, default domain, and language preference. +title: Update Microsoft Store for Business and Microsoft Store for Education billing account settings (Windows 10) +description: The billing account page in Microsoft Store for Business and Microsoft Store for Education shows information about your organization that you can update, including country or region, organization contact info, agreements with Microsoft and admin approvals. +keywords: billing accounts, organization info ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library @@ -9,17 +10,16 @@ author: TrudyHa ms.author: TrudyHa ms.topic: conceptual ms.localizationpriority: medium -ms.date: 10/17/2017 +ms.date: 03/01/2019 --- # Update Microsoft Store for Business and Microsoft Store for Education account settings +A billing account contains defining information about your organization. -**Applies to** +>[!NOTE] +>Billing accounts are available in Microsoft Store for Business, and M365 admin center preview. For more infomation, see [aka.ms/aboutM365preview](https://aka.ms/aboutM365preview). -- Windows 10 -- Windows 10 Mobile - -The **Payments & billing** page in Microsoft Store for Business allows you to manage organization information, billing information, and payment options. The organization information and payment options are required before you can acquire apps that have a price. +The **Billing account** page allows you to manage organization information, purchasing agreements that you have with Microsoft, and admin approvals. The organization information and payment options are required before you can shop for products that have a price. ## Organization information @@ -27,17 +27,19 @@ We need your business address, email contact, and tax-exemption certificates tha ### Business address and email contact -Before purchasing apps that have a fee, you need to add or update your organization's business address, and contact email address. +Before purchasing apps that have a fee, you need to add or update your organization's business address, contact email address, and contact name. We use the Business address to calculate sales tax. If your organization's address has already been entered for other commercial purchases through Microsoft Store, or through other online purchases such as Office 365 or Azure subscriptions, then we’ll use the same address in Microsoft Store for Business and Microsoft Store for Education. If we don’t have an address, we’ll ask you to enter it during your first purchase. We need an email address in case we need to contact you about your Microsoft Store for Business and for Education account. This email account should reach the admin for your organization’s Office 365 or Azure AD tenant that is used with Microsoft Store. -**To update Organization information** +**To update billing account information** 1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com) -2. Click **Manage**, click **Billing**, **Account profile**, and then click **Edit**. +2. Select **Manage**, and then select **Billing accounts**. +3. On **Overview**, select **Edit billing account information**. +4. Make your updates, and then select **Save**. -## Organization tax information +### Organization tax information Taxes for Microsoft Store for Business purchases are determined by your business address. Businesses in these countries can provide their VAT number or local equivalent: - Austria - Belgium @@ -72,7 +74,7 @@ Taxes for Microsoft Store for Business purchases are determined by your business - Switzerland - United Kingdom -These countries can provide their VAT number or local equivalent in **Payments & billing**. +These countries can provide their VAT number or local equivalent on their **Billing account** information. |Market| Tax identifier | |------|----------------| @@ -90,7 +92,7 @@ If you qualify for tax-exempt status in your market, start a service request to **To start a service request** 1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com). -2. Click **Manage**, click **Support**, and then under **Store settings & configuration** click **Create technical support ticket**. +2. Select **Manage**, click **Support**, and then under **Store settings & configuration** select **Create technical support ticket**. You’ll need this documentation: @@ -101,7 +103,6 @@ You’ll need this documentation: | Ireland | 13B/56A Tax Exemption Certificate| | International organizations that hold tax exaemption | Certification / letter confirmation from local tax authorities | - ### Calculating tax Sales taxes are calculated against the unit price, and then aggregated. @@ -113,41 +114,15 @@ For example:
($1.29 X .095) X 100 = $12.25 -## Payment options -You can purchase apps from Microsoft Store for Business using your credit card. You can enter your credit card information on Account Information, or when you purchase an app. We currently accept these credit cards: -1. VISA -2. MasterCard -3. Discover -4. American Express -5. Japan Commercial Bureau (JCB) +## Agreements +Each billing account inculdes access to the purchasing agreements your organization has signed with Microsoft. This could include: +- Microsoft Enterprise Agreement +- Select agreements +- Open agreements +- Microsoft customer agreement -> [!NOTE] -> Not all cards available in all countries. When you add a payment option, Microsoft Store for Business shows which cards are available in your region. - -**To add a new payment option** - -1. Sign in to the [Store for Business](https://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com). -2. Click **Manage**, click **Billing**, and then click **Payments methods**. -3. Click **Add a payment options**, and then select the type of credit card that you want to add. -4. Add information to required fields, and then click **Next**. - -Once you click Next, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any problems. - -> [!NOTE] -> When adding credit or debit cards, you may be prompted to enter a CVV. The CVV is only used for verification purposes and is not stored in our systems after validation. - -**To update a payment option** - -1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). -2. Click **Manage**, click **Billing**, and then click **Payments methods**. -3. Select the payment option that you want to update, and then click **Update**. -4. Enter any updated information in the appropriate fields, and then click **Next**. -Once you click **Next**, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any problems. - -> [!NOTE] -> Certain actions, like updating or adding a payment option, require temporary “test authorization” transactions to validate the payment option. These may appear on your statement as $0.00 authorizations or as small pending transactions. These transactions are temporary and should not impact your account unless you make several changes in a short period of time, or have a low balance. - -## Offline licensing +If you there is an updated version of the Microsoft customer agreement for you to sign, you'll be prompted to on **Agreements**, or during a purchase. + \ No newline at end of file diff --git a/windows/client-management/mdm/oma-dm-protocol-support.md b/windows/client-management/mdm/oma-dm-protocol-support.md index c0369b83bb..29344603d2 100644 --- a/windows/client-management/mdm/oma-dm-protocol-support.md +++ b/windows/client-management/mdm/oma-dm-protocol-support.md @@ -13,7 +13,7 @@ ms.date: 06/26/2017 # OMA DM protocol support -The OMA DM client communicates with the server over HTTPS and uses DM Sync (OMA DM v1.2) as the message payload. This topic describes the OMA DM functionality that the DM client supports in general. The full description of the OMA DM protocol v1.2 can be found at the [OMA website](https://go.microsoft.com/fwlink/p/?LinkId=267526). +The OMA DM client communicates with the server over HTTPS and uses DM Sync (OMA DM v1.2) as the message payload. This topic describes the OMA DM functionality that the DM client supports in general. The full description of the OMA DM protocol v1.2 can be found at the [OMA website](https://www.openmobilealliance.org/release/DM/V1_2-20070209-A/OMA-TS-DM_Protocol-V1_2-20070209-A.pdf). ## In this topic @@ -62,7 +62,7 @@ The following table shows the OMA DM standards that Windows uses.

DM protocol commands

-

The following list shows the commands that are used by the device. For further information about the OMA DM command elements, see "SyncML Representation Protocol Device Management Usage (OMA-SyncML-DMRepPro-V1_1_2-20030613-A)" available from the [OMA website](https://go.microsoft.com/fwlink/p/?LinkId=267526).

+

The following list shows the commands that are used by the device. For further information about the OMA DM command elements, see "SyncML Representation Protocol Device Management Usage (OMA-SyncML-DMRepPro-V1_1_2-20030613-A)" available from the [OMA website](https://www.openmobilealliance.org/release/DM/V1_1_2-20031209-A/).