From 6b5d4cee87e9c877c04ed56c46116626f6632c47 Mon Sep 17 00:00:00 2001
From: AdminDroid <49208841+admindroid-community@users.noreply.github.com>
Date: Fri, 6 Dec 2019 11:49:02 +0530
Subject: [PATCH] Update O365UserLicenseReport.ps1

Added country in the report
---
 .../O365UserLicenseReport.ps1                 | 127 +++++++++---------
 1 file changed, 64 insertions(+), 63 deletions(-)

diff --git a/Office 365 User License Report/O365UserLicenseReport.ps1 b/Office 365 User License Report/O365UserLicenseReport.ps1
index 718bea0..9c9a5dd 100644
--- a/Office 365 User License Report/O365UserLicenseReport.ps1	
+++ b/Office 365 User License Report/O365UserLicenseReport.ps1	
@@ -1,4 +1,4 @@
-#Using this script administrator can identify all licensed users with their assigned licenses, services, and its status. 
+#Using this script administrator can identify all licensed users with their assigned licenses, services, and its status.
 
 Param
 (
@@ -11,24 +11,25 @@ Function Get_UsersLicenseInfo
 {
   $LicensePlanWithEnabledService=""
   $FriendlyNameOfLicensePlanWithService=""
-  $upn=$_.userprincipalname 
-  Write-Progress -Activity "`n     Exported user count:$LicensedUserCount "`n"Currently Processing:$upn" 
-  #Get all asssigned SKU for current user 
-  $Skus=$_.licenses.accountSKUId 
+  $upn=$_.userprincipalname
+  $Country=$_.Country
+  Write-Progress -Activity "`n     Exported user count:$LicensedUserCount "`n"Currently Processing:$upn"
+  #Get all asssigned SKU for current user
+  $Skus=$_.licenses.accountSKUId
   $LicenseCount=$skus.count
-  $count=0 
-  #Loop through each SKUid 
+  $count=0
+  #Loop through each SKUid
   foreach($Sku in $Skus)  #License loop
-  { 
-   #Convert Skuid to friendly name 
-   $LicenseItem= $Sku -Split ":" | Select-Object -Last 1 
-   $EasyName=$FriendlyNameHash[$LicenseItem] 
-   if(!($EasyName)) 
-   {$NamePrint=$LicenseItem} 
-   else 
-   {$NamePrint=$EasyName} 
-   #Get all services for current SKUId 
-   $Services=$_.licenses[$count].ServiceStatus 
+  {
+   #Convert Skuid to friendly name
+   $LicenseItem= $Sku -Split ":" | Select-Object -Last 1
+   $EasyName=$FriendlyNameHash[$LicenseItem]
+   if(!($EasyName))
+   {$NamePrint=$LicenseItem}
+   else
+   {$NamePrint=$EasyName}
+   #Get all services for current SKUId
+   $Services=$_.licenses[$count].ServiceStatus
    if(($Count -gt 0) -and ($count -lt $LicenseCount))
    {
     $LicensePlanWithEnabledService=$LicensePlanWithEnabledService+","
@@ -39,9 +40,9 @@ Function Get_UsersLicenseInfo
    $serviceExceptDisabled=""
    $FriendlyNameOfServiceExceptDisabled=""
    foreach($Service in $Services) #Service loop
-   { 
+   {
     $flag=0
-    $ServiceName=$Service.ServicePlan.ServiceName 
+    $ServiceName=$Service.ServicePlan.ServiceName
     if($service.ProvisioningStatus -eq "Disabled")
     {
      $DisabledServiceCount++
@@ -56,17 +57,17 @@ Function Get_UsersLicenseInfo
      $serviceExceptDisabled =$serviceExceptDisabled+$ServiceName
      $flag=1
     }
-    #Convert ServiceName to friendly name 
-    for($i=0;$i -lt $ServiceArray.length;$i +=2) 
-    { 
-     $ServiceFriendlyName = $ServiceName 
-     $Condition = $ServiceName -Match $ServiceArray[$i] 
-     if($Condition -eq "True") 
-     { 
-      $ServiceFriendlyName=$ServiceArray[$i+1] 
-      break 
-     } 
-    } 
+    #Convert ServiceName to friendly name
+    for($i=0;$i -lt $ServiceArray.length;$i +=2)
+    {
+     $ServiceFriendlyName = $ServiceName
+     $Condition = $ServiceName -Match $ServiceArray[$i]
+     if($Condition -eq "True")
+     {
+      $ServiceFriendlyName=$ServiceArray[$i+1]
+      break
+     }
+    }
     if($flag -eq 1)
     {
      if($EnabledServiceCount -ne 1)
@@ -75,12 +76,12 @@ Function Get_UsersLicenseInfo
     }
     $FriendlyNameOfServiceExceptDisabled =$FriendlyNameOfServiceExceptDisabled+$ServiceFriendlyName
    }
-   #Store Service and its status in Hash table 
+   #Store Service and its status in Hash table
    $Result = @{'DisplayName'=$_.Displayname;'UserPrinciPalName'=$upn;'LicensePlan'=$Licenseitem;'FriendlyNameofLicensePlan'=$nameprint;'ServiceName'=$service.ServicePlan.ServiceName;
-   'FriendlyNameofServiceName'=$serviceFriendlyName;'ProvisioningStatus'=$service.ProvisioningStatus} 
-    $Results = New-Object PSObject -Property $Result 
+   'FriendlyNameofServiceName'=$serviceFriendlyName;'ProvisioningStatus'=$service.ProvisioningStatus}
+    $Results = New-Object PSObject -Property $Result
     $Results |select-object DisplayName,UserPrinciPalName,LicensePlan,FriendlyNameofLicensePlan,ServiceName,FriendlyNameofServiceName,
-        ProvisioningStatus | Export-Csv -Path $ExportCSV -Notype -Append 
+        ProvisioningStatus | Export-Csv -Path $ExportCSV -Notype -Append
   }
   if($Disabledservicecount -eq 0)
   {
@@ -91,38 +92,38 @@ Function Get_UsersLicenseInfo
   $FriendlyNameOfLicensePlanWithService=$FriendlyNameOfLicensePlanWithService+ $NamePrint + "[" + $FriendlyNameOfServiceExceptDisabled +"]"
   #Increment SKUid count
   $count++
- } 
- $Output=@{'Displayname'=$_.Displayname;'UserPrincipalName'=$upn;'LicensePlanWithEnabledService'=$LicensePlanWithEnabledService;
+ }
+ $Output=@{'Displayname'=$_.Displayname;'UserPrincipalName'=$upn;Country=$Country;'LicensePlanWithEnabledService'=$LicensePlanWithEnabledService;
       'FriendlyNameOfLicensePlanAndEnabledService'=$FriendlyNameOfLicensePlanWithService}
  $Outputs= New-Object PSObject -Property $output
- $Outputs | Select-Object Displayname,userprincipalname,LicensePlanWithEnabledService,FriendlyNameOfLicensePlanAndEnabledService | Export-Csv -path $ExportSimpleCSV -NoTypeInformation -Append 
-} 
+ $Outputs | Select-Object Displayname,userprincipalname,Country,LicensePlanWithEnabledService,FriendlyNameOfLicensePlanAndEnabledService | Export-Csv -path $ExportSimpleCSV -NoTypeInformation -Append 
+}
 
 
 Function main()
 {
- #Clean up session 
+ #Clean up session
  Get-PSSession | Remove-PSSession
- #Connect AzureAD from PowerShell 
- Connect-MsolService  
- #Set output file 
- $ExportCSV=".\DetailedO365UserLicenseReport_$((Get-Date -format yyyy-MMM-dd-ddd` hh-mm` tt).ToString()).csv" 
- $ExportSimpleCSV=".\SimpleO365UserLicenseReport_$((Get-Date -format yyyy-MMM-dd-ddd` hh-mm` tt).ToString()).csv" 
- #FriendlyName list for license plan and service 
- $FriendlyNameHash=Get-Content -Raw -Path .\LicenseFriendlyName.txt -ErrorAction Stop | ConvertFrom-StringData 
- $ServiceArray=Get-Content -Path .\ServiceFriendlyName.txt -ErrorAction Stop 
- #Hash table declaration 
- $Result="" 
- $Results=@() 
+ #Connect AzureAD from PowerShell
+ Connect-MsolService
+ #Set output file
+ $ExportCSV=".\DetailedO365UserLicenseReport_$((Get-Date -format yyyy-MMM-dd-ddd` hh-mm` tt).ToString()).csv"
+ $ExportSimpleCSV=".\SimpleO365UserLicenseReport_$((Get-Date -format yyyy-MMM-dd-ddd` hh-mm` tt).ToString()).csv"
+ #FriendlyName list for license plan and service
+ $FriendlyNameHash=Get-Content -Raw -Path .\LicenseFriendlyName.txt -ErrorAction Stop | ConvertFrom-StringData
+ $ServiceArray=Get-Content -Path .\ServiceFriendlyName.txt -ErrorAction Stop
+ #Hash table declaration
+ $Result=""
+ $Results=@()
  $output=""
  $outputs=@()
- #Get licensed user 
- $LicensedUserCount=0 
+ #Get licensed user
+ $LicensedUserCount=0
 
  #Check for input file/Get users from input file
- if([string]$UserNamesFile -ne "") 
- { 
-  #We have an input file, read it into memory 
+ if([string]$UserNamesFile -ne "")
+ {
+  #We have an input file, read it into memory
   $UserNames=@()
   $UserNames=Import-Csv -Header "DisplayName" $UserNamesFile
   $userNames
@@ -146,13 +147,13 @@ Function main()
  #Open output file after execution
  Write-Host Detailed report available in: $ExportCSV
  Write-host Simple report available in: $ExportSimpleCSV
- $Prompt = New-Object -ComObject wscript.shell 
- $UserInput = $Prompt.popup("Do you want to open output files?",` 
- 0,"Open Files",4) 
- If ($UserInput -eq 6) 
- { 
-  Invoke-Item "$ExportCSV" 
+ $Prompt = New-Object -ComObject wscript.shell
+ $UserInput = $Prompt.popup("Do you want to open output files?",`
+ 0,"Open Files",4)
+ If ($UserInput -eq 6)
+ {
+  Invoke-Item "$ExportCSV"
   Invoke-Item "$ExportSimpleCSV"
- } 
+ }
 }
- . main
\ No newline at end of file
+ . main