Added fields devicelicensetype and osupdatestatus to <CrOSFieldName>.

docs/ChromeOS-Devices.md

@@ -110,6 +110,7 @@ The second form is backwards compatible with Standard GAM and selection with `<C
         deprovisionreason|
         devicefiles|
         deviceid|
+        devicelicensetype|
         diskvolumereports|
         dockmacaddress|
         ethernetmacaddress|
@@ -128,6 +129,7 @@ The second form is backwards compatible with Standard GAM and selection with `<C
         ordernumber|
         orgunitid|
         orgunitpath|org|ou|
+        osupdatestatus|
         osversion|
         platformversion|
         recentusers|
@@ -135,8 +137,8 @@ The second form is backwards compatible with Standard GAM and selection with `<C
         serialnumber|
         status|
         supportenddate|
-        systemramtotal|
         systemramfreereports|
+        systemramtotal|
         tpmversioninfo|
         willautorenew
 <CrOSFieldNameList> ::= "<CrOSFieldName>(,<CrOSFieldName>)*"

docs/GamUpdates.md

@@ -10,6 +10,10 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation.
 
+### 6.64.06
+
+Added fields `devicelicensetype` and `osupdatestatus` to `<CrOSFieldName>`.
+
 ### 6.64.05
 
 Added `matchfield organizerself <Boolean>` to `<EventMatchProperty>` to simplify selecting events

docs/How-to-Upgrade-from-Standard-GAM.md

@@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAMADV-XTD3 6.64.05 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
+GAMADV-XTD3 6.64.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.10.8 64-bit final
 MacOS High Sierra 10.13.6 x86_64
@@ -984,7 +984,7 @@ writes the credentials into the file oauth2.txt.
 C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt
 C:\GAMADV-XTD3>gam version
 WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
-GAMADV-XTD3 6.64.05 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
+GAMADV-XTD3 6.64.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.11.5 64-bit final
 Windows-10-10.0.17134 AMD64

docs/Users-Drive-Copy-Move.md

@@ -610,7 +610,7 @@ Moving a Drive folder to a Shared Drive is not directly supported by the API; GA
 recursively adjust the files/folders within it to point to the new parent folder. Once the original folder is emptied, it is deleted unless `retainsourcefolders` is specified.
 
 ### Move content of a Shared Drive to another Shared Drive
-Suppose you have a source Shared Drive called 0AC_1AB with multiple files and folders, and want to move all of its content to the target Shared Drive 0AE_9ZX.
+Suppose you have a source Shared Drive with ID 0AC_1AB with multiple files and folders, and want to move all of its content to the target Shared Drive with ID 0AE_9ZX.
 
 The following command will change the parents of the top level files and folders from 0AC_1AB to 0AE_9ZX; the sub files and folders will move along with their top level folder.
 
@@ -619,3 +619,7 @@ The following command will change the parents of the top level files and folders
 gam user user@domain.com move drivefile teamdriveid 0AC_1AB teamdriveparentid 0AE_9ZX mergewithparent 
 ```
 
+If you want the source Shared Drive with ID 0AC_1AB to be contained in a top level folder of the target Shared Drive with ID 0AE_9ZX, omit the `mergewithparent` argument.
+```
+gam user user@domain.com move drivefile teamdriveid 0AC_1AB teamdriveparentid 0AE_9ZX
+```

docs/Version-and-Help.md

@@ -1,9 +1,10 @@
+
 # Version and Help
 
 Print the current version of Gam with details
 ```
 gam version
-GAMADV-XTD3 6.64.05 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
+GAMADV-XTD3 6.64.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.11.5 64-bit final
 MacOS Monterey 12.6.6 x86_64
@@ -15,7 +16,7 @@ Time: 2023-06-02T21:10:00-07:00
 Print the current version of Gam with details and time offset information
 ```
 gam version timeoffset
