Added check for #Ignore O365 device in ITG notes.

This allows manually ignoring O365 and Intune activated devices.

User Audit.ps1

@@ -2768,7 +2768,11 @@ if ($FullMatches) {
 							if (($O365Devices | Measure-Object).Count -gt 0) {
 								# Filter any devices that aren't in the Device DB and dont use our naming convention (as these may be personal devices)
 								$Computers = Get-DeviceDBDevices
-								$O365Devices = $O365Devices | Where-Object { $_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*" }
+								$O365Devices = $O365Devices | Where-Object { 
+									($_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*") -and
+									$Contact.notes -notlike "*# Ignore O365 Device: $($_.DisplayName.Trim())*" -and
+									$Contact.notes -notlike "*# Ignore InTune Device: $($_.DisplayName.Trim())*"
+								}
 							}
 							if (($O365Devices | Measure-Object).Count -gt 0) {
 								$EmailOnlyDetails = "Has the following O365 Activated Devices: " + ($O365Devices.DisplayName -join ", ")
@@ -2778,7 +2782,11 @@ if ($FullMatches) {
 								if (($IntuneDevices | Measure-Object).Count -gt 0) {
 									# Filter any devices that aren't in the Device DB and dont use our naming convention (as these may be personal devices)
 									$Computers = Get-DeviceDBDevices
-									$IntuneDevices = $IntuneDevices | Where-Object { $_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*" }
+									$IntuneDevices = $IntuneDevices | Where-Object { 
+										($_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*") -and
+										$Contact.notes -notlike "*# Ignore O365 Device: $($_.DisplayName.Trim())*" -and
+										$Contact.notes -notlike "*# Ignore InTune Device: $($_.DisplayName.Trim())*"
+									}
 								}
 								if (($IntuneDevices | Measure-Object).Count -gt 0) {
 									$EmailOnlyDetails = "Has the following assigned InTune Devices: " + ($IntuneDevices.DisplayName -join ", ")

User_Billing_Update.ps1

@@ -1295,7 +1295,11 @@ if ($UserAudit) {
 								if (($O365Devices | Measure-Object).Count -gt 0) {
 									# Filter any devices that aren't in the Device DB and dont use our naming convention (as these may be personal devices)
 									$Computers = Get-DeviceDBDevices
-									$O365Devices = $O365Devices | Where-Object { $_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*" }
+									$O365Devices = $O365Devices | Where-Object { 
+										($_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*") -and
+										$Contact.notes -notlike "*# Ignore O365 Device: $($_.DisplayName.Trim())*" -and
+										$Contact.notes -notlike "*# Ignore InTune Device: $($_.DisplayName.Trim())*"
+									}
 								}
 								if (($O365Devices | Measure-Object).Count -gt 0) {
 									$EmailOnlyDetails = "Has the following O365 Activated Devices: " + ($O365Devices.DisplayName -join ", ")
@@ -1305,7 +1309,11 @@ if ($UserAudit) {
 									if (($IntuneDevices | Measure-Object).Count -gt 0) {
 										# Filter any devices that aren't in the Device DB and dont use our naming convention (as these may be personal devices)
 										$Computers = Get-DeviceDBDevices
-										$IntuneDevices = $IntuneDevices | Where-Object { $_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*" }
+										$IntuneDevices = $IntuneDevices | Where-Object { 
+											($_.DisplayName -in $Computers.Hostname -or $_.DisplayName -like "$($OrgShortName)-*") -and
+											$Contact.notes -notlike "*# Ignore O365 Device: $($_.DisplayName.Trim())*" -and
+											$Contact.notes -notlike "*# Ignore InTune Device: $($_.DisplayName.Trim())*"
+										}
 									}
 									if (($IntuneDevices | Measure-Object).Count -gt 0) {
 										$EmailOnlyDetails = "Has the following assigned InTune Devices: " + ($IntuneDevices.DisplayName -join ", ")

currentversion.txt

@@ -1 +1 @@
-2.18.6
+2.18.7