-GAMADV-XTD3 6.64.05 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
+GAMADV-XTD3 6.64.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.11.5 64-bit final
 MacOS Monterey 12.6.6 x86_64
@@ -27,7 +28,7 @@ Your system time differs from www.googleapis.com by less than 1 second
 Print the current version of Gam with extended details and SSL information
 ```
 gam version extended
-GAMADV-XTD3 6.64.05 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
+GAMADV-XTD3 6.64.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.11.5 64-bit final
 MacOS Monterey 12.6.6 x86_64
@@ -64,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64
 Path: /Users/Admin/bin/gamadv-xtd3
 Version Check:
   Current: 5.35.08
-   Latest: 6.64.05
+   Latest: 6.64.06
 echo $?
 1
 ```
@@ -72,7 +73,7 @@ echo $?
 Print the current version number without details
 ```
 gam version simple
-6.64.05
+6.64.06
 ```
 In Linux/MacOS you can do:
 ```
@@ -82,7 +83,7 @@ echo $VER
 Print the current version of Gam and address of this Wiki
 ```
 gam help
-GAM 6.64.05 - https://github.com/taers232c/GAMADV-XTD3
+GAM 6.64.06 - https://github.com/taers232c/GAMADV-XTD3
 Ross Scroggs <ross.scroggs@gmail.com>
 Python 3.11.5 64-bit final
 MacOS Monterey 12.6.6 x86_64

src/GamCommands.txt

@@ -2182,6 +2182,7 @@ gam <CrOSTypeEntity> update <CrOSAttribute>+ [quickcrosmove [<Boolean>]] [nobatc
         deprovisionreason|
         devicefiles|
         deviceid|
+        devicelicensetype|
         diskvolumereports|
         dockmacaddress|
         ethernetmacaddress|
@@ -2200,6 +2201,7 @@ gam <CrOSTypeEntity> update <CrOSAttribute>+ [quickcrosmove [<Boolean>]] [nobatc
         ordernumber|
         orgunitid|
         orgunitpath|org|ou|
+        osupdatestatus|
         osversion|
         platformversion|
         recentusers|
@@ -2207,8 +2209,8 @@ gam <CrOSTypeEntity> update <CrOSAttribute>+ [quickcrosmove [<Boolean>]] [nobatc
         serialnumber|
         status|
         supportenddate|
-        systemramtotal|
         systemramfreereports|
+        systemramtotal|
         tpmversioninfo|
         willautorenew
 <CrOSFieldNameList> ::= "<CrOSFieldName>(,<CrOSFieldName>)*"

src/GamUpdate.txt

@@ -1,3 +1,7 @@
+6.64.06
+
+Added fields `devicelicensetype` and `osupdatestatus` to `<CrOSFieldName>`.
+
 6.64.05
 
 Added `matchfield organizerself <Boolean>` to `<EventMatchProperty>` to simplify selecting events

src/gam/__init__.py

@@ -22665,6 +22665,7 @@ CROS_FIELDS_CHOICE_MAP = {
   'deprovisionreason': 'deprovisionReason',
   'devicefiles': ['deviceFiles.type', 'deviceFiles.createTime'],
   'deviceid': 'deviceId',
+  'devicelicensetype': 'deviceLicenseType',
   'diskvolumereports': 'diskVolumeReports',
   'dockmacaddress': 'dockMacAddress',
   'ethernetmacaddress': 'ethernetMacAddress',
@@ -22685,6 +22686,7 @@ CROS_FIELDS_CHOICE_MAP = {
   'org': 'orgUnitPath',
   'orgunitid': 'orgUnitId',
   'orgunitpath': 'orgUnitPath',
+  'osupdatestatus': 'osUpdateStatus',
   'osversion': 'osVersion',
   'ou': 'orgUnitPath',
   'platformversion': 'platformVersion',
@@ -22715,6 +22717,7 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
   'notes',
   'serialNumber',
   'status',
+  'deviceLicenseType',
   'model',
   'firmwareVersion',
   'platformVersion',