diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index e1c025dc..7d7098cb 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -29,7 +29,8 @@
 //..........
 
 
-
+	Customer work order form / view / open???
+	Customer CSR form has a bunch of todo in the template, WTF?
 	Dashboard / widgets
 		Just enough an no more, this could be endless, come up with a top 5 or something and limit it to that
 		(this is also a very juicy v.next feature thing too)
@@ -94,6 +95,16 @@ Coded by importance
   \_____|______|_____|______|_| \_|  |_|   
                                            
                                            
+- 1 refactoring let to const
+	remove all these: 
+	
+
+
+ 
+ 
+ 
+ 
+ 
 
 - 1 BUG BUG: attempt to delete a customer with a linked unit (so it can't be deleted) and get error properly but overlay stays on form
 	whatever this is needs to be fixed everywhere
diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 6987d842..5c05dabe 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -2,7 +2,6 @@
   <v-app>
     <gznotify ref="gznotify"></gznotify>
     <gzconfirm ref="gzconfirm"></gzconfirm>
-    <!-- <gzreportselector ref="gzreportselector"></gzreportselector> -->
     <!-- Width of nav drawer set to allow widest translated text menu item to show which is spanish client service requests item 
     and also leave a tiny space to click on outside of nav for galaxy 9 phone (narrowest width supported device) 
     
@@ -137,7 +136,6 @@
         </div>
       </template>
     </v-navigation-drawer>
-    <!-- :color="appBar.isMain ? 'primary' : 'secondary'" style="width: 300px" -->
     <v-app-bar v-if="isAuthenticated" :color="appBar.color" dark fixed app>
       <v-app-bar-nav-icon
         @click.stop="drawer = !drawer"
@@ -236,16 +234,12 @@
     </v-main>
   </v-app>
 </template>
-
 <script>
-/*  Xeslint-disable    */
-
 import gzconfirm from "./components/gzconfirm";
 import gznotify from "./components/gznotify";
 import openObjectHandler from "./api/open-object-handler";
 import notifyPoll from "./api/notifypoll";
 import { processLogout } from "./api/authutil";
-
 export default {
   components: {
     gzconfirm,
@@ -300,14 +294,10 @@ export default {
     window.$gz.eventBus.$off();
   },
   mounted() {
-    let vm = this;
+    const vm = this;
     vm.$vuetify.theme.dark = vm.$store.state.darkMode;
     vm.$root.$gzconfirm = vm.$refs.gzconfirm.open;
     vm.$root.$gznotify = vm.$refs.gznotify.addNotification;
-
-    //weird bastardization thing
-    //basically I want to access $gz in vue components where I can't access Window
-    //this smells bad but it works
     vm.$root.$gz = window.$gz;
 
     //direct open path?
@@ -323,7 +313,7 @@ export default {
       toPath = undefined;
     }
 
-    let isReset = toPath && toPath.includes("home-reset");
+    const isReset = toPath && toPath.includes("home-reset");
     if (isReset && vm.$store.state.authenticated) {
       processLogout();
     }
@@ -411,7 +401,7 @@ export default {
       }
 
       //User is logged in offer to update in a dialog with translated text
-      let dialogResult = await window.$gz.dialog.confirmGeneric(
+      const dialogResult = await window.$gz.dialog.confirmGeneric(
         "UpdateAvailable"
       );
       if (dialogResult == false) {
diff --git a/ayanova/src/api/authorizationroles.js b/ayanova/src/api/authorizationroles.js
index 9904e716..3ad66154 100644
--- a/ayanova/src/api/authorizationroles.js
+++ b/ayanova/src/api/authorizationroles.js
@@ -1,5 +1,3 @@
-/* xeslint-disable */
-
 import bizrolerights from "./biz-role-rights";
 
 export default {
@@ -118,15 +116,9 @@ export default {
     //DELETE = SAME AS CHANGE FOR NOW (There is no specific delete right for now though it's checked for by routes in Authorized.cs in case we want to add it in future as a separate right from create.)
     //NOTE: biz rules can supersede this, this is just for general rights purposes, if an object has restrictive business rules they will take precedence  every time.
 
-    let ret = this.defaultRightsObject();
+    const ret = this.defaultRightsObject();
 
     //Get the type name from the type enum value
-    //de-lodash
-    // let typeName = window.$gz. _.findKey(window.$gz.type, function(o) {
-    //   return o == aType;
-    // });
-
-    //my _.findKey replacement:
     let typeName = undefined;
     for (const [key, value] of Object.entries(window.$gz.type)) {
       if (value == aType) {
@@ -136,7 +128,7 @@ export default {
     }
 
     //Get the AyaNova stock REQUIRED role rights for that object
-    let objectRoleRights = this.ROLE_RIGHTS[typeName];
+    const objectRoleRights = this.ROLE_RIGHTS[typeName];
     if (!objectRoleRights) {
       throw new Error(
         `authorizationroles::getRights type ${aType} not found in roles collection`
@@ -144,11 +136,11 @@ export default {
     }
 
     //get the logged in user's role
-    let userRole = window.$gz.store.state.roles;
+    const userRole = window.$gz.store.state.roles;
     //calculate the effective rights
     //a non zero result of the bitwise calculation means true and zero means false so using !! to force it into a boolean value
     //(contrary to some style guides that say !! is obscure but I say it saves a lot of typing)
-    let canChange = !!(userRole & objectRoleRights.Change);
+    const canChange = !!(userRole & objectRoleRights.Change);
     //sometimes rights to read are false if change is true since change trumps read anyway so accordingly:
     let canReadFullRecord = canChange;
     if (!canReadFullRecord) {
@@ -167,7 +159,7 @@ export default {
   // (i.e. grids, history etc, initialization of main menu etc)
   //
   canOpen(aType) {
-    let r = this.getRights(aType);
+    const r = this.getRights(aType);
     //convention is change might be defined but not read so canOpen is true eitehr way
     return r.change == true || r.read == true;
   },
@@ -176,46 +168,7 @@ export default {
   // (i.e. grids, history etc, initialization of main menu etc)
   //
   canChange(aType) {
-    let r = this.getRights(aType);
+    const r = this.getRights(aType);
     return r.change == true;
   }
 };
-/*
-USING BITWISE OPERATORS CHEAT SHEET
-//https://codeburst.io/using-javascript-bitwise-operators-in-real-life-f551a731ff5
-// Test whether your bit number has a single attribute. '&' ensures
-// an intersection between them.
-if (myBitNumber & HAS_FOO1) {
-  // False, in this example
-}
-if (myBitNumber & HAS_FOO2) {
-  // True!
-}
-
-// Test whether your bit number has ANY of the specified attributes
-if (myBitNumber & (HAS_FOO1 | HAS_FOO2)) {
-  // True!
-}
-if (myBitNumber & (HAS_FOO1 | HAS_FOO3)) {
-  // False
-}
-
-// Test whether your bit number contains ONLY the specified attributes
-if (myBitNumber == (HAS_FOO2 | HAS_FOO4)) {
-  // True
-}
-if (myBitNumber == (HAS_FOO2 | HAS_FOO3 | HAS_FOO4)) {
-  // False
-}
-
-// Test whether your bit number contains ALL of the given
-// attributes. This is slightly tricky: the union of ATTRIBUTES 
-// can't supersede `myBitNumber` alone, otherwise it contains a bit
-// that `myBitNumber` doesn't.
-if (myBitNumber == (myBitNumber | (HAS_FOO2 | HAS_FOO4))) {
-  // True
-}
-if (myBitNumber == (myBitNumber | (HAS_FOO2 | HAS_FOO3 | HAS_FOO4))) {
-  // False
-}
-*/
diff --git a/ayanova/src/api/authutil.js b/ayanova/src/api/authutil.js
index 049687f8..b6c96ca5 100644
--- a/ayanova/src/api/authutil.js
+++ b/ayanova/src/api/authutil.js
@@ -1,5 +1,3 @@
-/* xeslint-disable */
-//import decode from "jwt-decode";
 import jwt_decode from "jwt-decode";
 import initialize from "./initialize";
 import notifypoll from "./notifypoll";
@@ -69,11 +67,11 @@ export function processLogin(authResponse, loggedInWithKnownPassword) {
       // );
 
       //Get global settings
-      let gsets = await window.$gz.api.get("global-biz-setting/client");
+      const gsets = await window.$gz.api.get("global-biz-setting/client");
       if (gsets.error) {
         //In a form this would trigger a bunch of validation or error display code but for here and now:
         //convert error to human readable string for display and popup a notification to user
-        let msg = window.$gz.api.apiErrorToHumanString(gsets.error);
+        const msg = window.$gz.api.apiErrorToHumanString(gsets.error);
         window.$gz.eventBus.$emit("notify-error", msg);
       } else {
         //Check if overrides and use them here
@@ -99,7 +97,6 @@ export function processLogout() {
 }
 
 export function isLoggedIn() {
-  //const token = getToken();
   return (
     !!window.$gz.store.state.apiToken &&
     !isTokenExpired(window.$gz.store.state.apiToken)
diff --git a/ayanova/src/api/dash-registry.js b/ayanova/src/api/dash-registry.js
index ec20c981..0882fce7 100644
--- a/ayanova/src/api/dash-registry.js
+++ b/ayanova/src/api/dash-registry.js
@@ -1,5 +1,5 @@
 import authorizationroles from "./authorizationroles";
-let role = authorizationroles.AUTHORIZATION_ROLES;
+const role = authorizationroles.AUTHORIZATION_ROLES;
 export default {
   registry: [
     {
@@ -48,9 +48,9 @@ export default {
     }
   ],
   availableItems() {
-    let ret = [];
+    const ret = [];
     for (let i = 0; i < this.registry.length; i++) {
-      let item = this.registry[i];
+      const item = this.registry[i];
       if (authorizationroles.hasRole(item.roles)) {
         ret.push({ id: item.id, title: item.title, type: item.type });
       }
diff --git a/ayanova/src/api/enums.js b/ayanova/src/api/enums.js
index dee1dc0e..58480709 100644
--- a/ayanova/src/api/enums.js
+++ b/ayanova/src/api/enums.js
@@ -1,5 +1,3 @@
-/* ZZeslint-disable */
-
 export default {
   get(enumKey, enumValue) {
     enumKey = enumKey.toLowerCase();
@@ -11,13 +9,13 @@ export default {
       }
       return window.$gz.store.state.enums[enumKey][enumValue];
     } else {
-      let ret = [];
+      const ret = [];
       if (enumValue == null || enumValue == 0) {
         return "";
       }
-      let availableRoles = this.getSelectionList("AuthorizationRoles");
+      const availableRoles = this.getSelectionList("AuthorizationRoles");
       for (let i = 0; i < availableRoles.length; i++) {
-        let role = availableRoles[i];
+        const role = availableRoles[i];
         if (!!(enumValue & role.id)) {
           ret.push(role.name);
         }
@@ -32,7 +30,7 @@ export default {
   //
   getSelectionList(enumKey, noSort) {
     enumKey = enumKey.toLowerCase();
-    let e = window.$gz.store.state.enums[enumKey];
+    const e = window.$gz.store.state.enums[enumKey];
     if (!e) {
       throw new Error(
         "ERROR enums::getSelectionList -> enumKey " +
@@ -40,7 +38,7 @@ export default {
           " is missing from store"
       );
     }
-    let ret = [];
+    const ret = [];
 
     //turn it into an array suitable for selection lists
     for (const [key, value] of Object.entries(e)) {
@@ -65,19 +63,19 @@ export default {
     for (let i = 0; i < enumKey.length; i++) {
       //check if list
       //if not then fetch it and store it
-      let k = enumKey[i].toLowerCase();
+      const k = enumKey[i].toLowerCase();
 
       //de-lodash
       //   if (!window.$gz. _.has(window.$gz.store.state.enums, k)) {
       //enums is an object this is checking if that object has a key with the name in k
       if (!window.$gz.util.has(window.$gz.store.state.enums, k)) {
-        let that = this;
+        const that = this;
         // eslint-disable-next-line
-        let dat = await that.fetchEnumKey(k);
+        const dat = await that.fetchEnumKey(k);
         //massage the data as necessary
-        let e = { enumKey: k, items: {} };
+        const e = { enumKey: k, items: {} };
         for (let i = 0; i < dat.length; i++) {
-          let o = dat[i];
+          const o = dat[i];
           e.items[o.id] = o.name;
         }
         //stuff the data into the store
@@ -87,7 +85,7 @@ export default {
   },
   async fetchEnumKey(enumKey) {
     // eslint-disable-next-line
-    let res = await window.$gz.api.get("enum-list/list/" + enumKey);
+    const res = await window.$gz.api.get("enum-list/list/" + enumKey);
     //We never expect there to be no data here
     if (!res.hasOwnProperty("data")) {
       return Promise.reject(res);
diff --git a/ayanova/src/api/errorhandler.js b/ayanova/src/api/errorhandler.js
index d646af8f..afd603dc 100644
--- a/ayanova/src/api/errorhandler.js
+++ b/ayanova/src/api/errorhandler.js
@@ -1,4 +1,3 @@
-/*  xeslint-disable */
 let lastMessageHash = 0;
 let lastMessageTimeStamp = new Date();
 
@@ -9,9 +8,9 @@ let lastMessageTimeStamp = new Date();
 async function dealWithError(msg, vm) {
   //Check if this is the same message again as last time within a short time span to avoid endless looping errors of same message
   //but still allow for user to repeat operation that causes error so they can view it
-  let newHash = window.$gz.util.quickHash(msg);
+  const newHash = window.$gz.util.quickHash(msg);
   if (newHash == lastMessageHash) {
-    let tsnow = new Date();
+    const tsnow = new Date();
     //don't show the same exact message if it was just shown less than 1 second ago
     if (tsnow - lastMessageTimeStamp < 1000) return;
   }
@@ -29,7 +28,7 @@ async function dealWithError(msg, vm) {
   }
   window.$gz.store.commit("logItem", msg);
   if (window.$gz.dev) {
-    let errMsg = "DEV MODE errorHandler.js:: Unexpected error: \r\n" + msg;
+    const errMsg = "DEV MODE errorHandler.js:: Unexpected error: \r\n" + msg;
     // eslint-disable-next-line no-console
     console.error(errMsg);
 
@@ -41,7 +40,6 @@ async function dealWithError(msg, vm) {
   if (!vm || vm.formState == undefined) {
     //popup if no place to display it elsewise
     window.$gz.eventBus.$emit("notify-error", msg);
-    //debugger;
     return;
   }
 
@@ -98,7 +96,7 @@ function decodeError(e, vm) {
 
   //API error object?
   if (e.error) {
-    let err = e.error;
+    const err = e.error;
     // {
     //   "code": "2002",
     //   "message": "See server log for details",
diff --git a/ayanova/src/api/form-custom-template.js b/ayanova/src/api/form-custom-template.js
index 638364a6..93ee7b9a 100644
--- a/ayanova/src/api/form-custom-template.js
+++ b/ayanova/src/api/form-custom-template.js
@@ -1,5 +1,3 @@
-/*Xeslint-disable */
-
 ///Add data key names which make the custom fields control work more easily
 ///Since the names can be inferred from the data that comes from the server it saves bandwidth to do it here at the client
 function addDataKeyNames(obj) {
@@ -27,7 +25,7 @@ export default {
       !window.$gz.util.has(window.$gz.store.state.formCustomTemplate, formKey)
     ) {
       //fetch and populate the store
-      let res = await window.$gz.api.get("form-custom/" + formKey);
+      const res = await window.$gz.api.get("form-custom/" + formKey);
       if (res.error) {
         throw new Error(window.$gz.errorHandler.errorToString(res, vm));
       }
@@ -55,7 +53,7 @@ export default {
       );
     }
 
-    let template = window.$gz.store.state.formCustomTemplate[formKey];
+    const template = window.$gz.store.state.formCustomTemplate[formKey];
     if (template === undefined) {
       throw new Error(
         "ERROR form-custom-template::getFieldTemplateValue -> Store is missing form template for [" +
@@ -66,12 +64,10 @@ export default {
 
     //Note that not every field being requested will exist so it's valid to return undefined
     //template is an array of objects that contain a key called "fld"
-    //de-lodash
-    //let templateItem = window.$gz. _.find(template, ["fld", fieldKey]);
     return template.find(z => z.fld == fieldKey);
   },
   getTemplateConcurrencyToken(formKey) {
-    let tok =
+    const tok =
       window.$gz.store.state.formCustomTemplate[formKey + "_concurrencyToken"];
     if (tok === undefined) {
       throw new Error(
diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js
index cb289154..b1f39cba 100644
--- a/ayanova/src/api/gzapi.js
+++ b/ayanova/src/api/gzapi.js
@@ -1,4 +1,3 @@
-/* Xeslint-disable */
 import router from "../router";
 
 function stringifyPrimitive(v) {
@@ -22,7 +21,7 @@ function stringifyPrimitive(v) {
 // return true if handled or false if not
 //
 function handleError(action, error, route) {
-  let errorMessage =
+  const errorMessage =
     "API error: " + action + " route =" + route + ", message =" + error.message;
   window.$gz.store.commit("logItem", errorMessage);
 
@@ -80,7 +79,6 @@ function handleError(action, error, route) {
 
   //Ideally this should never get called because any issue should be addressed above
   window.$gz.errorHandler.handleFormError(error);
-  // devShowUnknownError(error);
 }
 
 export default {
@@ -166,7 +164,7 @@ export default {
       //no content, nothing to process
       return response;
     }
-    let contentType = response.headers.get("content-type");
+    const contentType = response.headers.get("content-type");
 
     if (!contentType) {
       return response;
@@ -188,7 +186,7 @@ export default {
       //no content, nothing to process
       return response;
     }
-    let contentType = response.headers.get("content-type");
+    const contentType = response.headers.get("content-type");
     if (!contentType) {
       return response;
     }
@@ -210,7 +208,6 @@ export default {
   },
   patchAuthorizedHeaders() {
     return {
-      //Accept: "application/json, text/plain, */*",
       Accept: "application/json",
       "Content-Type": "application/json-patch+json",
       Authorization: "Bearer " + window.$gz.store.state.apiToken
@@ -308,10 +305,7 @@ export default {
   //
   genericDownloadUrl(route) {
     //http://localhost:7575/api/v8/backup/download/100?t=sssss
-
-    let url = route + "?t=" + window.$gz.store.state.downloadToken;
-
-    return this.APIUrl(url);
+    return this.APIUrl(route + "?t=" + window.$gz.store.state.downloadToken);
   },
   /////////////////////////////
   // report file download URL
@@ -319,13 +313,12 @@ export default {
   reportDownloadUrl(fileName) {
     //http://localhost:7575/api/v8/report/download/filename.pdf?t=sssss
 
-    let url =
+    return this.APIUrl(
       "report/download/" +
-      fileName +
-      "?t=" +
-      window.$gz.store.state.downloadToken;
-
-    return this.APIUrl(url);
+        fileName +
+        "?t=" +
+        window.$gz.store.state.downloadToken
+    );
   },
   /////////////////////////////
   // backup file download URL
@@ -333,13 +326,12 @@ export default {
   backupDownloadUrl(fileName) {
     //http://localhost:7575/api/v8/backup/download/100?t=sssss
 
-    let url =
+    return this.APIUrl(
       "backup/download/" +
-      fileName +
-      "?t=" +
-      window.$gz.store.state.downloadToken;
-
-    return this.APIUrl(url);
+        fileName +
+        "?t=" +
+        window.$gz.store.state.downloadToken
+    );
   },
   /////////////////////////////
   // attachment download URL
@@ -366,9 +358,7 @@ export default {
   // (size= 'small', 'medium', 'large')
   logoUrl(size) {
     //http://localhost:7575/api/v8/logo/small
-
-    let url = "logo/" + size;
-    return this.APIUrl(url);
+    return this.APIUrl("logo/" + size);
   },
   /////////////////////////////
   // REPLACE END OF URL
@@ -389,7 +379,7 @@ export default {
     if (typeof obj === "object") {
       return Object.keys(obj)
         .map(function(k) {
-          let ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
+          const ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
           if (Array.isArray(obj[k])) {
             return obj[k]
               .map(function(v) {
@@ -416,7 +406,7 @@ export default {
   //
   async get(route) {
     try {
-      let that = this;
+      const that = this;
       let r = await fetch(that.APIUrl(route), that.fetchGetOptions());
       that.statusEx(r);
       r = await that.extractBodyEx(r);
@@ -441,7 +431,7 @@ export default {
   //
   async upsert(route, data, isLogin = false) {
     try {
-      let that = this;
+      const that = this;
       //determine if this is a new or existing record
       let fetchOptions = undefined;
       //put?
@@ -451,7 +441,6 @@ export default {
         //post
         //ensure the route doesn't end in /0 which will happen if it's a new record
         //since the edit forms just send the url here with the ID regardless
-        //note: de-lodash was using lodash here endswith method
         if (route.endsWith("/0")) {
           route = route.slice(0, -2);
         }
@@ -471,7 +460,6 @@ export default {
         handleError("UPSERT", error, route);
       } else {
         //specifically this is for the login page
-        //  throw new Error(error);
         throw new Error(window.$gz.errorHandler.errorToString(error));
       }
     }
@@ -480,13 +468,12 @@ export default {
   //  DELETE DATA FROM API SERVER
   //
   async remove(route) {
-    let that = this;
+    const that = this;
     try {
       let r = await fetch(that.APIUrl(route), that.fetchRemoveOptions());
       that.statusEx(r);
       //delete will return a body if there is an error of some kind with the request
       r = await that.extractBodyEx(r);
-
       return r;
     } catch (error) {
       //fundamental error, can't proceed with this call
@@ -498,7 +485,7 @@ export default {
   // (used for puts that can't have a concurrency token like above)
   async put(route, data) {
     try {
-      let that = this;
+      const that = this;
       let r = await fetch(that.APIUrl(route), that.fetchPutOptions(data));
       that.statusEx(r);
       r = await that.extractBodyEx(r);
@@ -512,7 +499,7 @@ export default {
   // (used for post only routes not needing upserts)
   async post(route, data) {
     try {
-      let that = this;
+      const that = this;
       let r = await fetch(that.APIUrl(route), that.fetchPostOptions(data));
       that.statusEx(r);
       r = await that.extractBodyEx(r);
@@ -526,7 +513,7 @@ export default {
   // @param {ayaId:objectid, ayaType:aType, files:[array of files]}
   //
   async uploadAttachment(at) {
-    let that = this;
+    const that = this;
     try {
       var files = at.files;
       var data = new FormData();
@@ -541,7 +528,7 @@ export default {
 
       //-----------------
 
-      let fetchOptions = {
+      const fetchOptions = {
         method: "post",
         mode: "cors",
         headers: {
@@ -565,7 +552,7 @@ export default {
   //
   //
   async upload(route, at) {
-    let that = this;
+    const that = this;
     try {
       var files = at.files;
       var data = new FormData();
@@ -585,7 +572,7 @@ export default {
 
       //-----------------
 
-      let fetchOptions = {
+      const fetchOptions = {
         method: "post",
         mode: "cors",
         headers: {
@@ -608,14 +595,14 @@ export default {
   //
   //
   async uploadLogo(fileData, size) {
-    let that = this;
+    const that = this;
     try {
-      let data = new FormData();
+      const data = new FormData();
       data.append(fileData.name, fileData);
 
       //-----------------
 
-      let fetchOptions = {
+      const fetchOptions = {
         method: "post",
         mode: "cors",
         headers: {
@@ -654,13 +641,13 @@ export default {
   //
   //
   async renderReport(objectid, reportid, redirectNotPopup) {
-    let reportDataOptions = {
+    const reportDataOptions = {
       ReportId: reportid,
       SelectedRowIds: [objectid],
       ClientMeta: this.reportClientMetaData()
     };
 
-    let res = await window.$gz.api.upsert("report/render", reportDataOptions);
+    const res = await window.$gz.api.upsert("report/render", reportDataOptions);
     if (res.error) {
       if (redirectNotPopup) {
         return res;
@@ -668,7 +655,7 @@ export default {
         throw new Error(window.$gz.errorHandler.errorToString(res));
       }
     } else {
-      let reportUrl = window.$gz.api.reportDownloadUrl(res.data);
+      const reportUrl = window.$gz.api.reportDownloadUrl(res.data);
       if (redirectNotPopup) {
         //used for direct report open from direct report view url
         window.location.replace(reportUrl);
@@ -686,10 +673,7 @@ export default {
   //
   //
   async fetchBizObjectName(ayaType, objectId) {
-    //todo: this is a good candidate for a light weight cache
-    //maybe one hour or something to invalidate and volatile on refresh
-    let res = await this.get(`name/${ayaType}/${objectId}`);
-
+    const res = await this.get(`name/${ayaType}/${objectId}`);
     //We never expect there to be no data here
     if (!res.hasOwnProperty("data")) {
       return Promise.reject(res);
diff --git a/ayanova/src/api/gzdialog.js b/ayanova/src/api/gzdialog.js
index c547775e..220f10fa 100644
--- a/ayanova/src/api/gzdialog.js
+++ b/ayanova/src/api/gzdialog.js
@@ -1,4 +1,3 @@
-/* Xeslint-disable */
 let VM_LOCAL = null;
 
 //Calculate a reasonable time to show the alert based on the size of the message and some sane bounds
diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 8bcc2128..3f2c3af3 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -1,4 +1,3 @@
-/* xeslint-disable */
 ///////////////////////////////
 //  gzform
 //
@@ -31,7 +30,6 @@ function isInt(value) {
     return false;
   }
   x = parseFloat(value);
-  // console.log("isInt:", x);
   return (x | 0) === x;
 }
 
@@ -47,27 +45,14 @@ function isNumber(n) {
 //  Get control from ref
 //
 function getControl(vm, ref) {
-  let ctrl = vm.$refs[ref];
-  // if (vm.$ay.dev) {
-  //   // //NOTE: Due to automatic code formatting some refs will come here with newlines in them resulting in no matches
-  //   // console.log("ref before is", ref);
-  //   // let tref = ref.replace(/\s/g, "");
-  //   // console.log("gzform::getcontrol, ref is ", { tref: tref, ref: ref });
-  //   if (ctrl == null) {
-  //     console.log(`gzform::getControl ref ${ref} not found on form`);
-  //   } else {
-  //     console.log(`gzform::getControl ref ${ref} *WAS* found on form!`);
-  //   }
-  // }
-  return ctrl;
+  return vm.$refs[ref];
 }
 
 ////////////////////////////////////
 //  Get value from control
 //
 function getControlValue(ctrl) {
-  let value = ctrl.value;
-  return value;
+  return ctrl.value;
 }
 
 ////////////////////////////////////
@@ -149,23 +134,23 @@ export default {
       return true;
     }
 
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (!isEmpty(value)) {
       return true;
     }
 
     //   "ErrorRequiredFieldEmpty": "{0} is a required field.  Please enter a value for {0}",
     let err = vm.$ay.t("ErrorRequiredFieldEmpty");
-    let fieldName = getControlLabel(ctrl);
+    const fieldName = getControlLabel(ctrl);
     err = err.replace("{0}", fieldName);
     //replace only replaces first instance so need to do it twice
     err = err.replace("{0}", fieldName);
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -180,12 +165,12 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (isEmpty(value)) {
       return true;
     }
@@ -194,10 +179,10 @@ export default {
       //get the translated rule text
       // "ErrorFieldLengthExceeded": "{0} can not exceed {1} characters.",
       let err = vm.$ay.t("ErrorFieldLengthExceeded");
-      let fieldName = getControlLabel(ctrl);
+      const fieldName = getControlLabel(ctrl);
       err = err.replace("{0}", fieldName);
       err = err.replace("{1}", max);
-      //Update the form status
+
       this.setFormState({
         vm: vm,
         valid: false
@@ -224,12 +209,12 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-    let ctrlStart = getControl(vm, refStart);
+    const ctrlStart = getControl(vm, refStart);
     if (typeof ctrlStart == "undefined") {
       return true;
     }
 
-    let ctrlEnd = getControl(vm, refEnd);
+    const ctrlEnd = getControl(vm, refEnd);
     if (typeof ctrlEnd == "undefined") {
       return true;
     }
@@ -255,8 +240,8 @@ export default {
 
     if (valueStart > valueEnd) {
       //   "ErrorStartDateAfterEndDate": "Start date must be earlier than stop / end date",
-      let err = vm.$ay.t("ErrorStartDateAfterEndDate");
-      //Update the form status
+      const err = vm.$ay.t("ErrorStartDateAfterEndDate");
+
       this.setFormState({
         vm: vm,
         valid: false
@@ -274,21 +259,21 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-    let ctrlFirst = getControl(vm, refFirst);
+    const ctrlFirst = getControl(vm, refFirst);
     if (typeof ctrlFirst == "undefined") {
       return true;
     }
 
-    let ctrlSecond = getControl(vm, refSecond);
+    const ctrlSecond = getControl(vm, refSecond);
     if (typeof ctrlSecond == "undefined") {
       return true;
     }
-    let valueFirst = getControlValue(ctrlFirst);
-    let valueSecond = getControlValue(ctrlSecond);
+    const valueFirst = getControlValue(ctrlFirst);
+    const valueSecond = getControlValue(ctrlSecond);
 
     if (valueFirst != valueSecond) {
-      let err = vm.$ay.t("ErrorNoMatch");
-      //Update the form status
+      const err = vm.$ay.t("ErrorNoMatch");
+
       this.setFormState({
         vm: vm,
         valid: false
@@ -305,27 +290,15 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
-
-    let value = getControlValue(ctrl);
-
-    //this block doesn't work and shouldn't be here afaict
-    //if you type a letter for example it presents as empty, I guess because it's set to a numeric input type
-    //in any case, empty isn't a valid integer so it should show as a broken rule when a letter or empty is entered
-    // if (isEmpty(value)) {
-    //   return true;
-    // }
-
+    const value = getControlValue(ctrl);
     if (isInt(value)) {
       return true;
     }
-
-    //   "ErrorFieldValueNotInteger": "Value must be an integer"
-    let err = vm.$ay.t("ErrorFieldValueNotInteger");
-    //Update the form status
+    const err = vm.$ay.t("ErrorFieldValueNotInteger");
     this.setFormState({
       vm: vm,
       valid: false
@@ -343,15 +316,12 @@ export default {
     //TODO: Handle commas and spaces in numbers
     //as per window.$gz.translation rules for numbers
 
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    //DEBUG
-    //logControl("decimalValid", ctrl, ref);
-
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (isEmpty(value)) {
       return true;
     }
@@ -360,9 +330,7 @@ export default {
       return true;
     }
 
-    //    "ErrorFieldValueNotDecimal": "Value must be a number"
-    let err = vm.$ay.t("ErrorFieldValueNotDecimal");
-    //Update the form status
+    const err = vm.$ay.t("ErrorFieldValueNotDecimal");
     this.setFormState({
       vm: vm,
       valid: false
@@ -380,12 +348,12 @@ export default {
       return true;
     }
 
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (isEmpty(value)) {
       return true;
     }
@@ -399,11 +367,10 @@ export default {
       return true;
     }
 
-    //    "ErrorFieldValueNumberGreaterThanMax": "Value must be less than XX"
-    let err = `${vm.$ay
+    const err = `${vm.$ay
       .t("ErrorFieldValueNumberGreaterThanMax")
       .replace("{0}", maxValue)} ${maxValue}`;
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -421,12 +388,12 @@ export default {
       return true;
     }
 
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (isEmpty(value)) {
       return true;
     }
@@ -441,11 +408,10 @@ export default {
       return true;
     }
 
-    //    "ErrorFieldValueNumberLessThanMin": "Value must be more than XX"
-    let err = `${vm.$ay
+    const err = `${vm.$ay
       .t("ErrorFieldValueNumberLessThanMin")
       .replace("{0}", minValue)} ${minValue}`;
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -459,15 +425,12 @@ export default {
     if (vm.formState.loading) {
       return true;
     }
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    //DEBUG
-    //logControl("emailValid", ctrl, ref);
-
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (isEmpty(value)) {
       return true;
     }
@@ -476,8 +439,8 @@ export default {
       return true;
     }
 
-    let err = vm.$ay.t("ErrorAPI2203"); //"Invalid value"
-    //Update the form status
+    const err = vm.$ay.t("ErrorAPI2203"); //"Invalid value"
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -492,7 +455,7 @@ export default {
       return true;
     }
 
-    let template =
+    const template =
       window.$gz.store.state.formCustomTemplate[vm.formCustomTemplateKey];
     if (template === undefined) {
       return true;
@@ -500,36 +463,31 @@ export default {
     //See if control formCustomTemplateFieldName is in server required fields collection
     //this is a collection of both custom field definitions and standard form fields that are required
     //since all names are unique can just filter out the one we need by name which will inherently ignore custom fields by default
-    //de-lodash
-    // let templateItem = window.$gz. _.find(template, [
-    //   "fld",
-    //   formCustomTemplateFieldName
-    // ]);
-
-    let templateItem = template.find(z => z.fld == formCustomTemplateFieldName);
+    const templateItem = template.find(
+      z => z.fld == formCustomTemplateFieldName
+    );
 
     //templateItem.required
     if (templateItem === undefined || templateItem.required !== true) {
       return true;
     }
 
-    let ctrl = getControl(vm, ref);
+    const ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return true;
     }
 
-    let value = getControlValue(ctrl);
+    const value = getControlValue(ctrl);
     if (!isEmpty(value)) {
       return true;
     }
 
-    //   "ErrorRequiredFieldEmpty": "{0} is a required field.  Please enter a value for {0}",
     let err = vm.$ay.t("ErrorRequiredFieldEmpty");
-    let fieldName = getControlLabel(ctrl);
+    const fieldName = getControlLabel(ctrl);
     err = err.replace("{0}", fieldName);
     //replace only replaces first instance so need to do it twice
     err = err.replace("{0}", fieldName);
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -549,18 +507,17 @@ export default {
       return true;
     }
 
-    let value = subvm.GetValueForField(templateItem.dataKey);
+    const value = subvm.GetValueForField(templateItem.dataKey);
     if (!isEmpty(value)) {
       return true;
     }
 
     //It's empty and it's required so return error
-    //   "ErrorRequiredFieldEmpty": "{0} is a required field.  Please enter a value for {0}",
     let err = vm.$ay.t("ErrorRequiredFieldEmpty");
     err = err.replace("{0}", fieldName);
     //replace only replaces first instance so need to do it twice
     err = err.replace("{0}", fieldName);
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: false
@@ -577,14 +534,12 @@ export default {
   // errors in the UI by Vuetify
   //
   serverErrors(vm, ref) {
-    let ret = [];
+    const ret = [];
 
     //check for errors if we have any errors
     if (!window.$gz.util.objectIsEmpty(vm.formState.serverError)) {
-      //de-lodash
       //First let's get the top level error code
-
-      let apiErrorCode = parseInt(vm.formState.serverError.code);
+      const apiErrorCode = parseInt(vm.formState.serverError.code);
       //Not all server errors mean the form is invalid, exceptions here
       let formValid = false;
 
@@ -616,7 +571,6 @@ export default {
           err = err + "\r\n" + vm.formState.serverError.message;
         }
 
-        //Update the form status
         this.setFormState({
           vm: vm,
           valid: formValid
@@ -629,14 +583,14 @@ export default {
       //Specific field validation errors are in an array in "details" key
       if (!window.$gz.util.objectIsEmpty(vm.formState.serverError.details)) {
         //See if this key is in the details array
-        let errorsForField = getErrorsForField(vm, ref);
+        const errorsForField = getErrorsForField(vm, ref);
         if (errorsForField.length > 0) {
           //iterate the errorsForField object and add each to return array of errors
           //de-lodash
           //window.$gz. _.each(errorsForField, function(ve) {
           errorsForField.forEach(function(ve) {
             let fldErr = "";
-            let fldErrorCode = parseInt(ve.error);
+            const fldErrorCode = parseInt(ve.error);
             fldErr =
               vm.$ay.t("ErrorAPI" + fldErrorCode.toString()) +
               " [" +
@@ -657,7 +611,6 @@ export default {
             }
           });
 
-          //Update the form status
           this.setFormState({
             vm: vm,
             valid: false
@@ -772,7 +725,7 @@ export default {
     vm.formState.appError = null;
     //clear out actual message box display
     vm.formState.errorBoxMessage = null;
-    //Update the form status
+
     this.setFormState({
       vm: vm,
       valid: true
@@ -783,8 +736,8 @@ export default {
   // Gather server errors and set the appropriate keys
   //
   setErrorBoxErrors(vm) {
-    let errs = this.serverErrors(vm, "generalerror");
-    let ret = getErrorBoxErrors(vm, errs);
+    const errs = this.serverErrors(vm, "generalerror");
+    const ret = getErrorBoxErrors(vm, errs);
     vm.formState.errorBoxMessage = ret;
   },
   ///////////////////////////////
@@ -796,7 +749,7 @@ export default {
   //
   //
   fieldValueChanged(vm, ref, formReference) {
-    let that = this;
+    const that = this;
     let formControl = null;
     if (formReference == undefined) {
       formControl = vm.$refs.form;
@@ -806,9 +759,6 @@ export default {
       formControl = vm.$refs[formReference];
     }
 
-    //NOTE: Due to automatic code formatting some refs may come here with newlines in them resulting in no matches
-    // ref = ref.replace(/\s/g, "");
-
     //dev error on form?
     if (formControl == null) {
       if (vm.$ay.dev) {
@@ -829,7 +779,7 @@ export default {
       }
 
       //# REMOVE SERVER ERRORS FOR THIS FIELD REF
-      let targetRef = ref.toLowerCase();
+      const targetRef = ref.toLowerCase();
 
       //NOTE: This block of code is meant to remove all detailed server errors where the Target matches the current referenced control
       //Then it checks to see if there is anything left in details as this might have been all there was and if so removes that whole thing
@@ -876,7 +826,7 @@ export default {
 
       if (targetFieldHasServerError) {
         triggeringChange = true;
-        let val = vm.obj[ref];
+        const val = vm.obj[ref];
         vm.obj[ref] = null;
         vm.obj[ref] = val;
         triggeringChange = false;
@@ -927,12 +877,10 @@ export default {
   // and temporary ones are stored in session storage and don't persist a refresh
   //
   getFormSettings(formKey) {
-    let formSettings = {
+    return {
       temp: JSON.parse(sessionStorage.getItem(formKey)),
       saved: window.$gz.store.state.formSettings[formKey]
     };
-
-    return formSettings;
   },
   ////////////////////////////////////
   //  Set form settings
@@ -940,14 +888,6 @@ export default {
   // requires object with one or both keys {temp:{...tempformsettings...},saved:{...persistedformsettings...}}
   //
   setFormSettings(formKey, formSettings) {
-    // if (window.$gz.dev) {
-    //   if (!formSettings.saved && !formSettings.temp) {
-    //     throw new Error(
-    //       "gzform:setFormSettings - saved AND temp keys are both missing from form data!"
-    //     );
-    //   }
-    // }
-
     if (formSettings.saved) {
       window.$gz.store.commit("setFormSettings", {
         formKey: formKey,
@@ -962,7 +902,7 @@ export default {
   //  Get last report used from form settings
   //
   getLastReport(formKey) {
-    let fs = window.$gz.store.state.formSettings[formKey];
+    const fs = window.$gz.store.state.formSettings[formKey];
     if (fs == null || fs.lastReport == null) {
       return null;
     }
@@ -971,12 +911,7 @@ export default {
   //  Set last report used in form settings
   //
   setLastReport(formKey, reportSelected) {
-    // console.log("setLastReport called", {
-    //   formKey: formKey,
-    //   reportSelected: reportSelected
-    // });
     let fs = window.$gz.store.state.formSettings[formKey];
-    //console.log("setlast report retrieved formsettings is:",fs)
     if (fs == null) {
       fs = {};
     }
@@ -1010,8 +945,6 @@ export default {
   // Get validity of referenced control
   //
   controlIsValid(vm, ref) {
-    // //NOTE: Due to automatic code formatting some refs will come here with newlines in them resulting in no matches
-    // ref = ref.replace(/\s/g, "");
     if (vm.$refs[ref]) {
       return vm.$refs[ref].valid;
     }
@@ -1023,7 +956,7 @@ export default {
   controlsAreAllValid(vm, refs) {
     //if any are not valid return false
     for (let i = 0; i < refs.length; i++) {
-      let item = refs[i];
+      const item = refs[i];
       if (vm.$refs[item]) {
         if (!vm.$refs[item].valid) {
           return false;
@@ -1037,7 +970,7 @@ export default {
   //
   handleObjectNotFound(vm) {
     window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
-    // navigate backwards after small delay to show error
+    //after small delay to show error
     //(the navigate removes the toast notification immediately)
     setTimeout(function() {
       vm.$router.go(-1);
diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index d5836f67..a447504a 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -1,7 +1,3 @@
-/* xxxeslint-disable */
-
-// import { VMain } from "vuetify/lib";
-
 /////////////////////////////////
 // Menu utils and handlers
 //
@@ -10,10 +6,10 @@ export default {
   // TECH SUPPORT / CONTACT FORUM URL
   //
   contactSupportUrl() {
-    let dbId = encodeURIComponent(
+    const dbId = encodeURIComponent(
       window.$gz.store.state.globalSettings.serverDbId
     );
-    let company = encodeURIComponent(
+    const company = encodeURIComponent(
       window.$gz.store.state.globalSettings.company
     );
     return `https://contact.ayanova.com/contact?dbid=${dbId}&company=${company}`;
@@ -24,7 +20,7 @@ export default {
   // Deal with a menu change request
   // called from App.vue
   handleMenuChange(vm, ctx) {
-    let UTILITY_TYPES = [
+    const UTILITY_TYPES = [
       window.$gz.type.NoType,
       window.$gz.type.Global,
       window.$gz.type.NoType,
@@ -62,7 +58,7 @@ export default {
     if (ctx && ctx.formData && ctx.formData.recordName) {
       recordName = ctx.formData.recordName;
     }
-    let hasRecordName = recordName != "";
+    const hasRecordName = recordName != "";
     if (ctx.title) {
       //it has a title translation key
       if (hasRecordName) {
@@ -101,7 +97,7 @@ export default {
     }
 
     //flag for if it's wikiable, reviewable, attachable, searchable, historical
-    let isCoreBizObject = formAyaType != 0 && formRecordId != 0;
+    const isCoreBizObject = formAyaType != 0 && formRecordId != 0;
 
     //set the help url if presented or default to the User section intro
     vm.appBar.helpUrl = ctx.helpUrl ? ctx.helpUrl : "user-intro";
@@ -169,15 +165,6 @@ export default {
 
     //GLOBAL BOTTOM PORTION
 
-    //Global sub-heading
-    //Likely won't want this but here anyway to see
-    //that.appBar.menuItems.push({ header: "GLOBAL" });
-
-    //global menu items
-
-    //divider
-    //vm.appBar.menuItems.push({ divider: true, inset: false });
-
     //SEARCH
     //all forms except the search form
     if (!ctx.hideSearch && !UTILITY_TYPES.includes(formAyaType)) {
@@ -240,7 +227,7 @@ export default {
 
     //Find the menu item and set it to disabled and recolor it to disabled color and return
     for (let i = 0; i < vm.appBar.menuItems.length; i++) {
-      let menuItem = vm.appBar.menuItems[i];
+      const menuItem = vm.appBar.menuItems[i];
       if (menuItem.key == key) {
         vm.$set(vm.appBar.menuItems[i], "disabled", disabled);
         //menuItem.disabled = disabled;
@@ -261,7 +248,7 @@ export default {
 
     //Find the menu item and change it's icon
     for (let i = 0; i < vm.appBar.menuItems.length; i++) {
-      let menuItem = vm.appBar.menuItems[i];
+      const menuItem = vm.appBar.menuItems[i];
       if (menuItem.key == key) {
         vm.$set(vm.appBar.menuItems[i], "icon", newIcon);
         return;
@@ -281,12 +268,11 @@ export default {
     //each part is separated by a colon
 
     //Handle different items
-    let item = this.parseMenuItem(menuItem);
+    const item = this.parseMenuItem(menuItem);
     if (!item.disabled && item.owner == "app") {
       switch (item.key) {
         case "help":
-          let helpurl = vm.$store.state.helpUrl + item.data;
-          window.open(helpurl, "_blank");
+          window.open(vm.$store.state.helpUrl + item.data, "_blank");
           break;
         case "search":
           vm.$router.push({
@@ -294,19 +280,9 @@ export default {
             params: { ayatype: item.data }
           });
           break;
-        // case "attachments":
-        //   vm.$router.push({
-        //     name: "ay-attachments",
-        //     params: { ayatype: item.data.ayaType, recordid: item.data.recordId }
-        //   });
-        //   break;
-        // case "plugin":
-        //   alert("STUB: plugin / more");
-        //   break;
         case "review":
           //go to list
           //  path: "/home-reviews/:aType?/:objectId?",
-
           vm.$router.push({
             name: "home-reviews",
             params: {
@@ -350,8 +326,8 @@ export default {
   parseMenuItem(menuItem) {
     //format is "AREA:KEY:UNIQUEID"
     //and data is in data portion
-    let keyparts = menuItem.key.split(":");
-    let ret = {
+    const keyparts = menuItem.key.split(":");
+    const ret = {
       owner: keyparts[0],
       key: keyparts[1],
       data: menuItem.data,
@@ -369,38 +345,38 @@ export default {
   // called once from app.vue only
   //
   wireUpEventHandlers(vm) {
-    let self = this;
+    const that = this;
     window.$gz.eventBus.$on("menu-change", function handleMenuChange(ctx) {
-      self.handleMenuChange(vm, ctx);
+      that.handleMenuChange(vm, ctx);
     });
 
     window.$gz.eventBus.$on("menu-replace-item", function handleReplaceMenuItem(
       newItem
     ) {
-      self.handleReplaceMenuItem(vm, newItem);
+      that.handleReplaceMenuItem(vm, newItem);
     });
 
     window.$gz.eventBus.$on("menu-disable-item", function handleDisableMenuItem(
       key
     ) {
-      self.handleDisableMenuItem(vm, key, true);
+      that.handleDisableMenuItem(vm, key, true);
     });
 
     window.$gz.eventBus.$on("menu-enable-item", function handleDisableMenuItem(
       key
     ) {
-      self.handleDisableMenuItem(vm, key, false);
+      that.handleDisableMenuItem(vm, key, false);
     });
 
     window.$gz.eventBus.$on(
       "menu-change-item-icon",
       function handleChangeMenuItemIcon(key, newIcon) {
-        self.handleChangeMenuItemIcon(vm, key, newIcon);
+        that.handleChangeMenuItemIcon(vm, key, newIcon);
       }
     );
 
     window.$gz.eventBus.$on("menu-click", function handleMenuClick(menuitem) {
-      self.handleAppClick(vm, menuitem);
+      that.handleAppClick(vm, menuitem);
     });
   }
   //new functions above here
diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index 133248ec..3184511b 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -1,5 +1,3 @@
-/* Xeslint-disable */
-
 /////////////////////////////////
 // General utility library
 //
@@ -206,7 +204,7 @@ export default {
     if (!number || number == 0 || number == NaN) {
       return number;
     }
-    let wasNegative = number < 0;
+    const wasNegative = number < 0;
     if (wasNegative) {
       number = Math.abs(number); //make sure it's positive because rounding negative numbers is weird in JS
     }
@@ -223,29 +221,6 @@ export default {
   // Clean up a tag with same rules as server
   //
   normalizeTag: function(tagName) {
-    /*
-    SERVER VERSION
-     public static string NormalizeTag(string inObj)
-        {
-            if (string.IsNullOrWhiteSpace(inObj)) return null;
-            //Must be lowercase per rules 
-            //This may be naive when we get international cust omers but for now supporting utf-8 and it appears it's safe to do this with unicode
-            inObj = inObj.ToLowerInvariant();
-            //No spaces in tags, replace with dashes
-            inObj = inObj.Replace(" ", "-");
-            //Remove multiple dash sequences
-            inObj = System.Text.RegularExpressions.Regex.Replace(inObj, "-+", "-");
-            //Ensure doesn't start or end with a dash
-            inObj = inObj.Trim('-');
-            //No longer than 255 characters
-            inObj = StringUtil.MaxLength(inObj, 255);
-            return inObj;
-        }
-    */
-    //de-lodash
-    //kebab case takes care of all the things we need for tags in one go
-    // tagName = window.$gz. _.kebabCase(tagName);
-
     if (!tagName || tagName == "") {
       return null;
     }
@@ -271,9 +246,9 @@ export default {
   // https://stackoverflow.com/a/7616484/8939
   //
   quickHash: function(theString) {
-    let hash = 0,
-      i,
-      chr;
+    let hash = 0;
+    let i;
+    let chr;
     if (theString.length === 0) return hash;
     for (i = 0; i < theString.length; i++) {
       chr = theString.charCodeAt(i);
@@ -289,10 +264,9 @@ export default {
   // using 32 character (128 bit) as default
   //
   getRandomPassword: function() {
-    let length = 32,
-      wishlist = "0123456789abcdefghijkmnopqrstuvwxyz";
+    const wishlist = "0123456789abcdefghijkmnopqrstuvwxyz";
 
-    return Array.from(crypto.getRandomValues(new Uint32Array(length)))
+    return Array.from(crypto.getRandomValues(new Uint32Array(32)))
       .map(x => wishlist[x % wishlist.length])
       .join("");
   },
@@ -337,7 +311,7 @@ export default {
       return 0;
     }
 
-    let ret = parseFloat(string.replace(/[^\d.-]/g, ""));
+    const ret = parseFloat(string.replace(/[^\d.-]/g, ""));
     if (ret == NaN) {
       return 0;
     }
@@ -582,8 +556,8 @@ export default {
     }
     mimeType = mimeType.toLowerCase();
 
-    let iconFromExtension = extensions[extension];
-    let iconFromMIME = mimeTypes[mimeType];
+    const iconFromExtension = extensions[extension];
+    const iconFromMIME = mimeTypes[mimeType];
 
     if (iconFromMIME) {
       return iconFromMIME;
@@ -643,8 +617,8 @@ export default {
   // https://stackoverflow.com/a/55292366/8939
   //
   trimSpecific: function trim(str, ch) {
-    var start = 0,
-      end = str.length;
+    var start = 0;
+    var end = str.length;
     while (start < end && str[start] === ch) ++start;
     while (end > start && str[end - 1] === ch) --end;
     return start > 0 || end < str.length ? str.substring(start, end) : str;
@@ -661,23 +635,6 @@ export default {
   // is string replacement for lodash
   // https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_isString
   //
-  // isString: function(str) {
-  //   //modified from above, due to bug (I think)
-  //   //posted case here: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore/issues/304
-  //   if (str == null) {
-  //     return false;
-  //   }
-
-  //   if (str == "") {//another bug, if numeric this is true?!  Using recommended method below
-  //     return true;
-  //   }
-  //   let temp = str.valueOf();
-  //   if (typeof temp === "string") {
-  //     return true;
-  //   } else {
-  //     return false;
-  //   }
-  // },
   isString: function(str) {
     return str != null && typeof str.valueOf() === "string";
   },
@@ -790,25 +747,13 @@ export default {
   //
   //
   viewGeoLocation: function(obj) {
-    /*
-{        
-          latitude: m.vm.obj.latitude,
-          longitude: m.vm.obj.longitude,
-          address: m.vm.obj.address || m.vm.obj.postAddress,
-          city: m.vm.obj.city || m.vm.obj.postCity,
-          region: m.vm.obj.region || m.vm.obj.postRegion,
-          country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
-        }
-*/
-
-    let hasGeo =
+    const hasGeo =
       obj.latitude != null &&
       obj.latitude != 0 &&
       obj.longitude != null &&
       obj.longitude != 0;
 
-    let hasAddress =
+    const hasAddress =
       !this.stringIsNullOrEmpty(obj.address) &&
       !this.stringIsNullOrEmpty(obj.city) &&
       !this.stringIsNullOrEmpty(obj.region) &&
@@ -857,7 +802,7 @@ export default {
       //order street to country seems to be standard
       //note, if google need plus symbol delimiter, if bing, need comma delimiter
       //but both might accept one big string space delimited and url encoded so test that on all first
-      let delimiter = " ";
+      const delimiter = " ";
       let q = "";
       if (obj.address) {
         q += obj.address + delimiter;
@@ -949,15 +894,6 @@ export default {
   //
   //
   calendarViewToAyaNovaEnum: function(view) {
-    /*
-     public enum ScheduleView : int
-        {
-            Day = 1,
-            Week = 2,
-            Month = 3,
-            Day4 = 4
-        }
-    */
     switch (view) {
       case "day":
         return 1;
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 07f18eba..9b04eb33 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -1,11 +1,9 @@
-/* Xeslint-disable */
-
 function addNavItem(title, icon, route, navItems, key, testid, color = null) {
   if (!testid) {
     testid = route;
   }
 
-  let o = {
+  const o = {
     title,
     icon,
     route,
@@ -23,11 +21,8 @@ function addNavItem(title, icon, route, navItems, key, testid, color = null) {
 function initNavPanel() {
   let key = 0;
   let sub = [];
-
-  // let t = window.$gz.translation.get;
-  // let role = window.$gz.role.AUTHORIZATION_ROLES;
-  let licenseState = window.$gz.store.state.globalSettings.licenseStatus;
-  let useInventory = window.$gz.store.state.globalSettings.useInventory;
+  const licenseState = window.$gz.store.state.globalSettings.licenseStatus;
+  const useInventory = window.$gz.store.state.globalSettings.useInventory;
   /*Service = 1,
         NotService = 2,
         Customer = 3,
@@ -109,7 +104,6 @@ function initNavPanel() {
   }
 
   //###### SUBCONTRACTORS ######
-  //console.log(window.$gz.store.getters.isSubContractorUser);
   if (window.$gz.store.getters.isSubContractorUser == true) {
     //clear sublevel array
     sub = [];
@@ -748,14 +742,14 @@ function initNavPanel() {
 
 async function getUserOptions() {
   try {
-    let res = await window.$gz.api.get(
+    const res = await window.$gz.api.get(
       "user-option/" + window.$gz.store.state.userId
     );
 
     if (res.error) {
       //In a form this would trigger a bunch of validation or error display code but for here and now:
       //convert error to human readable string for display and popup a notification to user
-      let msg = window.$gz.api.apiErrorToHumanString(res.error);
+      const msg = window.$gz.api.apiErrorToHumanString(res.error);
       window.$gz.store.commit(
         "logItem",
         "Initialize::() fetch useroptions -> error" + msg
@@ -765,7 +759,7 @@ async function getUserOptions() {
       //Check if overrides and use them here
       //or else use browser defaults
 
-      let l = {
+      const l = {
         languageOverride: null,
         timeZoneOverride: null,
         currencyName: null,
@@ -775,16 +769,6 @@ async function getUserOptions() {
         mapUrlTemplate: null
       };
 
-      //removed this block, locale already attempts this fully and this should really only set the user persisted value, not guess it here
-      //get language to use, try user set override first, if empty then browser set, if empty then default to en-us
-      // l.languageOverride =
-      //   res.data.languageOverride || window.navigator.languages[0] || "en-US";
-
-      // l.timeZoneOverride =
-      //   res.data.timeZoneOverride ||
-      //   window.$gz.locale.getResolvedTimeZoneName() ||
-      //   "America/New_York";
-
       l.languageOverride = res.data.languageOverride;
       l.timeZoneOverride = res.data.timeZoneOverride;
 
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 924e7dfb..4dcae87a 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -1,8 +1,4 @@
-/* ZZeslint-disable */
 //Browser Locale conversion utilities
-
-// import { faYinYang } from "@fortawesome/free-solid-svg-icons";
-
 //dates,numbers currency etc
 export default {
   ////////////////////////////////////////////////////////
@@ -62,7 +58,7 @@ export default {
   //https://en.wikipedia.org/wiki/ISO_4217
   //default to USD if nothing specified
   getCurrencyName() {
-    let cur = window.$gz.store.state.userOptions.currencyName;
+    const cur = window.$gz.store.state.userOptions.currencyName;
     if (!window.$gz.util.stringIsNullOrEmpty(cur)) {
       return cur;
     } else {
@@ -165,7 +161,7 @@ export default {
     }
 
     //parse the date which is identified as utc ("2020-02-06T18:18:49.148011Z")
-    let parsedDate = new Date(value);
+    const parsedDate = new Date(value);
 
     //is it a valid date?
     if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {
@@ -194,7 +190,7 @@ export default {
     }
 
     //parse the date which is identified as utc ("2020-02-06T18:18:49.148011Z")
-    let parsedDate = new Date(value);
+    const parsedDate = new Date(value);
 
     //is it a valid date?
     if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {
@@ -225,7 +221,7 @@ export default {
     }
 
     //parse the date which is identified as utc ("2020-02-06T18:18:49.148011Z")
-    let parsedDate = new Date(value);
+    const parsedDate = new Date(value);
 
     //is it a valid date?
     if (!(parsedDate instanceof Date && !isNaN(parsedDate))) {
@@ -252,7 +248,7 @@ export default {
     let theSeconds = 0;
     let ret = "";
 
-    let work = value.split(":");
+    const work = value.split(":");
     //has days?
     if (work[0].includes(".")) {
       let dh = work[0].split(".");
@@ -340,7 +336,7 @@ export default {
     if (!timeZoneName) {
       timeZoneName = this.getResolvedTimeZoneName();
     }
-    let ret = window.$gz.DateTime.local()
+    const ret = window.$gz.DateTime.local()
       .setZone(timeZoneName)
       .toUTC()
       .toString();
@@ -406,7 +402,7 @@ export default {
     if (!timeZoneName) {
       timeZoneName = this.getResolvedTimeZoneName();
     }
-    let ret = window.$gz.DateTime.local()
+    const ret = window.$gz.DateTime.local()
       .setZone(timeZoneName)
       .toString();
     return ret;
diff --git a/ayanova/src/api/open-object-handler.js b/ayanova/src/api/open-object-handler.js
index d854f353..be7d73de 100644
--- a/ayanova/src/api/open-object-handler.js
+++ b/ayanova/src/api/open-object-handler.js
@@ -1,4 +1,3 @@
-/* xxxeslint-disable */
 import ayatype from "./ayatype";
 export default {
   ///////////////////////////////
@@ -19,7 +18,7 @@ export default {
     }
 
     if (tid.type && tid.id != null) {
-      let isCustomerTypeUser =
+      const isCustomerTypeUser =
         window.$gz.store.state.userType == 3 ||
         window.$gz.store.state.userType == 4;
       //if these come from route parameters they may well be strings
@@ -68,7 +67,7 @@ export default {
           case ayatype.WorkOrderItemUnit:
             (async () => {
               try {
-                let res = await window.$gz.api.get(
+                const res = await window.$gz.api.get(
                   `search/ancestor/${tid.type}/${tid.id}`
                 );
 
@@ -112,7 +111,7 @@ export default {
           case ayatype.QuoteItemUnit:
             (async () => {
               try {
-                let res = await window.$gz.api.get(
+                const res = await window.$gz.api.get(
                   `search/ancestor/${tid.type}/${tid.id}`
                 );
 
@@ -157,7 +156,7 @@ export default {
           case ayatype.PMItemUnit:
             (async () => {
               try {
-                let res = await window.$gz.api.get(
+                const res = await window.$gz.api.get(
                   `search/ancestor/${tid.type}/${tid.id}`
                 );
 
@@ -233,11 +232,10 @@ export default {
                     tid.inside = true;
                   }
                   if (tid.inside == undefined) {
-                    let res = await window.$gz.api.get(
+                    const res = await window.$gz.api.get(
                       "user/inside-type/" + tid.id
                     );
                     if (res.error) {
-                      //throw new Error(res.error);
                       throw new Error(
                         window.$gz.errorHandler.errorToString(res, vm)
                       );
@@ -276,7 +274,7 @@ export default {
 
             (async () => {
               try {
-                let res = await window.$gz.api.get(
+                const res = await window.$gz.api.get(
                   "attachment/parent/" + tid.id
                 );
 
@@ -326,12 +324,11 @@ export default {
             //all we have is the id, but need the formkey to open it
             (async () => {
               try {
-                let res = await window.$gz.api.get(
+                const res = await window.$gz.api.get(
                   "form-custom/form-key/" + tid.id
                 );
 
                 if (res.error) {
-                  //throw new Error(res.error);
                   throw new Error(
                     window.$gz.errorHandler.errorToString(res, vm)
                   );
@@ -506,12 +503,12 @@ export default {
   // called once from app.vue only
   //
   wireUpEventHandlers(vm) {
-    let self = this;
+    const that = this;
     //expects extra data (tid) to be { type: [AYATYPE], id: [RECORDID] }
     window.$gz.eventBus.$on("openobject", function handleOpenObjectClickHandler(
       tid
     ) {
-      self.handleOpenObjectClick(vm, tid);
+      that.handleOpenObjectClick(vm, tid);
     });
   }
   //new functions above here
diff --git a/ayanova/src/api/palette.js b/ayanova/src/api/palette.js
index ea8fe17e..16f9ce39 100644
--- a/ayanova/src/api/palette.js
+++ b/ayanova/src/api/palette.js
@@ -22,7 +22,7 @@ export default {
     soft_gray: "#d2d7db"
   },
   getBoldPaletteArray(size) {
-    let palette = [
+    const palette = [
       this.color.blue,
       this.color.red,
       this.color.green,
@@ -32,15 +32,15 @@ export default {
       this.color.teal,
       this.color.black
     ];
-    let paletteLength = palette.length;
-    let ret = [];
+    const paletteLength = palette.length;
+    const ret = [];
     for (let i = 0; i < size; i++) {
       ret.push(palette[i % paletteLength]);
     }
     return ret;
   },
   getSoftPaletteArray(size) {
-    let palette = [
+    const palette = [
       this.color.soft_sand,
       this.color.soft_pale_blue,
       this.color.soft_gray,
@@ -50,8 +50,8 @@ export default {
       this.color.soft_sand_taupe,
       this.color.soft_brown_darker
     ];
-    let paletteLength = palette.length;
-    let ret = [];
+    const paletteLength = palette.length;
+    const ret = [];
     for (let i = 0; i < size; i++) {
       ret.push(palette[i % paletteLength]);
     }
diff --git a/ayanova/src/api/relative-date-filter-calculator.js b/ayanova/src/api/relative-date-filter-calculator.js
index 2971006d..81b467dc 100644
--- a/ayanova/src/api/relative-date-filter-calculator.js
+++ b/ayanova/src/api/relative-date-filter-calculator.js
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////
@@ -24,9 +24,13 @@ export default {
 
     //NOTE: it's valid for one of the two ret values might be undefined as it's valid to have a single date for
     //Past or Future
-    let ret = { after: undefined, before: undefined };
-    let dtNow = window.$gz.DateTime.local();
-    let dtToday = window.$gz.DateTime.local(dtNow.year, dtNow.month, dtNow.day);
+    const ret = { after: undefined, before: undefined };
+    const dtNow = window.$gz.DateTime.local();
+    const dtToday = window.$gz.DateTime.local(
+      dtNow.year,
+      dtNow.month,
+      dtNow.day
+    );
     let dtAfter = null;
     let dtBefore = null;
 
@@ -613,403 +617,4 @@ export default {
 
     return ret;
   }
-
-  /*
-  
-      { name: vm.$ay.t("DateRangeJanuary"), id: "*january*" },
-      { name: vm.$ay.t("DateRangeFebruary"), id: "*february*" },
-      { name: vm.$ay.t("DateRangeMarch"), id: "*march*" },
-      { name: vm.$ay.t("DateRangeApril"), id: "*april*" },
-      { name: vm.$ay.t("DateRangeMay"), id: "*may*" },
-      { name: vm.$ay.t("DateRangeJune"), id: "*june*" },
-      { name: vm.$ay.t("DateRangeJuly"), id: "*july*" },
-      { name: vm.$ay.t("DateRangeAugust"), id: "*august*" },
-      { name: vm.$ay.t("DateRangeSeptember"), id: "*september*" },
-      { name: vm.$ay.t("DateRangeOctober"), id: "*october*" },
-      { name: vm.$ay.t("DateRangeNovember"), id: "*november*" },
-      { name: vm.$ay.t("DateRangeDecember"), id: "*december*" },
-      {
-        name: vm.$ay.t("DateRangePreviousYearThisMonth"),
-        id: "*lastyearthismonth*"
-      },
-      {
-        name: vm.$ay.t("DateRangePreviousYearLastMonth"),
-        id: "*lastyearlastmonth*"
-      },
-      {
-        name: vm.$ay.t("DateRangePreviousYearNextMonth"),
-        id: "*lastyearnextmonth*"
-      }
-      
-      */
-  //new functions above here
 };
-//LUXON MATH: https://moment.github.io/luxon/docs/manual/zones.html#math-across-dsts
-//https://moment.github.io/luxon/docs/manual/math.html
-//luxon api ref: https://moment.github.io/luxon/docs/class/src/datetime.js~DateTime.html
-
-// //###############################################################  OLD SERVER FILTERING CODE ##########################
-
-//                             //HOWEVER, if it's a relative date filter TOKEN like "nextMonth" then the users time zone offset will be taken into consideration
-
-//                             //So this is the core date time to work off of
-//                             DateTime RelativeToday = DateTime.Today;
-//                             DateTime RelativeNow = DateTime.Now;
-//                             // ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger("FilterSqlCriteriaBuilder::DataFilterToColumnCriteria");
-//                             // log.LogInformation("RelativeToday (before adjustment):");
-//                             // log.LogInformation(RelativeToday.ToString());
-//                             // log.LogInformation("RelativeNow (before adjustment):");
-//                             // log.LogInformation(RelativeNow.ToString());
-
-//                             if (sValue.StartsWith("{[") && sValue.EndsWith("]}"))
-//                             {
-
-//                                 //Need to adjust RelativeToday to users time frame
-//                                 //Fetch useroptions object and relative time offset
-//                                 //See servers spec doc core-locale-currency-numbers-time-and-dates.txt for details about why this is necessary to be done this way
-//                                 AyaNova.Models.AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext;
-//                                 let u = ct.User.AsNoTracking().Where(a => a.Id == userId).Select(m => new { tz = m.UserOptions.TimeZoneOffset }).First();
-
-//                                 //Add this value to any time's hours to convert to user local time
-//                                 Double TimeZoneAdjustment = ((double)u.tz) * -1;
-
-//                                 //Stock times used for many of the tokens:
-//                                 RelativeToday = RelativeToday.AddHours(TimeZoneAdjustment);//flip the sign to adjust towards UTC
-//                                 RelativeNow = RelativeNow.AddHours(TimeZoneAdjustment);//flip the sign to adjust towards UTC
-
-//                                 //TESTING:
-//                                 //LOG THE CRIT AND QUERY
-//                                 //  ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger("FilterSqlCriteriaBuilder::DataFilterToColumnCriteria");
-//                                 // log.LogInformation("RelativeToday (adjusted):");
-//                                 // log.LogInformation(RelativeToday.ToString());
-//                                 // log.LogInformation("RelativeNow (adjusted):");
-//                                 // log.LogInformation(RelativeNow.ToString());
-//                                 // log.LogInformation("Offset used:");
-//                                 // log.LogInformation(u.tz.ToString());
-
-//                                 #region Build criteria for date RANGE TOKEN specified
-//                                 //Used as the basis point
-//                                 System.DateTime dtAfter;
-//                                 System.DateTime dtBefore;
-//                                 switch (sValue)
-//                                 {
-//                                     //Case 402
-//                                     case DataListFilterSpecialToken.Yesterday:
-//                                         //Between Day before yesterday at midnight and yesterday at midnight
-//                                         dtAfter = RelativeToday.AddDays(-1);
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-//                                         dtBefore = RelativeToday;//.AddDays(-1);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.Today:
-//                                         //Between yesterday at midnight and tommorow at midnight
-//                                         dtAfter = RelativeToday.AddSeconds(-1);
-//                                         dtBefore = RelativeToday.AddDays(1);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.Tomorrow:
-//                                         //Between Tonight at midnight and day after tommorow at midnight
-//                                         dtAfter = RelativeToday.AddDays(1);
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-//                                         dtBefore = RelativeToday.AddDays(2);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     //Case 402
-//                                     case DataListFilterSpecialToken.LastWeek:
-//                                         //Between two Sundays ago at midnight and last sunday at midnight
-//                                         dtAfter = RelativeToday;
-
-//                                         //go back a week
-//                                         dtAfter = dtAfter.AddDays(-7);
-
-//                                         //go backwards to Sunday
-//                                         while (dtAfter.DayOfWeek != DayOfWeek.Sunday)
-//                                             dtAfter = dtAfter.AddDays(-1);
-
-//                                         //go to very start of eighth dayahead
-//                                         dtBefore = dtAfter.AddDays(8);
-
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.ThisWeek:
-//                                         //Between Sunday at midnight and Next sunday at midnight
-//                                         dtAfter = RelativeToday;
-//                                         //go backwards to monday
-//                                         while (dtAfter.DayOfWeek != DayOfWeek.Monday)
-//                                             dtAfter = dtAfter.AddDays(-1);
-
-//                                         //Now go back to sunday last second
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         dtBefore = RelativeToday;
-//                                         //go forwards to monday
-//                                         if (RelativeToday.DayOfWeek == DayOfWeek.Monday)
-//                                         {
-//                                             //Monday today? then go to next monday
-//                                             dtBefore = dtBefore.AddDays(7);
-//                                         }
-//                                         else
-//                                         {
-//                                             while (dtBefore.DayOfWeek != DayOfWeek.Monday)
-//                                                 dtBefore = dtBefore.AddDays(1);
-//                                         }
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.NextWeek:
-//                                         //Between Next Sunday at midnight and Next Next sunday at midnight
-//                                         dtAfter = RelativeToday;
-
-//                                         //If today is monday skip over it first
-//                                         if (dtAfter.DayOfWeek == DayOfWeek.Monday)
-//                                             dtAfter = dtAfter.AddDays(1);
-
-//                                         //go forwards to next monday
-//                                         while (dtAfter.DayOfWeek != DayOfWeek.Monday)
-//                                             dtAfter = dtAfter.AddDays(1);
-
-//                                         //Now go back to sunday last second
-//                                         dtAfter = dtAfter.AddDays(-1);
-
-//                                         //go seven days ahead
-//                                         dtBefore = dtAfter.AddDays(7);
-
-//                                         //case 1155
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.LastMonth:
-//                                         //start with the first day of this month
-//                                         dtAfter = new DateTime(RelativeToday.Year, RelativeToday.Month, 1, RelativeToday.Hour, RelativeToday.Minute, 00);
-//                                         //subtract a Month
-//                                         dtAfter = dtAfter.AddMonths(-1);
-
-//                                         //Add one month to dtAfter to get end date
-//                                         dtBefore = dtAfter.AddMonths(1);
-
-//                                         //case 1155
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         // 'yyyy-mm-ddTHH:MM:SS'
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.ThisMonth:
-//                                         //start with the first day of this month
-//                                         dtAfter = new DateTime(RelativeToday.Year, RelativeToday.Month, 1, RelativeToday.Hour, RelativeToday.Minute, 00);
-
-//                                         //Add one month to dtAfter to get end date
-//                                         dtBefore = dtAfter.AddMonths(1);
-
-//                                         //case 1155
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.NextMonth:
-//                                         //start with the first day of this month
-//                                         dtAfter = new DateTime(RelativeToday.Year, RelativeToday.Month, 1, RelativeToday.Hour, RelativeToday.Minute, 00);
-//                                         //Add a Month
-//                                         dtAfter = dtAfter.AddMonths(1);
-
-//                                         //Add one month to dtAfter to get end date
-//                                         dtBefore = dtAfter.AddMonths(1);
-
-//                                         //case 1155
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.FourteenDayWindow:
-//                                         //start with today zero hour
-//                                         dtAfter = new DateTime(RelativeToday.Year, RelativeToday.Month, RelativeToday.Day, RelativeToday.Hour, RelativeToday.Minute, 00);
-//                                         dtAfter = dtAfter.AddDays(-7);
-
-//                                         //Add 15 days to get end date (zero hour so not really 15 full days)
-//                                         dtBefore = dtAfter.AddDays(15);
-
-//                                         //case 1155
-//                                         dtAfter = dtAfter.AddSeconds(-1);
-
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     //case 2067 ADDITIONAL DATE RANGES ************
-
-//                                     case DataListFilterSpecialToken.Past:
-//                                         //Forever up to Now
-//                                         dtAfter = new DateTime(1753, 1, 2, 00, 00, 00);
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.Future:
-//                                         //From Now to forever (999 years from now)
-//                                         dtAfter = DateTime.UtcNow;
-//                                         dtBefore = DateTime.UtcNow.AddYears(999);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.LastYear:
-//                                         //From zero hour january 1 a year ago
-//                                         dtAfter = new DateTime(RelativeNow.AddYears(-1).Year, 1, 1, 0, 0, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         //To zero hour January 1 this year
-//                                         dtBefore = new DateTime(RelativeNow.Year, 1, 1, 0, 0, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.ThisYear:
-//                                         //From zero hour january 1 this year
-//                                         dtAfter = new DateTime(RelativeNow.Year, 1, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         //To zero hour Jan 1 next year
-//                                         dtBefore = new DateTime(RelativeNow.AddYears(1).Year, 1, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.InTheLast3Months:
-//                                         //From Now minus 3 months
-//                                         dtAfter = DateTime.UtcNow.AddMonths(-3);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.InTheLast6Months:
-//                                         //From Now minus 6 months
-//                                         dtAfter = DateTime.UtcNow.AddMonths(-6);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.InTheLastYear:
-//                                         //From Now minus 365 days
-//                                         dtAfter = DateTime.UtcNow.AddDays(-365);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     //=======================
-//                                     //NEW ONES FOR RAVEN
-
-//                                     case DataListFilterSpecialToken.YearToDate:
-//                                         //From zero hour january 1 this year
-//                                         dtAfter = new DateTime(RelativeNow.Year, 1, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment); ;
-//                                         //To now
-//                                         dtBefore = RelativeNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.Past90Days:
-//                                         //From Now minus 90 days
-//                                         dtAfter = DateTime.UtcNow.AddDays(-90);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.Past30Days:
-//                                         //From Now minus 30 days
-//                                         dtAfter = DateTime.UtcNow.AddDays(-30);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-//                                     case DataListFilterSpecialToken.Past24Hours:
-//                                         //From Now minus 24 hours
-//                                         dtAfter = DateTime.UtcNow.AddHours(-24);
-//                                         //To Now
-//                                         dtBefore = DateTime.UtcNow;
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.January:
-//                                         //From zero hour january 1 this year
-//                                         dtAfter = new DateTime(RelativeNow.Year, 1, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         //To zero hour feb 1 this year
-//                                         dtBefore = new DateTime(RelativeNow.Year, 2, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.February:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 2, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 3, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.March:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 3, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 4, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.April:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 4, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 5, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.May:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 5, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 6, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.June:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 6, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 7, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.July:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 7, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 8, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.August:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 8, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 9, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.September:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 9, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 10, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.October:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 10, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 11, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.November:
-//                                         dtAfter = new DateTime(RelativeNow.Year, 11, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         dtBefore = new DateTime(RelativeNow.Year, 12, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//                                     case DataListFilterSpecialToken.December:
-//                                         //From zero hour dec 1 this year
-//                                         dtAfter = new DateTime(RelativeNow.Year, 12, 1, 00, 00, 00).AddSeconds(-1).AddHours(TimeZoneAdjustment);
-//                                         //To zero hour Jan 1 next year
-//                                         dtBefore = new DateTime(RelativeNow.AddYears(1).Year, 1, 1, 00, 00, 00).AddHours(TimeZoneAdjustment);
-//                                         BuildBetweenTwoDatesFragment(SqlColumnNameToFilter, sb, dtAfter, dtBefore);
-//                                         break;
-
-//
-//                                         //-----
-//                                 }
-
-//                                 #endregion
-//                             }
-//                             else
-//                             {
diff --git a/ayanova/src/api/translation.js b/ayanova/src/api/translation.js
index 87b61292..dfa19a13 100644
--- a/ayanova/src/api/translation.js
+++ b/ayanova/src/api/translation.js
@@ -1,5 +1,3 @@
-/* ZZeslint-disable */
-//AyaNova Translation related utilities
 export default {
   ////////////////////////////////
   // Update the local cache
@@ -12,32 +10,12 @@ export default {
 
     if (editedTranslation) {
       //iterate the keys that are cached and set them from whatever is in editedTranslation for that key
-
-      //de-lodash
-      // window.$gz. _.forOwn(window.$gz.store.state.translationText, function(
-      //   cacheval,
-      //   cachekey
-      // ) {
-      //   //find match
-      //   //de-lodash
-      //   // let display = window.$gz. _.find(editedTranslation.translationItems, {
-      //   //   key: cachekey
-      //   // }).display;
-      //   let display = editedTranslation.translationItems.find(
-      //     z => z.key == cachekey
-      //   ).display;
-
-      //   window.$gz.store.commit("setTranslationText", {
-      //     key: cachekey,
-      //     value: display
-      //   });
-      // });
-
       for (const [key, value] of Object.entries(
         window.$gz.store.state.translationText
       )) {
-        let display = editedTranslation.translationItems.find(z => z.key == key)
-          .display;
+        const display = editedTranslation.translationItems.find(
+          z => z.key == key
+        ).display;
 
         window.$gz.store.commit("setTranslationText", {
           key: key,
@@ -46,22 +24,15 @@ export default {
       }
     } else {
       //gather up the keys that are cached and fetch the latest and then replace them
-      let needIt = [];
-
-      //de-lodash
-      // window.$gz. _.forOwn(window.$gz.store.state.translationText, function(
-      //   cacheval,
-      //   cachekey
-      // ) {
-      //   needIt.push(cachekey);
-      // });
-
+      const needIt = [];
       Object.keys(window.$gz.store.state.translationText).forEach(z => {
         needIt.push(z);
       });
-
       //fetch these keys
-      let transData = await window.$gz.api.upsert("translation/subset", needIt);
+      const transData = await window.$gz.api.upsert(
+        "translation/subset",
+        needIt
+      );
       transData.data.forEach(function commitFetchedTranslationItemToStore(
         item
       ) {
@@ -89,7 +60,7 @@ export default {
       //step 1: build an array of keys that we don't have already
       //Note: this will ensure only unique keys go into the store so it's safe to call this with dupes as can happen
       //for example datatables have dynamic column names so they need to fetch on demand
-      let needIt = [];
+      const needIt = [];
       for (let i = 0; i < keys.length; i++) {
         if (
           !window.$gz.util.has(window.$gz.store.state.translationText, keys[i])
@@ -323,21 +294,19 @@ export default {
   // (fetch and cache any missing strings)
   async translateStringWithMultipleKeysAsync(s) {
     let ret = s;
-    let found = s.match(/LT:[\w]*/gm);
+    const found = s.match(/LT:[\w]*/gm);
     if (found == null) {
       return ret;
     }
 
     //clean up the keys for fetching
-    let keysToCache = found.map(z => z.replace("LT:", ""));
+    const keysToCache = found.map(z => z.replace("LT:", ""));
     //cache / fetch any that are not already present
-    //(async () => {
     await this.cacheTranslations(keysToCache);
-    // })();
 
     //replace
     found.forEach(z => {
-      let translated = this.get(z.replace("LT:", ""));
+      const translated = this.get(z.replace("LT:", ""));
       //replace all
       ret = ret.split(z).join(translated);
     });
@@ -352,13 +321,13 @@ export default {
   //this is the sync version to be used in non async capable code
   translateStringWithMultipleKeys(s) {
     let ret = s;
-    let found = s.match(/LT:[\w]*/gm);
+    const found = s.match(/LT:[\w]*/gm);
     if (found == null) {
       return ret;
     }
     //replace
     found.forEach(z => {
-      let translated = this.get(z.replace("LT:", ""));
+      const translated = this.get(z.replace("LT:", ""));
       //replace all
       ret = ret.split(z).join(translated);
     });
diff --git a/ayanova/src/components/_barebones_template.vue b/ayanova/src/components/_barebones_template.vue
index 8eef3e42..ba2a7598 100644
--- a/ayanova/src/components/_barebones_template.vue
+++ b/ayanova/src/components/_barebones_template.vue
@@ -5,7 +5,7 @@
 </template>
 <script>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 export default {
diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue
index c59a83f9..ea34e6c9 100644
--- a/ayanova/src/components/attachment-control.vue
+++ b/ayanova/src/components/attachment-control.vue
@@ -207,13 +207,13 @@ export default {
     },
     async upload() {
       //similar code in wiki-control
-      let vm = this;
-      let fileData = [];
+      const vm = this;
+      const fileData = [];
       for (let i = 0; i < vm.uploadFiles.length; i++) {
         let f = vm.uploadFiles[i];
         fileData.push({ name: f.name, lastModified: f.lastModified });
       }
-      let at = {
+      const at = {
         ayaId: vm.ayaId,
         ayaType: vm.ayaType,
         files: vm.uploadFiles,
@@ -221,7 +221,7 @@ export default {
         notes: vm.notes ? vm.notes : ""
       };
       try {
-        let res = await window.$gz.api.uploadAttachment(at);
+        const res = await window.$gz.api.uploadAttachment(at);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -233,13 +233,13 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
         if ((await window.$gz.dialog.confirmDelete()) !== true) {
           return;
         }
 
-        let res = await window.$gz.api.remove("attachment/" + vm.editId);
+        const res = await window.$gz.api.remove("attachment/" + vm.editId);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -254,9 +254,9 @@ export default {
       }
     },
     async getList() {
-      let vm = this;
+      const vm = this;
       try {
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           "attachment/list?ayatype=" + vm.ayaType + "&ayaid=" + vm.ayaId
         );
         if (res.error) {
@@ -274,12 +274,12 @@ export default {
         data = [];
       }
 
-      let timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
-      let languageName = window.$gz.locale.getResolvedLanguage();
-      let hour12 = window.$gz.store.state.userOptions.hour12;
-      let ret = [];
+      const timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
+      const languageName = window.$gz.locale.getResolvedLanguage();
+      const hour12 = window.$gz.store.state.userOptions.hour12;
+      const ret = [];
       for (let i = 0; i < data.length; i++) {
-        let o = data[i];
+        const o = data[i];
         //http://localhost:7575/api/v8/attachment/download/100?t=sssss
         ret.push({
           id: o.id,
@@ -312,12 +312,11 @@ export default {
       });
     },
     async saveEdit() {
-      let vm = this;
+      const vm = this;
       if (!vm.editName) {
-        //todo: some error here, name is required..
         return;
       }
-      //check if they differ first
+
       let o = null;
       let i = 0;
       for (i = 0; i < vm.displayList.length; i++) {
@@ -326,26 +325,18 @@ export default {
           break;
         }
       }
-      //any changes?
+
       if (o.name == vm.editName && o.notes == vm.editNotes) {
         return;
       }
 
-      //post to server
-      /*
-          public uint Concurrency { get; set; }
-            [Required]
-            public string DisplayFileName { get; set; }
-            public string Notes { get; set; }
-      */
-
-      let p = {
+      const p = {
         concurrency: o.concurrency,
         displayFileName: vm.editName,
         notes: vm.editNotes
       };
       try {
-        let res = await window.$gz.api.upsert("attachment/" + vm.editId, p);
+        const res = await window.$gz.api.upsert("attachment/" + vm.editId, p);
 
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
diff --git a/ayanova/src/components/currency-control.vue b/ayanova/src/components/currency-control.vue
index 523d4eb8..af6900de 100644
--- a/ayanova/src/components/currency-control.vue
+++ b/ayanova/src/components/currency-control.vue
@@ -62,9 +62,9 @@ export default {
         this.initializing = false;
         return;
       }
-      let val = this.$refs.textField.$refs.input.value;
+      const val = this.$refs.textField.$refs.input.value;
 
-      let parsedValue = parseCurrency(val, {
+      const parsedValue = parseCurrency(val, {
         currency: this.currencyName,
         locale: this.languageName
       });
diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index 9db159a9..3dd42205 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -189,10 +189,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   data() {
     return {};
@@ -226,20 +222,6 @@ export default {
         window.$gz.form.fieldValueChanged(this.parentVM, ref);
       }
     },
-    // templateHasVisibleCustomFields() {
-    //   let template = this.$store.state.formCustomTemplate[this.formKey];
-    //   console.log(
-    //     "custom-fields-control templateHasVisibleCustomFields template=",
-    //     template
-    //   );
-    //   if (template == undefined) {
-    //     return false;
-    //   }
-    //   //iterate template and see if it has any custom fields set to display
-    //   //de-lodash
-    //   //return window.$gz. _.find(template, "type") != undefined;
-    //   return template.find(z => z.type != undefined);
-    // },
     GetValueForField: function(dataKey) {
       let cData = {};
       //get the data out of the JSON string value
@@ -254,15 +236,7 @@ export default {
       //	- CURRENT TIME, DATE, DATETIME are pretty specific but all use a datetime string so any value not datetime like should be nulled
       //  - CURRENT NUMBER, CURRENCY are also pretty specific but easy to identify if not fully numeric and then sb nulled or attempt to convert then null if not
 
-      //Get the field data type
-      //https://lodash.com/docs#find
-      //de-lodash
-      // let ctrlType = window.$gz. _.find(
-      //   this.$store.state.formCustomTemplate[this.formKey],
-      //   ["dataKey", dataKey]
-      // ).type;
-
-      let ctrlType = this.$store.state.formCustomTemplate[this.formKey].find(
+      const ctrlType = this.$store.state.formCustomTemplate[this.formKey].find(
         z => z.dataKey == dataKey
       ).type;
 
@@ -307,12 +281,10 @@ export default {
                 ret = window.$gz.util.stringToBoolean(ret);
                 break;
               }
-              //The number 1?
               if (ret === 1) {
                 ret = true;
                 break;
               }
-              //The number 0?
               if (ret === 0) {
                 ret = false;
                 break;
@@ -352,18 +324,14 @@ export default {
         cData[dataKey] = newValue.toString();
       }
 
-      //emit the new data so it syncs with the parent source
-      let ret = JSON.stringify(cData);
-      this.$emit("input", ret);
+      this.$emit("input", JSON.stringify(cData));
     }
   },
   computed: {
     availableCustomFields() {
       //item.type only exists for custom fields so they are the ones to return
       //In addition if there is a keyStartWith then there are multiple custom field controls on same form so that's a different route to take
-      let template = this.$store.state.formCustomTemplate[this.formKey];
-      //  // debugger;
-      // console.log("Template is: ", template);
+      const template = this.$store.state.formCustomTemplate[this.formKey];
 
       if (template != undefined) {
         if (this.keyStartWith != "") {
diff --git a/ayanova/src/components/dash-base.vue b/ayanova/src/components/dash-base.vue
index c56155a4..33bb1bdf 100644
--- a/ayanova/src/components/dash-base.vue
+++ b/ayanova/src/components/dash-base.vue
@@ -36,13 +36,7 @@
           </template>
         </template>
         <v-toolbar-title> {{ translatedTitle }} </v-toolbar-title>
-
         <v-spacer></v-spacer>
-
-        <!-- <v-btn icon>
-          <v-icon>mdi-heart</v-icon>
-        </v-btn> -->
-
         <v-menu bottom left>
           <template v-slot:activator="{ on, attrs }">
             <v-btn icon v-bind="attrs" v-on="on">
diff --git a/ayanova/src/components/dash-test-bar-widget-count-by-usertype.vue b/ayanova/src/components/dash-test-bar-widget-count-by-usertype.vue
index b16f23bc..6f749cad 100644
--- a/ayanova/src/components/dash-test-bar-widget-count-by-usertype.vue
+++ b/ayanova/src/components/dash-test-bar-widget-count-by-usertype.vue
@@ -85,18 +85,15 @@ export default {
     },
     clicked: function(c, i) {
       if (i.length == 0) return; //Clicked outside any bar.
-      let e = i[0]; //get index of bar clicked on
-      // console.log(e._index);
+      const e = i[0]; //get index of bar clicked on
+
       //this gets the label
       //let x_value = this.obj.labels[e._index];
       //this gets the value
       //let y_value = this.obj.datasets[0].data[e._index];
       //this gets my custom id stuff
       //https://stackoverflow.com/a/42635435/8939
-      let dataKeyValue = this.obj.datakeys[e._index];
-      // console.log(x_value);
-      // console.log(y_value);
-      //console.log(dataKeyValue);
+      const dataKeyValue = this.obj.datakeys[e._index];
 
       alert(`STUB: OPEN ITEM (data: ${JSON.stringify(dataKeyValue)})`);
       //clickOnChart(lastHoveredIndex);
diff --git a/ayanova/src/components/dash-test-day-calendar-widget.vue b/ayanova/src/components/dash-test-day-calendar-widget.vue
index bf3f97d6..6a9db783 100644
--- a/ayanova/src/components/dash-test-day-calendar-widget.vue
+++ b/ayanova/src/components/dash-test-day-calendar-widget.vue
@@ -43,11 +43,11 @@ export default {
   computed: {},
   methods: {
     loadData: function() {
-      let events = [];
-      let now = new Date();
-      let yy = now.getFullYear();
-      let mm = now.getMonth() + 1;
-      let dd = now.getDate();
+      const events = [];
+      const now = new Date();
+      const yy = now.getFullYear();
+      const mm = now.getMonth() + 1;
+      const dd = now.getDate();
       events.push({
         id: 45,
         type: 34,
diff --git a/ayanova/src/components/dash-test-list-widgets-priciest.vue b/ayanova/src/components/dash-test-list-widgets-priciest.vue
index 399f741f..2a859231 100644
--- a/ayanova/src/components/dash-test-list-widgets-priciest.vue
+++ b/ayanova/src/components/dash-test-list-widgets-priciest.vue
@@ -54,7 +54,7 @@ export default {
     moreClick() {
       const LIST_FORM_KEY = "widget-list";
       //get current settings for the form
-      let formSettings = window.$gz.form.getFormSettings(LIST_FORM_KEY);
+      const formSettings = window.$gz.form.getFormSettings(LIST_FORM_KEY);
 
       //switch to an unsaved listview and substitute this dash widgets list view criteria
       formSettings.temp.page = 0;
@@ -70,9 +70,9 @@ export default {
       });
     },
     async getDataFromApi() {
-      let lv = LIST_VIEW;
+      const lv = LIST_VIEW;
       lv.limit = this.maxListItems;
-      let res = await window.$gz.api.post("data-list", lv);
+      const res = await window.$gz.api.post("data-list", lv);
       if (!res.error) {
         this.obj = res.data;
       } else {
diff --git a/ayanova/src/components/data-table-filter-control.vue b/ayanova/src/components/data-table-filter-control.vue
index b945c98f..f4786c02 100644
--- a/ayanova/src/components/data-table-filter-control.vue
+++ b/ayanova/src/components/data-table-filter-control.vue
@@ -278,16 +278,6 @@
                 :clearable="!formState.readOnly"
                 :readonly="formState.readOnly"
               ></gz-duration-picker>
-              <!-- <v-text-field
-                v-if="
-                  editItem.tempFilterOperator != null &&
-                    editItem.tempFilterOperator != '*NOVALUE*' &&
-                    editItem.tempFilterOperator != '*HASVALUE*'
-                "
-                v-model="editItem.tempFilterValue"
-                :clearable="!formState.readOnly"
-                type="number"
-              ></v-text-field> -->
               <v-btn
                 large
                 block
@@ -401,17 +391,17 @@ export default {
   methods: {
     async saveAndExit() {
       //turn activeFilter into object json.parse
-      let af = JSON.parse(this.activeFilter.filter);
+      const af = JSON.parse(this.activeFilter.filter);
 
       //remove column filter if it is already there to replace
       if (af.length != 0) {
-        let index = af.findIndex(z => z.column == this.tableColumnData.fk);
+        const index = af.findIndex(z => z.column == this.tableColumnData.fk);
         if (index > -1) {
           af.splice(index, 1);
         }
       }
 
-      let newColumnFilter = {
+      const newColumnFilter = {
         column: this.tableColumnData.fk,
         any: this.editItem.filter.any,
         items: []
@@ -438,9 +428,11 @@ export default {
       this.activeFilter.filter = JSON.stringify(af);
 
       //SAVE
-      let res = await window.$gz.api.put("data-list-filter", this.activeFilter);
+      const res = await window.$gz.api.put(
+        "data-list-filter",
+        this.activeFilter
+      );
       if (res.error) {
-        //throw new Error(res.error);
         throw new Error(window.$gz.errorHandler.errorToString(res, vm));
       } else {
         this.close({ refresh: true });
@@ -451,7 +443,7 @@ export default {
     },
     addFilterCondition(editItem) {
       // filter:[{column:"PartPartNumber",any:true/false,items:[{op: "=",value: "400735"}]}],
-      let filterItem = { op: null, value: null, display: null };
+      const filterItem = { op: null, value: null, display: null };
       let filterItemSet = false;
 
       //DATE relative token?
@@ -593,18 +585,17 @@ async function populateFieldDefinitions(vm) {
   //get the field defs from cache or store them
   //they are unchanging in a session so no need to fetch each time
   //only a server update would modify them from last value
-  let storageKey = `dataListFields:${vm.dataListKey}`;
+  const storageKey = `dataListFields:${vm.dataListKey}`;
 
-  let ss = sessionStorage.getItem(storageKey);
+  const ss = sessionStorage.getItem(storageKey);
   if (ss) {
     vm.fieldDefinitions = JSON.parse(ss);
     return;
   } else {
-    let res = await window.$gz.api.get(
+    const res = await window.$gz.api.get(
       "data-list/listfields?DataListKey=" + vm.dataListKey
     );
     if (res.error) {
-      //throw new Error(res.error);
       throw new Error(window.$gz.errorHandler.errorToString(res, vm));
     } else {
       vm.fieldDefinitions = res.data;
@@ -617,9 +608,8 @@ async function populateFieldDefinitions(vm) {
 //
 async function fetchActiveFilter(vm) {
   ///api/v8/data-list-filter/{id}
-  let res = await window.$gz.api.get(`data-list-filter/${vm.activeFilterId}`);
+  const res = await window.$gz.api.get(`data-list-filter/${vm.activeFilterId}`);
   if (res.error) {
-    //throw new Error(res.error);
     throw new Error(window.$gz.errorHandler.errorToString(res, vm));
   } else {
     vm.activeFilter = res.data;
@@ -898,8 +888,10 @@ function initEditItem(vm) {
     );
   }
 
-  let fld = vm.fieldDefinitions.find(z => z.fieldKey == vm.tableColumnData.fk);
-  let o = {
+  const fld = vm.fieldDefinitions.find(
+    z => z.fieldKey == vm.tableColumnData.fk
+  );
+  const o = {
     key: fld.fieldKey,
     isFilterable: fld.isFilterable,
     enumType: fld.enumType,
@@ -913,9 +905,9 @@ function initEditItem(vm) {
 
   //re-hydrate the filter if already defined for this column
   //turn activeFilter into object json.parse
-  let allActiveFilters = JSON.parse(vm.activeFilter.filter);
+  const allActiveFilters = JSON.parse(vm.activeFilter.filter);
 
-  let af = allActiveFilters.find(z => z.column == vm.tableColumnData.fk);
+  const af = allActiveFilters.find(z => z.column == vm.tableColumnData.fk);
   if (af) {
     o.filter.any = af.any;
     o.filter.items = af.items;
@@ -934,7 +926,7 @@ function initEditItem(vm) {
 
   //Add display text for filter item (same as in addFilterCondition)
   for (let j = 0; j < o.filter.items.length; j++) {
-    let fi = o.filter.items[j];
+    const fi = o.filter.items[j];
     fi.display = getDisplayForFilter(
       vm,
       o.uiFieldDataType,
@@ -974,7 +966,7 @@ function getDisplayForFilter(
 
   //DATE RELATIVE TOKEN FILTER
   if (uiFieldDataType === 1 && filterValue[0] == "*") {
-    let valueDisplay = vm.selectLists.dateFilterTokens.find(
+    const valueDisplay = vm.selectLists.dateFilterTokens.find(
       z => z.id == filterValue
     ).name;
 
@@ -1001,7 +993,7 @@ function getDisplayForFilter(
       valueDisplay = window.$gz.locale.decimalLocalized(filterValue);
       break;
     case 6: //BOOL translate
-      let tKey = filterValue ? "True" : "False";
+      const tKey = filterValue ? "True" : "False";
       valueDisplay = vm.$ay.t(tKey);
       break;
     case 10: //ENUM translate
@@ -1016,7 +1008,7 @@ function getDisplayForFilter(
   }
 
   //Operator
-  let opDisplay = vm.selectLists.stringFilterOperators.find(
+  const opDisplay = vm.selectLists.stringFilterOperators.find(
     z => z.id == filterOperator
   ).name;
 
diff --git a/ayanova/src/components/data-table-filter-manager-control.vue b/ayanova/src/components/data-table-filter-manager-control.vue
index 562bb862..751b4dda 100644
--- a/ayanova/src/components/data-table-filter-manager-control.vue
+++ b/ayanova/src/components/data-table-filter-manager-control.vue
@@ -10,10 +10,7 @@
       <v-card-subtitle class="mt-1"
         >{{ activeFilterNameAtOpen }} {{ activeFilterCreator }}</v-card-subtitle
       >
-      <!-- activefilter:{ "id": 2, "concurrency": 5029609, "userId": 1, "name": "-", 
-      "public": false, "defaultFilter": true, "listKey": "CustomerDataList", "filter": "[]" }  -->
       <v-card-text>
-        <!-- <div>activefilter:{{ activeFilter }}</div> -->
         <v-text-field
           :readonly="formState.readOnly"
           v-model="activeFilter.name"
@@ -95,13 +92,13 @@ export default {
     async deleteFilter() {
       //prompt if a true delete and not a default filter "reset"
       if (!this.activeFilter.defaultFilter) {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
       }
 
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `data-list-filter/${this.activeFilter.id}`
       );
       if (res.error) {
@@ -113,7 +110,6 @@ export default {
     async saveAndExit(saveAs) {
       if (saveAs) {
         //SAVE AS
-
         //strip ID
         delete this.activeFilter.id;
         delete this.activeFilter.concurrency;
@@ -128,24 +124,22 @@ export default {
           this.activeFilter.name += " [" + this.$ay.t("Copy") + "]";
         }
         this.activeFilter.userId = window.$gz.store.state.userId;
-        let res = await window.$gz.api.post(
+        const res = await window.$gz.api.post(
           "data-list-filter",
           this.activeFilter
         );
         if (res.error) {
-          //throw new Error(res.error);
           throw new Error(window.$gz.errorHandler.errorToString(res, this));
         } else {
           this.close({ refresh: true, newFilterId: res.data.id });
         }
       } else {
         //SAVE
-        let res = await window.$gz.api.put(
+        const res = await window.$gz.api.put(
           "data-list-filter",
           this.activeFilter
         );
         if (res.error) {
-          //throw new Error(res.error);
           throw new Error(window.$gz.errorHandler.errorToString(res, this));
         } else {
           this.close({ refresh: true });
@@ -162,7 +156,7 @@ export default {
 
       //Get owner name
       if (!this.isSelfOwned) {
-        let res = await window.$gz.api.post("pick-list/list", {
+        const res = await window.$gz.api.post("pick-list/list", {
           ayaType: window.$gz.type.User,
           inactive: true,
           preselectedIds: [this.activeFilter.userId]
@@ -200,9 +194,8 @@ async function initForm(vm) {
 //
 async function fetchActiveFilter(vm) {
   ///api/v8/data-list-filter/{id}
-  let res = await window.$gz.api.get(`data-list-filter/${vm.activeFilterId}`);
+  const res = await window.$gz.api.get(`data-list-filter/${vm.activeFilterId}`);
   if (res.error) {
-    //throw new Error(res.error);
     throw new Error(window.$gz.errorHandler.errorToString(res, vm));
   } else {
     vm.activeFilter = res.data;
diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 5235cdba..df54aa85 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -148,7 +148,6 @@
                   <template v-if="c.t == 1">
                     <!-- DATETIME -->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -163,7 +162,6 @@
                   <template v-else-if="c.t == 2">
                     <!-- DATE -->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -178,7 +176,6 @@
                   <template v-else-if="c.t == 3">
                     <!-- TIME -->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -193,7 +190,6 @@
                   <template v-else-if="c.t == 4">
                     <!-- TEXT (also maybe openable)-->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -208,7 +204,6 @@
                   <template v-else-if="c.t == 5">
                     <!-- INTEGER -->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -232,7 +227,6 @@
                   <template v-else-if="c.t == 7">
                     <!-- DECIMAL -->
                     <template v-if="c.i && c.i != 0 && !c.nopen">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -255,7 +249,6 @@
                   <template v-else-if="c.t == 10">
                     <!-- ENUM (translated to text on getdata) ALSO MAYBE OPENABLE -->
                     <template v-if="c.i && c.ot">
-                      <!-- openable object with an ID -->
                       <div
                         class="subtitle-1"
                         @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -363,7 +356,6 @@
                           <template v-if="c.t == 1">
                             <!-- DATETIME -->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -378,7 +370,6 @@
                           <template v-else-if="c.t == 2">
                             <!-- DATE -->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -393,7 +384,6 @@
                           <template v-else-if="c.t == 3">
                             <!-- TIME -->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -408,7 +398,6 @@
                           <template v-else-if="c.t == 4">
                             <!-- TEXT (also maybe openable)-->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -423,7 +412,6 @@
                           <template v-else-if="c.t == 5">
                             <!-- INTEGER -->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -450,7 +438,6 @@
                           <template v-else-if="c.t == 7">
                             <!-- DECIMAL -->
                             <template v-if="c.i && c.i != 0 && !c.nopen">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -473,7 +460,6 @@
                           <template v-else-if="c.t == 10">
                             <!-- ENUM (translated to text on getdata) ALSO MAYBE OPENABLE -->
                             <template v-if="c.i && c.ot">
-                              <!-- openable object with an ID -->
                               <div
                                 class="subtitle-1"
                                 @click="gridCellButtonClick(c.key, c.i, c.ot)"
@@ -527,7 +513,6 @@
 
 <script>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //NOTE: if get duplicate keys detected error here it's because whatever is the rowid column
 //has duplicate values in it and should be unique in every row
@@ -572,7 +557,6 @@ export default {
       default: undefined
     },
     preFilterMode: {
-      //{icon:null,viz:null,ayatype:null,id:null,clearable:false}
       type: Object,
       default: null
     },
@@ -596,13 +580,12 @@ export default {
   watch: {
     dataTablePagingOptions: {
       async handler() {
-        //{ "page": 1, "itemsPerPage": 10, "sortBy": [], "sortDesc": [], "groupBy": [], "groupDesc": [], "mustSort": false, "multiSort": false }
         //this code works around some weird bug that causes visible items to be selected in grid (only, not in actual selected array, just a visual thing)
         // when breakpoint is switched between wide and narrow either way.  No idea why it happens but this fixes that issue and also ensures that there are no
 
         //spurious fetches happening just because the view has changed
         //See what has changed and record it for processing
-        let sortHasChanged = !(
+        const sortHasChanged = !(
           window.$gz.util.isEqualArraysOfPrimitives(
             this.dataTablePagingOptions.sortBy,
             this.lastDataTablePagingOptions.sortBy
@@ -613,7 +596,7 @@ export default {
           )
         );
 
-        let pagingHaschanged = !(
+        const pagingHaschanged = !(
           this.lastDataTablePagingOptions.page ==
             this.dataTablePagingOptions.page &&
           this.lastDataTablePagingOptions.itemsPerPage ==
@@ -682,15 +665,15 @@ export default {
     //Used by narrow view to get the "header" text for a column based on the column key
     getHeaderText(key) {
       //key format is row-column e.g."500-2"
-      let columnIndex = key.split("-")[1];
-      let header = this.headers[columnIndex];
+      const columnIndex = key.split("-")[1];
+      const header = this.headers[columnIndex];
       if (header && header.text) {
         return header.text;
       }
       return "";
     },
     async filter(item) {
-      let res = await this.$refs.dataTableFilter.open(item);
+      const res = await this.$refs.dataTableFilter.open(item);
       if (res && res.refresh == true) {
         this.getDataFromApi();
       }
@@ -707,7 +690,7 @@ export default {
       setActiveFilter(this); //will not trigger refresh yet
 
       //Call api method to clear this filter
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `data-list-filter/${this.activeFilterId}`
       );
       if (res.error) {
@@ -727,7 +710,7 @@ export default {
       return null;
     },
     async editFilter() {
-      let res = await this.$refs.dataTableFilterManager.open();
+      const res = await this.$refs.dataTableFilterManager.open();
       if (res && res.refresh == true) {
         if (res.newFilterId) {
           //save as new filter, select it
@@ -739,7 +722,7 @@ export default {
       }
     },
     async mobileColumnFilterSelect() {
-      let resHeaderItem = await this.$refs.dataTableMobileFilterColumnSelector.open(
+      const resHeaderItem = await this.$refs.dataTableMobileFilterColumnSelector.open(
         this.headers,
         this.filterColor
       );
@@ -749,24 +732,24 @@ export default {
     },
     keyArrayFromSortByArray(sortBy) {
       return sortBy.map(sortItem => {
-        let val = this.headers.find(z => z.value == sortItem);
+        const val = this.headers.find(z => z.value == sortItem);
         if (val) {
           return val.fk;
         }
       });
     },
     setSortIndicatorsFromDataListResponse(rsort) {
-      let sortBy = [];
-      let sortDesc = [];
+      const sortBy = [];
+      const sortDesc = [];
       if (rsort != null) {
         Object.keys(rsort).forEach((key, index) => {
           //Pull column header name "value" from "fk"matching "key" here  from this.headers columns.c0 etc here from this.headers see above method
-          let found = this.headers.find(z => z.fk == key);
+          const found = this.headers.find(z => z.fk == key);
           if (found != null) {
             sortBy.push(found.value);
 
             //if not null then push into the sortBy array
-            let sort = rsort[key];
+            const sort = rsort[key];
             if (sort == "-") {
               sortDesc.push(true);
             } else {
@@ -783,7 +766,7 @@ export default {
       this.getDataFromApi();
     },
     getDataListSelection(ayaType) {
-      let vm = this;
+      const vm = this;
       //called when parent form needs the selected id's or the list view options needed to rehydrate the entire list of id's in the same order and filter
       //i.e. for reporting, batch operations etc
 
@@ -828,9 +811,6 @@ export default {
         params: {
           dataListKey: this.dataListKey,
           hiddenAffectiveColumns: this.hiddenAffectiveColumns
-          // ,
-          // formKey: this.formKey,
-          // activeFilterId: this.activeFilterId
         }
       });
     },
@@ -856,7 +836,7 @@ export default {
       //c.cst is styling added here by data builder in the form of an object with props set for compatibility with Vue
       //c.clr is a specific color coming from the server for items that support colors (reminders etc)
       if (c.cst || c.clr) {
-        let clrBit = {};
+        const clrBit = {};
         if (c.clr) {
           if (c.clr[0] != "#") {
             c.clr = "#" + c.clr;
@@ -869,13 +849,13 @@ export default {
       }
     },
     async getDataFromApi(deSelectAll) {
-      let vm = this;
+      const vm = this;
 
       if (vm.loading) {
         return;
       }
       //start with defaults
-      let listOptions = {
+      const listOptions = {
         DataListKey: vm.dataListKey,
         Limit: 5,
         Offset: 0
@@ -911,7 +891,7 @@ export default {
       }
 
       try {
-        let res = await window.$gz.api.post("data-list", {
+        const res = await window.$gz.api.post("data-list", {
           offset: listOptions.Offset,
           limit: listOptions.Limit,
           dataListKey: vm.dataListKey,
@@ -973,7 +953,7 @@ export default {
   },
   async created() {
     //get pick lists
-    let vm = this;
+    const vm = this;
     await initForm(vm);
     vm.loading = false;
     vm.getDataFromApi();
@@ -986,11 +966,11 @@ function buildHeaders(columnData) {
   if (!columnData) {
     return [];
   }
-  let ret = [];
+  const ret = [];
   //iterate the columns
   for (let i = 0; i < columnData.length; i++) {
-    let cm = columnData[i];
-    let h = {};
+    const cm = columnData[i];
+    const h = {};
     h.text = window.$gz.translation.get(cm.cm);
     h.fk = cm.fk;
     h.value = "columns.c" + i.toString(); //+".v";
@@ -1020,38 +1000,38 @@ function buildHeaders(columnData) {
 async function buildRecords(listData, columndefinitions, ridColumnOpenable) {
   //iterate data, build each object keyed with index name and display set to correct translated filter and then return
 
-  let ret = [];
+  const ret = [];
   if (!listData) {
     return ret;
   }
 
   //cache display format stuff
-  let timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
-  let languageName = window.$gz.locale.getResolvedLanguage();
-  let hour12 = window.$gz.store.state.userOptions.hour12;
-  let currencyName = window.$gz.locale.getCurrencyName();
+  const timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
+  const languageName = window.$gz.locale.getResolvedLanguage();
+  const hour12 = window.$gz.store.state.userOptions.hour12;
+  const currencyName = window.$gz.locale.getCurrencyName();
 
   //this will cache the first time it's required (if required)
   let availableRoles = null;
 
   //comes as an array of arrays, needs to leave as an array of objects representing each row
   for (let iRow = 0; iRow < listData.length; iRow++) {
-    let row = listData[iRow];
+    const row = listData[iRow];
     //iterate row and build object representing row data keyed to index
 
     //container object for row
     //id will be set later when code below encounters the id column which could be in any position (or not at all) but is identified by it's rid property
-    let o = { id: undefined, columns: {} };
+    const o = { id: undefined, columns: {} };
 
     for (let iColumn = 0; iColumn < row.length; iColumn++) {
-      let column = row[iColumn];
+      const column = row[iColumn];
 
       //rowId?
       if (column.rid) {
         o.id = column.i;
       }
 
-      let dataType = columndefinitions[iColumn].dt;
+      const dataType = columndefinitions[iColumn].dt;
       let display = column.v;
       let cstStyle = null; //custom additional styling here in grid e.g. negative numbers etc
 
@@ -1175,12 +1155,12 @@ async function buildRecords(listData, columndefinitions, ridColumnOpenable) {
                 "AuthorizationRoles"
               );
             }
-            let roles = display;
-            let roleNames = [];
+            const roles = display;
+            const roleNames = [];
 
             if (roles != null && roles != 0) {
               for (let i = 0; i < availableRoles.length; i++) {
-                let role = availableRoles[i];
+                const role = availableRoles[i];
                 if (!!(roles & role.id)) {
                   roleNames.push(role.name);
                 }
@@ -1194,7 +1174,7 @@ async function buildRecords(listData, columndefinitions, ridColumnOpenable) {
         }
       }
       //build the row column object vm will be used by the datatable
-      let columnObject = {
+      const columnObject = {
         v: display,
         t: dataType,
         key: iRow + "-" + iColumn
@@ -1244,9 +1224,9 @@ async function fetchTranslatedHeaderNames(columnData) {
   if (!columnData) {
     return;
   }
-  let headerKeys = [];
+  const headerKeys = [];
   for (let i = 0; i < columnData.length; i++) {
-    let cm = columnData[i];
+    const cm = columnData[i];
     headerKeys.push(cm.cm);
   }
   //Now fetch all the keys
@@ -1261,9 +1241,9 @@ async function fetchEnums(columnData) {
   if (!columnData) {
     return;
   }
-  let headerKeys = [];
+
   for (let i = 0; i < columnData.length; i++) {
-    let cm = columnData[i];
+    const cm = columnData[i];
     if (cm.et) {
       await window.$gz.enums.fetchEnumList(cm.et);
     }
@@ -1287,7 +1267,7 @@ async function initForm(vm) {
 ////////////////////
 //
 async function fetchSavedFilterList(vm) {
-  let res = await window.$gz.api.get(
+  const res = await window.$gz.api.get(
     "data-list-filter/list?ListKey=" + vm.dataListKey
   );
   if (res.error) {
@@ -1303,7 +1283,7 @@ async function fetchSavedFilterList(vm) {
 ////////////////////
 //
 function saveFormSettings(vm) {
-  let newFormSettings = {
+  const newFormSettings = {
     temp: { page: vm.dataTablePagingOptions.page },
     saved: {
       itemsPerPage: vm.dataTablePagingOptions.itemsPerPage,
@@ -1315,7 +1295,7 @@ function saveFormSettings(vm) {
 
   //preserve anything not directly related to datatable
   //for now it's just the last report so nothing fancy here
-  let formSettings = window.$gz.form.getFormSettings(vm.formKey);
+  const formSettings = window.$gz.form.getFormSettings(vm.formKey);
 
   if (formSettings != null && formSettings.saved != null) {
     if (formSettings.saved.lastReport != null) {
@@ -1340,7 +1320,7 @@ function setActiveFilter(vm, desiredId) {
   }
 
   //no specific id so attempt to set to default
-  let dflt = vm.selectLists.savedFilters.find(z => z.default == true);
+  const dflt = vm.selectLists.savedFilters.find(z => z.default == true);
   if (dflt) {
     vm.activeFilterId = dflt.id;
     return;
@@ -1352,7 +1332,7 @@ function setActiveFilter(vm, desiredId) {
 ////////////////////
 //
 function loadFormSettings(vm) {
-  let formSettings = window.$gz.form.getFormSettings(vm.formKey);
+  const formSettings = window.$gz.form.getFormSettings(vm.formKey);
 
   //process SAVED formsettings
   if (formSettings.saved) {
diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index aa6f753f..7f26426c 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -58,15 +58,12 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 //******************************** NOTE: this control also captures the TIME even though it's DATE only, this is an intentional design decision to support field change to date or date AND time and is considered a display issue */
 export default {
   data: () => ({
     dlgdate: false,
-    //cache display format stuff
     timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
     languageName: window.$gz.locale.getResolvedLanguage()
-    // defaultLocale: window.$gz.locale.get BrowserFirstLanguage().split("-", 1)[0]
   }),
   props: {
     label: { type: String, default: null },
@@ -96,7 +93,7 @@ export default {
   },
   methods: {
     setToday() {
-      let v = window.$gz.locale
+      const v = window.$gz.locale
         .nowUTC8601String(this.timeZoneName)
         .split("T")[0];
       this.updateDateValue(v);
@@ -122,11 +119,11 @@ export default {
       this.dlgdate = false;
     },
     updateValue(theDate, theTime) {
-      let vm = this;
+      const vm = this;
 
       if (!theDate) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -142,7 +139,7 @@ export default {
         theTime = "00:00:00";
       }
 
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         theDate + "T" + theTime,
         vm.timeZoneName
       );
diff --git a/ayanova/src/components/date-native-control.vue b/ayanova/src/components/date-native-control.vue
index a0a601ce..26930777 100644
--- a/ayanova/src/components/date-native-control.vue
+++ b/ayanova/src/components/date-native-control.vue
@@ -24,7 +24,6 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 export default {
   data() {
     return {
@@ -58,11 +57,11 @@ export default {
       );
     },
     updateValue() {
-      let vm = this;
+      const vm = this;
       let dateValue = vm.$refs.dateField.$refs.input.value;
       if (!dateValue) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -82,7 +81,7 @@ export default {
         timeValue = "00:00:00";
       }
 
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         dateValue + "T" + timeValue,
         vm.timeZoneName
       );
diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index ded8c80a..2ad57a05 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -95,16 +95,13 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 export default {
   data: () => ({
     dlgdate: false,
     dlgtime: false,
-    //cache display format stuff
     timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
     languageName: window.$gz.locale.getResolvedLanguage(),
     hour12: window.$gz.locale.getHour12()
-    //defaultLocale: window.$gz.locale.ge tBrowserFirstLanguage().split("-", 1)[0]
   }),
   props: {
     label: { type: String, default: null },
@@ -134,14 +131,14 @@ export default {
   },
   methods: {
     setToday() {
-      let v = window.$gz.locale
+      const v = window.$gz.locale
         .nowUTC8601String(this.timeZoneName)
         .split("T")[0];
       this.updateDateValue(v);
       this.dlgdate = false;
     },
     setNow() {
-      let v = window.$gz.locale.nowUTC8601String().split("T")[1];
+      const v = window.$gz.locale.nowUTC8601String().split("T")[1];
       this.updateTimeValue(v);
       this.dlgtime = false;
     },
@@ -177,10 +174,10 @@ export default {
       this.dlgdate = false;
     },
     updateValue(theDate, theTime) {
-      let vm = this;
+      const vm = this;
       if (!theDate) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -196,7 +193,7 @@ export default {
         theTime = "00:00:00";
       }
 
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         theDate + "T" + theTime,
         vm.timeZoneName
       );
diff --git a/ayanova/src/components/date-time-native-control.vue b/ayanova/src/components/date-time-native-control.vue
index b5c15177..99a8c0ea 100644
--- a/ayanova/src/components/date-time-native-control.vue
+++ b/ayanova/src/components/date-time-native-control.vue
@@ -48,7 +48,7 @@ export default {
 
   props: {
     label: { type: String, default: null },
-    rules: { type: Array, default: undefined},
+    rules: { type: Array, default: undefined },
     errorMessages: { type: Array, default: null },
     value: { type: String, default: null },
     readonly: { type: Boolean, default: false },
@@ -79,11 +79,11 @@ export default {
       );
     },
     updateValue() {
-      let vm = this;
+      const vm = this;
       let dateValue = vm.$refs.dateField.$refs.input.value;
       if (!dateValue) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -100,7 +100,7 @@ export default {
         timeValue = "00:00:00";
       }
 
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         dateValue + "T" + timeValue,
         vm.timeZoneName
       );
diff --git a/ayanova/src/components/days-of-week-control.vue b/ayanova/src/components/days-of-week-control.vue
index f629ef51..2862be27 100644
--- a/ayanova/src/components/days-of-week-control.vue
+++ b/ayanova/src/components/days-of-week-control.vue
@@ -17,7 +17,6 @@
   ></v-select>
 </template>
 <script>
-/*  Xeslint-disable */
 //bitwise selection of days of week
 //https://stackoverflow.com/a/24174625/8939
 
@@ -43,10 +42,10 @@ export default {
   },
   computed: {
     selectedValue() {
-      let ret = [];
+      const ret = [];
       if (this.value != null && this.value != 0) {
         for (let i = 0; i < this.daysOfWeek.length; i++) {
-          let day = this.daysOfWeek[i];
+          const day = this.daysOfWeek[i];
           if (!!(this.value & day.id)) {
             ret.push(day.id);
           }
@@ -60,7 +59,7 @@ export default {
       let newValue = 0;
       if (value != null && value != [] && value.length > 0) {
         for (let i = 0; i < value.length; i++) {
-          let day = value[i];
+          const day = value[i];
           newValue = newValue | day;
         }
       }
diff --git a/ayanova/src/components/decimal-control.vue b/ayanova/src/components/decimal-control.vue
index ab410286..3116ad9a 100644
--- a/ayanova/src/components/decimal-control.vue
+++ b/ayanova/src/components/decimal-control.vue
@@ -18,7 +18,6 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 //### NOTE: THIS IS A DUPLICATE OF CURRENCYCONTROL AND THE ONLY DIFFERENCE IS THE "currency:" VALUE IS SET TO NULL IN THE TEMPLATE AND IN THE updateValue METHOD
 //https://dm4t2.github.io/vue-currency-input/guide/#introduction :value="formattedValue"
 //https://codesandbox.io/s/vue-template-kd7d1?fontsize=14&module=%2Fsrc%2FApp.vue
@@ -47,8 +46,8 @@ export default {
   },
   methods: {
     updateValue() {
-      let val = this.$refs.textField.$refs.input.value;
-      let parsedValue = parseCurrency(val, {
+      const val = this.$refs.textField.$refs.input.value;
+      const parsedValue = parseCurrency(val, {
         currency: null,
         locale: this.languageName
       });
diff --git a/ayanova/src/components/duration-control.vue b/ayanova/src/components/duration-control.vue
index e20f7de6..3ed4fdc2 100644
--- a/ayanova/src/components/duration-control.vue
+++ b/ayanova/src/components/duration-control.vue
@@ -69,20 +69,6 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
-
-/*https://alligator.io/vuejs/add-v-model-support/
-  "TimeSpanDays": "days",
-  "TimeSpanHours": "hours",
-  "TimeSpanMinutes": "minutes",
-  "TimeSpanSeconds": "seconds", */
-//example serialized json TimeSpans
-//seems to be DD.HH:MM:SS.ms at it's most characters
-//two colons always with an optional period at each end to separate days and ms
-//we don't support or need MS and can safely ignore them
-//so just look for a period at the top and the rest is split by colons
-//maybe split by colon first then subsplit first and last elements into days and MS
-//{"data":{"testTSDaysWMS":"22.10:15:22.0330000","testTSHMS":"05:16:33","testTS_DHMS":"5.10:15:33","testTS_MS":"00:15:33","testTS_S":"00:00:33","testTS_D":"22.00:00:00"}}
 export default {
   props: {
     label: { type: String, default: null },
@@ -100,7 +86,7 @@ export default {
       return this.errorMessages != null && this.errorMessages.length > 0;
     },
     splitSpan() {
-      let vm = this;
+      const vm = this;
       let theDays = 0;
       let theHours = 0;
       let theMinutes = 0;
@@ -112,10 +98,10 @@ export default {
         theMinutes = 0;
         theSeconds = 0;
       } else {
-        let work = vm.value.split(":");
+        const work = vm.value.split(":");
         //has days?
         if (work[0].includes(".")) {
-          let dh = work[0].split(".");
+          const dh = work[0].split(".");
           theDays = Number(dh[0]);
           theHours = Number(dh[1]);
         } else {
@@ -124,7 +110,7 @@ export default {
         theMinutes = Number(work[1]);
         //has milliseconds? (ignore them)
         if (work[2].includes(".")) {
-          let dh = work[2].split(".");
+          const dh = work[2].split(".");
           theSeconds = Number(dh[0]);
         } else {
           theSeconds = Number(work[2]);
@@ -149,16 +135,14 @@ export default {
       return ret;
     },
     updateSpan() {
-      //{"data":{"testTSDaysWMS":"22.10:15:22.0330000","testTSHMS":"05:16:33","testTS_DHMS":"5.10:15:33","testTS_MS":"00:15:33","testTS_S":"00:00:33","testTS_D":"22.00:00:00"}}
-      // DD.HH:MM:SS.ms
       let ret = "";
       //NOTE: even though a user may type a text value into the input, because it's set to "Number"
       //it always has a value of zero if it's not a digit even though the user typed Q for example (firefox at least)
       //so no parsing here to handle weird entries is required AFAICT
-      let daysValue = this.$refs.daysPicker.$refs.input.value || 0;
-      let hoursValue = this.$refs.hoursPicker.$refs.input.value || 0;
-      let minutesValue = this.$refs.minutesPicker.$refs.input.value || 0;
-      let secondsValue = this.$refs.secondsPicker.$refs.input.value || 0;
+      const daysValue = this.$refs.daysPicker.$refs.input.value || 0;
+      const hoursValue = this.$refs.hoursPicker.$refs.input.value || 0;
+      const minutesValue = this.$refs.minutesPicker.$refs.input.value || 0;
+      const secondsValue = this.$refs.secondsPicker.$refs.input.value || 0;
 
       if (daysValue > 0) {
         ret = `${daysValue}.`;
diff --git a/ayanova/src/components/extension-delete-control.vue b/ayanova/src/components/extension-delete-control.vue
index 6e4712b1..326d7499 100644
--- a/ayanova/src/components/extension-delete-control.vue
+++ b/ayanova/src/components/extension-delete-control.vue
@@ -25,7 +25,7 @@
 <script>
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     await fetchTranslatedText(vm);
     //NOTE: if extension doesn't support a particular object add it here to the NoType default
     if (
@@ -49,8 +49,8 @@ export default {
       return true;
     },
     async doAction() {
-      let vm = this;
-      let dialogResult = await window.$gz.dialog.confirmGeneric(
+      const vm = this;
+      const dialogResult = await window.$gz.dialog.confirmGeneric(
         "EraseMultipleObjectsWarning",
         "error"
       );
@@ -61,33 +61,20 @@ export default {
       vm.$emit("ext-show-job-log", "clear");
 
       //do the batch action
-      let url = "job-operations/batch-delete";
-      let body = this.dataListSelection;
+      const url = "job-operations/batch-delete";
+      const body = this.dataListSelection;
 
       try {
         //call api route
         let jobId = await window.$gz.api.upsert(url, body);
         if (jobId.error) {
-          //throw new Error(jobId.error);
           throw new Error(window.$gz.errorHandler.errorToString(jobId, vm));
         }
         jobId = jobId.jobId; //it's in a sub key
         //indicate loading by setting on button
         vm.jobActive = true;
 
-        /*  /// <summary>
-    /// Job status for opsjobs
-    /// </summary>
-    public enum JobStatus : int
-    {
-        Absent=0,
-        Sleeping = 1,
-        Running = 2,
-        Completed = 3,
-        Failed = 4
-    } */
         let jobStatus = 1;
-        //get status
 
         while (vm.jobActive == true) {
           await window.$gz.util.sleepAsync(1000);
@@ -117,8 +104,6 @@ export default {
         vm.$emit("ext-close-refresh");
       } catch (error) {
         vm.jobActive = false;
-
-        //window.$gz.errorHandler.handleFormError(error, vm);
         window.$gz.eventBus.$emit("notify-error", vm.$ay.t("JobFailed"));
       }
     }
diff --git a/ayanova/src/components/extension-export-control.vue b/ayanova/src/components/extension-export-control.vue
index 19f00443..d7b385ff 100644
--- a/ayanova/src/components/extension-export-control.vue
+++ b/ayanova/src/components/extension-export-control.vue
@@ -36,20 +36,16 @@ export default {
     },
 
     async doAction() {
-      //do the export and trigger download
-      let vm = this;
-      let url = `export/render/${vm.exportFormat}`;
-      let body = this.dataListSelection;
-
       try {
-        //call api route
-        let res = await window.$gz.api.upsert(url, body);
+        const res = await window.$gz.api.upsert(
+          `export/render/${this.exportFormat}`,
+          this.dataListSelection
+        );
         if (res.error) {
-          //Error object constructor must be a string
-          throw new Error(window.$gz.errorHandler.errorToString(res, vm));
+          throw new Error(window.$gz.errorHandler.errorToString(res, this));
         }
 
-        let href = window.$gz.api.genericDownloadUrl(
+        const href = window.$gz.api.genericDownloadUrl(
           "export/download/" + res.data
         );
         if (window.open(href, "DownloadExport") == null) {
@@ -58,8 +54,8 @@ export default {
           );
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
-        window.$gz.eventBus.$emit("notify-error", vm.$ay.t("JobFailed"));
+        window.$gz.errorHandler.handleFormError(error, this);
+        window.$gz.eventBus.$emit("notify-error", this.$ay.t("JobFailed"));
       }
     }
   },
diff --git a/ayanova/src/components/extension-tags-control.vue b/ayanova/src/components/extension-tags-control.vue
index 43ebccf8..c4484c7c 100644
--- a/ayanova/src/components/extension-tags-control.vue
+++ b/ayanova/src/components/extension-tags-control.vue
@@ -43,7 +43,7 @@
 <script>
 export default {
   created() {
-    let vm = this;
+    const vm = this;
 
     if (
       vm.dataListSelection.AType != 0 &&
@@ -66,7 +66,7 @@ export default {
       window.open(this.$store.state.helpUrl + "ay-ex-tags", "_blank");
     },
     canDoAction() {
-      let vm = this;
+      const vm = this;
       if (vm.action == "Replace" && !vm.replace) {
         return false;
       }
@@ -76,57 +76,36 @@ export default {
       return false;
     },
     async doAction() {
-      //do the batch action
-      let vm = this;
       let url = "tag-list/";
-      let body = this.dataListSelection;
-      switch (vm.action) {
+      switch (this.action) {
         case "Add":
-          url += `batch-add/${vm.tag}`;
+          url += `batch-add/${this.tag}`;
           break;
         case "Remove":
-          url += `batch-remove/${vm.tag}`;
+          url += `batch-remove/${this.tag}`;
           break;
         case "Replace":
-          url += `batch-replace/${vm.tag}?toTag=${vm.replace}`;
+          url += `batch-replace/${this.tag}?toTag=${this.replace}`;
           break;
       }
 
       try {
-        //call api route
-        let jobId = await window.$gz.api.upsert(url, body);
+        let jobId = await window.$gz.api.upsert(url, this.dataListSelection);
         if (jobId.error) {
-          //throw new Error(jobId.error);
-          throw new Error(window.$gz.errorHandler.errorToString(jobId, vm));
+          throw new Error(window.$gz.errorHandler.errorToString(jobId, this));
         }
-        jobId = jobId.jobId; //it's in a sub key
-        //indicate loading by setting on button
-        vm.jobActive = true;
+        jobId = jobId.jobId;
+        this.jobActive = true;
 
-        /*  /// <summary>
-    /// Job status for opsjobs
-    /// </summary>
-    public enum JobStatus : int
-    {
-        Absent=0,
-        Sleeping = 1,
-        Running = 2,
-        Completed = 3,
-        Failed = 4
-    } */
         let jobStatus = 1;
-        //get status
-
-        while (vm.jobActive == true) {
+        while (this.jobActive == true) {
           await window.$gz.util.sleepAsync(1000);
-          //check if done
           jobStatus = await window.$gz.api.get(
             `job-operations/status/${jobId}`
           );
           if (jobStatus.error) {
-            //throw new Error(jobStatus.error);
             throw new Error(
-              window.$gz.errorHandler.errorToString(jobStatus, vm)
+              window.$gz.errorHandler.errorToString(jobStatus, this)
             );
           }
           jobStatus = jobStatus.data;
@@ -134,36 +113,29 @@ export default {
             throw new Error("Job failed");
           }
           if (jobStatus == 3) {
-            vm.jobActive = false;
+            this.jobActive = false;
           }
         }
-        //Here if it's completed successfully
-        window.$gz.eventBus.$emit("notify-success", vm.$ay.t("JobCompleted"));
+        window.$gz.eventBus.$emit("notify-success", this.$ay.t("JobCompleted"));
       } catch (error) {
-        vm.jobActive = false;
-        window.$gz.errorHandler.handleFormError(error, vm);
-        window.$gz.eventBus.$emit("notify-error", vm.$ay.t("JobFailed"));
+        this.jobActive = false;
+        window.$gz.errorHandler.handleFormError(error, this);
+        window.$gz.eventBus.$emit("notify-error", this.$ay.t("JobFailed"));
       }
     },
     normalize(value) {
       if (!value) {
         return null;
       }
-
       //Must be lowercase per rules
-      //This may be naive when we get international cust omers but for now supporting utf-8 and it appears it's safe to do this with unicode
+      //This may be naive when we get international customers but for now supporting utf-8 and it appears it's safe to do this with unicode
       value = value.toLowerCase();
       //No spaces in tags, replace with dashes
-
       value = value.split(" ").join("-");
       //Remove multiple dash sequences
       value = value.replace(/-+/g, "-");
-
       //Ensure doesn't start or end with a dash
       value = value.replace(/^\-+-\-+$/g, "");
-      // inObj = inObj.Trim("-");
-      //No longer than 255 characters
-      //  inObj = StringUtil.MaxLength(inObj, 255);
       return value;
     },
     normalizeTag(value) {
diff --git a/ayanova/src/components/extensions-control.vue b/ayanova/src/components/extensions-control.vue
index 17b6a62f..ad131d0f 100644
--- a/ayanova/src/components/extensions-control.vue
+++ b/ayanova/src/components/extensions-control.vue
@@ -64,7 +64,6 @@ export default {
     },
     headers: [],
     errorObj: [],
-    //cache display format stuff
     timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
     languageName: window.$gz.locale.getResolvedLanguage(),
     hour12: window.$gz.locale.getHour12()
@@ -79,22 +78,20 @@ export default {
       }`;
     },
     async handleError(jobId) {
-      let vm = this;
-
       if (!jobId || jobId == "00000000-0000-0000-0000-000000000000") {
         throw "Error: extension triggered handleError with empty jobId";
       }
 
       if (jobId == "clear") {
-        vm.errorObj = [];
+        this.errorObj = [];
         return;
       }
 
-      let res = await window.$gz.api.get(`job-operations/logs/${jobId}`);
+      const res = await window.$gz.api.get(`job-operations/logs/${jobId}`);
       if (res.data) {
-        let ret = [];
+        const ret = [];
         for (let i = 0; i < res.data.length; i++) {
-          let o = res.data[i];
+          const o = res.data[i];
           ret.push({
             id: i,
             created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
@@ -111,9 +108,9 @@ export default {
           });
         }
 
-        vm.errorObj = ret;
+        this.errorObj = ret;
       } else {
-        vm.errorObj = [];
+        this.errorObj = [];
       }
     },
     open(dls) {
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index a38bb463..3e2edffd 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -87,7 +87,7 @@ export default {
       }
       this.options = Object.assign(this.options, options);
       this.maxWidth = Math.floor(window.innerWidth * 0.9);
-      let calculatedWidth = Math.floor(window.innerWidth * 0.5);
+      const calculatedWidth = Math.floor(window.innerWidth * 0.5);
       if (calculatedWidth < 290) {
         this.width = 290;
       } else if (calculatedWidth > 800) {
diff --git a/ayanova/src/components/gznotify.vue b/ayanova/src/components/gznotify.vue
index f51471e0..160845e3 100644
--- a/ayanova/src/components/gznotify.vue
+++ b/ayanova/src/components/gznotify.vue
@@ -1,5 +1,4 @@
 <template>
-  <!-- <v-scale-transition> -->
   <v-snackbar
     data-cy="gznotify"
     :value="isVisible"
@@ -19,13 +18,9 @@
       {{ this.$root.$gz.translation.get("More") }}
     </v-btn>
   </v-snackbar>
-  <!-- </v-scale-transition> -->
 </template>
-
 <script>
-/*  XXXeslint-disable    */
 const DEFAULT_NOTIFY_OPTIONS = { type: "info", timeout: 3000 };
-
 export default {
   data: () => ({
     isVisible: false,
@@ -43,16 +38,13 @@ export default {
       if (!options.message) {
         return;
       }
-
       if (!options.type) {
         options.type = DEFAULT_NOTIFY_OPTIONS.type;
       }
       if (!options.timeout) {
         options.timeout = DEFAULT_NOTIFY_OPTIONS.timeout;
       }
-      //add it to the queue
       this.notificationQueue.push(options);
-
       //trigger the notification queue handler if it isn't already in action
       if (!this.processing) {
         this.handleNotifications();
@@ -64,12 +56,10 @@ export default {
       if (this.notificationQueue.length > 0) {
         //Move the next item into the current slot
         this.currentNotification = this.notificationQueue.shift();
-
         //If don't use nextTick then don't get all visible when multiple in sequence
         this.$nextTick(() => {
           this.isVisible = true;
         });
-
         //Show it for the designated time before moving on to the next
         setTimeout(() => {
           this.isVisible = false;
diff --git a/ayanova/src/components/percent-control.vue b/ayanova/src/components/percent-control.vue
index cc0e05a2..278135fa 100644
--- a/ayanova/src/components/percent-control.vue
+++ b/ayanova/src/components/percent-control.vue
@@ -19,7 +19,6 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 //### NOTE: THIS IS A DUPLICATE OF CURRENCYCONTROL AND THE ONLY DIFFERENCE IS THE "currency:" VALUE IS SET TO NULL IN THE TEMPLATE AND IN THE updateValue METHOD
 //https://dm4t2.github.io/vue-currency-input/guide/#introduction :value="formattedValue"
 //https://codesandbox.io/s/vue-template-kd7d1?fontsize=14&module=%2Fsrc%2FApp.vue
@@ -48,8 +47,8 @@ export default {
   },
   methods: {
     updateValue() {
-      let val = this.$refs.textField.$refs.input.value;
-      let parsedValue = parseCurrency(val, {
+      const val = this.$refs.textField.$refs.input.value;
+      const parsedValue = parseCurrency(val, {
         currency: null,
         locale: this.languageName
       });
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 1450d3cf..1200afbf 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -39,10 +39,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.fetchValueIfNotPresent();
@@ -113,24 +109,21 @@ export default {
       this.fetchValueIfNotPresent();
     },
     searchEntry(val, oldVal) {
-      let vm = this;
-      //clear any local entryError
-      vm.clearErrors();
+      this.clearErrors();
       //if the search entry is in the results list then it's a drop down selection not a typed search so bail
-      for (let i = 0; i < vm.searchResults.length; i++) {
-        if (vm.searchResults[i].name == val) {
+      for (let i = 0; i < this.searchResults.length; i++) {
+        if (this.searchResults[i].name == val) {
           return;
         }
       }
-      if (!val || vm.fetching || !vm.initialized) {
-        if (!vm.initialized) {
-          vm.$nextTick(() => {
-            vm.initialized = true;
+      if (!val || this.fetching || !this.initialized) {
+        if (!this.initialized) {
+          this.$nextTick(() => {
+            this.initialized = true;
           });
         }
         return;
       }
-
       this.doSearch(val);
     },
     entryError(val) {
@@ -183,9 +176,7 @@ export default {
         //simulate empty selection:
         e = window.$gz.form.getNoSelectionItem(true);
       }
-
       this.lastSelection = e;
-
       //this is required for the control to update and parent form to detect it
       this.$emit("input", e.id);
       //this is sometimes required for forms that need more than the ID (contract etc)
@@ -194,63 +185,55 @@ export default {
     },
     fetchValueIfNotPresent() {
       //is there a value that might require fetching?
-
-      let vm = this;
-      let val = vm.value;
+      const val = this.value;
       if (val == null) {
         return;
       }
       //check if it's in the list of items we have here
-      for (let i = 0; i < vm.searchResults.length; i++) {
-        if (vm.searchResults[i].id == val) {
+      for (let i = 0; i < this.searchResults.length; i++) {
+        if (this.searchResults[i].id == val) {
           return;
         }
       }
       //is it the no selection item?
       if (val == null) {
-        window.$gz.form.addNoSelectionItem(vm.searchResults, true);
+        window.$gz.form.addNoSelectionItem(this.searchResults, true);
       } else {
-        //Not here, better get it
-        let pickListParams = {
-          ayaType: vm.ayaType,
-          preselectedIds: [vm.value]
+        const pickListParams = {
+          ayaType: this.ayaType,
+          preselectedIds: [this.value]
         };
-
-        if (vm.variant != null) {
-          pickListParams["listVariant"] = vm.variant;
+        if (this.variant != null) {
+          pickListParams["listVariant"] = this.variant;
         }
-
-        if (vm.template != null) {
-          pickListParams["template"] = vm.template;
+        if (this.template != null) {
+          pickListParams["template"] = this.template;
         }
-
-        vm.getList(pickListParams);
+        this.getList(pickListParams);
       }
     },
     replaceLastSelection() {
-      let vm = this;
       //check if searchResults has last selection, if not then add it back in again
-      if (vm.lastSelection == null) {
+      if (this.lastSelection == null) {
         //it might be initializing
-        for (let i = 0; i < vm.searchResults.length; i++) {
-          if (vm.searchResults[i].id == vm.value) {
-            vm.lastSelection = vm.searchResults[i];
+        for (let i = 0; i < this.searchResults.length; i++) {
+          if (this.searchResults[i].id == this.value) {
+            this.lastSelection = this.searchResults[i];
             return;
           }
         }
         return;
       }
-
-      for (let i = 0; i < vm.searchResults.length; i++) {
-        if (vm.searchResults[i].id == vm.lastSelection.id) {
+      for (let i = 0; i < this.searchResults.length; i++) {
+        if (this.searchResults[i].id == this.lastSelection.id) {
           return; //already there
         }
       }
       //Not there so insert it
-      vm.searchResults.push(vm.lastSelection);
+      this.searchResults.push(this.lastSelection);
     },
     dropdown(e) {
-      let vm = this;
+      const vm = this;
       //check if we have only the initial loaded item and no selection item
       if (vm.searchResults.length < 3) {
         //get the default list
@@ -272,72 +255,48 @@ export default {
         //need to do a case insensitive filter and hopefully it mirrors postgres at the backend
         return item.name.toLowerCase().indexOf(queryText.toLowerCase()) > -1;
       }
-
-      //split out just the text search part
-      // let searchText = queryText;
-      //   if (queryText.includes(" ")) {
-      //     //get the non tag part of query if possible
-      //     //ignore bad condition of too many terms
-      //     let searchTerms = queryText.split(" ");
-      //     if (searchTerms[0].includes("..")) {
-      //       searchText = searchTerms[1];
-      //     } else {
-      //       searchText = searchTerms[0];
-      //     }
-      //   }
     },
     getList: async function(pickListParams) {
-      /*         
-        public AyaType AyaType { get; set; }
-        public string Query { get; set; }
-        public bool Inactive { get; set; }
-        public List<long> PreselectedIds { get; set; }
-        public string ListVariant { get; set; }        
-        //"{\"ayaType\":8,\"preselectedIds\":[1,3,5,7]}"
-    }
-
-          */
-      let vm = this;
-      if (vm.fetching) {
+      if (this.fetching) {
         return;
       }
-      vm.fetching = true;
+      this.fetching = true;
       //default params for when called on init
       if (!pickListParams) {
         pickListParams = {
-          ayaType: vm.ayaType
+          ayaType: this.ayaType
         };
-
-        if (vm.value != null) {
-          pickListParams["preselectedIds"] = [vm.value];
+        if (this.value != null) {
+          pickListParams["preselectedIds"] = [this.value];
         }
-
-        if (vm.includeInactive) {
+        if (this.includeInactive) {
           pickListParams["inactive"] = true;
         }
-        if (vm.variant != null) {
-          pickListParams["listVariant"] = vm.variant;
+        if (this.variant != null) {
+          pickListParams["listVariant"] = this.variant;
         }
-        if (vm.template != null) {
-          pickListParams["template"] = vm.template;
+        if (this.template != null) {
+          pickListParams["template"] = this.template;
         }
       }
       try {
-        let res = await window.$gz.api.upsert("pick-list/list", pickListParams);
+        const res = await window.$gz.api.upsert(
+          "pick-list/list",
+          pickListParams
+        );
 
-        vm.fetching = false;
-        //We never expect there to be no data here
+        this.fetching = false;
         if (!res.hasOwnProperty("data")) {
           return Promise.reject(res);
         }
-        vm.searchResults = res.data;
-        if (vm.allowNoSelection) {
-          window.$gz.form.addNoSelectionItem(vm.searchResults, true);
+        this.searchResults = res.data;
+        if (this.allowNoSelection) {
+          window.$gz.form.addNoSelectionItem(this.searchResults, true);
         }
-        vm.replaceLastSelection();
+        this.replaceLastSelection();
       } catch (err) {
         window.$gz.errorHandler.handleFormError(err);
-        vm.fetching = false;
+        this.fetching = false;
       }
     },
     doSearch: debounce(function(searchFor) {
@@ -345,7 +304,7 @@ export default {
       //https://vuejs.org/v2/guide/migration.html#debounce-Param-Attribute-for-v-model-removed
       //-----------------
 
-      let vm = this;
+      const vm = this;
       let isATwoTermQuery = false;
       let queryTerms = [];
       //NOTE: empty query is valid; it means get the top 100 ordered by template order
@@ -354,9 +313,7 @@ export default {
         emptyQuery = true;
       } else {
         //Pre-process the query to validate and send conditionally
-
         //get the discrete search terms and verify there are max two
-
         if (searchFor.includes(" ")) {
           queryTerms = searchFor.split(" ");
           if (queryTerms.length > 2) {
@@ -412,20 +369,17 @@ export default {
       }
 
       //build parameter
-      let pickListParams = { ayaType: vm.ayaType };
-      //let urlParams = "?ayaType=" + vm.ayaType;
+      const pickListParams = { ayaType: vm.ayaType };
       if (!emptyQuery) {
         let query = queryTerms[0];
         if (queryTerms[1] != "[?]") {
           query += " " + queryTerms[1];
         }
-        //urlParams += "&query=" + query;
         pickListParams["query"] = query;
       }
 
       if (vm.includeInactive) {
         pickListParams["inactive"] = true;
-        //urlParams += "&inactive=true";
       }
       if (vm.variant != null) {
         pickListParams["listVariant"] = vm.variant;
diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index 62f33d39..9c5fa6d9 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -461,10 +461,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 import GzWoAddress from "./work-order-address.vue";
 import GZDaysOfWeek from "./days-of-week-control.vue";
 export default {
diff --git a/ayanova/src/components/pm-item-expenses.vue b/ayanova/src/components/pm-item-expenses.vue
index 8d702dcb..1d38d3d2 100644
--- a/ayanova/src/components/pm-item-expenses.vue
+++ b/ayanova/src/components/pm-item-expenses.vue
@@ -437,10 +437,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -506,7 +502,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
 
       //#################################### IMPORTANT ##################################################
       //NOTE: default values are critical and must match server validation ExpenseValidateAsync for restricted users
@@ -532,7 +528,7 @@ export default {
         chargeToCustomer: false,
         isDirty: true,
         pmItemId: this.value.items[this.activeWoItemIndex].id,
-        uid: Date.now() //used for error tracking / display
+        uid: Date.now()
       });
       this.$emit("change");
       this.selectedRow = [{ index: newIndex }];
@@ -586,11 +582,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -637,7 +628,7 @@ export default {
   If the column is a text, left-align it
   If the column is a number or number + unit, (or date) right-align it (like excel)
   */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemExpenseName")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-labors.vue b/ayanova/src/components/pm-item-labors.vue
index d74bbefa..0f349386 100644
--- a/ayanova/src/components/pm-item-labors.vue
+++ b/ayanova/src/components/pm-item-labors.vue
@@ -439,10 +439,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -526,7 +522,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].labors.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].labors.length;
 
       this.value.items[this.activeWoItemIndex].labors.push({
         id: 0,
@@ -702,7 +698,6 @@ export default {
       }
       return ret;
     }
-    //---
   },
   computed: {
     isDeleted: function() {
@@ -723,11 +718,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLaborServiceStartDate")) {
         headers.push({
@@ -992,7 +983,6 @@ export default {
     canDeleteAll: function() {
       return this.pvm.rights.change && !this.value.userIsRestrictedType;
     }
-    //----
   }
 };
 </script>
diff --git a/ayanova/src/components/pm-item-loans.vue b/ayanova/src/components/pm-item-loans.vue
index 30f0ff8a..055e7b49 100644
--- a/ayanova/src/components/pm-item-loans.vue
+++ b/ayanova/src/components/pm-item-loans.vue
@@ -409,10 +409,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -484,7 +480,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].loans.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].loans.length;
 
       this.value.items[this.activeWoItemIndex].loans.push({
         id: 0,
@@ -606,11 +602,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLoanUnit")) {
         headers.push({
@@ -878,8 +870,6 @@ export default {
     canDeleteAll: function() {
       return this.pvm.rights.change && !this.value.userIsRestrictedType;
     }
-
-    //----
   }
 };
 </script>
diff --git a/ayanova/src/components/pm-item-outside-services.vue b/ayanova/src/components/pm-item-outside-services.vue
index efbfc3e4..8107c70b 100644
--- a/ayanova/src/components/pm-item-outside-services.vue
+++ b/ayanova/src/components/pm-item-outside-services.vue
@@ -591,10 +591,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -669,7 +665,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].outsideServices
+      const newIndex = this.value.items[this.activeWoItemIndex].outsideServices
         .length;
 
       this.value.items[this.activeWoItemIndex].outsideServices.push({
@@ -801,11 +797,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemOutsideServiceUnit")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-parts.vue b/ayanova/src/components/pm-item-parts.vue
index c0edf690..18111f12 100644
--- a/ayanova/src/components/pm-item-parts.vue
+++ b/ayanova/src/components/pm-item-parts.vue
@@ -465,10 +465,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -561,7 +557,7 @@ export default {
       if (!partId || partId == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`part/serials/${partId}`);
+      const res = await window.$gz.api.get(`part/serials/${partId}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -598,7 +594,7 @@ export default {
       this.$emit("change");
     },
     async addPartAssembly() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `part-assembly/${this.selectedPartAssembly}`
       );
       if (res.data && res.data.items) {
@@ -713,7 +709,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].parts.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].parts.length;
 
       this.value.items[this.activeWoItemIndex].parts.push({
         id: 0,
@@ -861,11 +857,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemPartPartID")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-scheduled-users.vue b/ayanova/src/components/pm-item-scheduled-users.vue
index fc599de1..a8555a98 100644
--- a/ayanova/src/components/pm-item-scheduled-users.vue
+++ b/ayanova/src/components/pm-item-scheduled-users.vue
@@ -303,10 +303,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -407,7 +403,7 @@ export default {
       ].serviceRateViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
+      const newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
         .length;
 
       this.value.items[this.activeWoItemIndex].scheduledUsers.push({
@@ -600,11 +596,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemScheduledUserStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-tasks.vue b/ayanova/src/components/pm-item-tasks.vue
index ea6ec15d..394b9ebd 100644
--- a/ayanova/src/components/pm-item-tasks.vue
+++ b/ayanova/src/components/pm-item-tasks.vue
@@ -311,10 +311,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -371,7 +367,7 @@ export default {
   },
   methods: {
     async addTaskGroup() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `task-group/${this.selectedTaskGroup}`
       );
       if (res.data && res.data.items) {
@@ -391,7 +387,7 @@ export default {
         }
 
         let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
-        let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
+        const incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
           s => s.id == 1 //incomplete
         ).name;
         res.data.items.forEach(z => {
@@ -443,7 +439,7 @@ export default {
       }
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
       this.value.items[this.activeWoItemIndex].tasks.push({
         id: 0,
         concurrency: 0,
@@ -557,11 +553,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTaskSequence")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-travels.vue b/ayanova/src/components/pm-item-travels.vue
index 84f518fc..b8dd0567 100644
--- a/ayanova/src/components/pm-item-travels.vue
+++ b/ayanova/src/components/pm-item-travels.vue
@@ -470,10 +470,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -543,7 +539,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].travels.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].travels.length;
 
       this.value.items[this.activeWoItemIndex].travels.push({
         id: 0,
@@ -741,11 +737,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTravelStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/pm-item-units.vue b/ayanova/src/components/pm-item-units.vue
index ce3b554d..07d428c4 100644
--- a/ayanova/src/components/pm-item-units.vue
+++ b/ayanova/src/components/pm-item-units.vue
@@ -338,10 +338,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -412,7 +408,7 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/active-contract/${id}`);
+      const res = await window.$gz.api.get(`unit/active-contract/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -434,7 +430,7 @@ export default {
           .t("ApplyUnitContract")
           .replace("{0}", res.data.name);
 
-        let dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
+        const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
           prompt,
           "question"
         );
@@ -457,27 +453,13 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
+      const res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
           window.$gz.errorHandler.errorToString(res, this)
         );
       } else {
-        /* {
-  "recentWorkOrders":[{"serial":10,"id":10,"serviceDate":"2021-01-19T22:00:00Z"},{"serial":8,"id":8,"serviceDate":"2021-04-08T22:00:00Z"},{"serial":7,"id":7,"serviceDate":"2021-04-18T20:00:00Z"}],
-  "purchaseDate":"2019-03-12T09:37:52.930923Z",
-  "purchasedFromVendor":null,
-  "purchaseFromVendorId":null,
-  "purchaseReceiptNumber":"139736",
-  "lifeTimeWarranty":false,
-  "warrantyExpiryDate":"2019-04-12T09:37:52.930923Z",
-  "warrantyTerms":"Shipping parts and service"} 
-  
-  "UnitPurchasedDate": "Purchased Date",
-  "UnitPurchaseFromID": "Purchased From",
-  "UnitReceipt": "Receipt Number",
-  */
         const r = res.data;
 
         let WarrantyInfo = `${this.$ay.t("Warranty")}: `;
@@ -511,7 +493,7 @@ export default {
             this.pvm.hour12
           );
         }
-        let PurchaseInfo = `${this.$ay.t(
+        const PurchaseInfo = `${this.$ay.t(
           "UnitPurchaseFromID"
         )}: ${PurchasedFrom}<br/>${this.$ay.t(
           "UnitPurchasedDate"
@@ -536,11 +518,11 @@ export default {
           RecentWorkOrderList = "-";
         }
 
-        let RecentWorkOrderInfo = `${this.$ay.t(
+        const RecentWorkOrderInfo = `${this.$ay.t(
           "RecentWorkOrders"
         )}:${RecentWorkOrderList}`;
 
-        let d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
+        const d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
 
         this.value.items[this.activeWoItemIndex].units[
           this.activeItemIndex
@@ -561,7 +543,7 @@ export default {
       this.selectedBulkUnits.splice(0);
       this.availableBulkUnits.splice(0);
 
-      let res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
+      const res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
         tags: this.selectedBulkUnitTags,
         restrictToCustomerId: this.selectedBulkUnitCustomer
       });
@@ -610,21 +592,7 @@ export default {
       await this.updateContractIfApplicable();
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].units.length;
-      // {
-      // 	"0": {
-      // 		"id": 53,
-      // 		"concurrency": 9586762,
-      // 		"notes": "Aut modi molestias molestiae ipsa id.",
-      // 		"wiki": null,
-      // 		"customFields": null,
-      // 		"tags": [],
-      // 		"unitId": 4,
-      // 		"unitViz": "83429560",
-      // 		"pmItemId": 22
-      // 	}
-      // }
-
+      const newIndex = this.value.items[this.activeWoItemIndex].units.length;
       this.value.items[this.activeWoItemIndex].units.push({
         id: 0,
         concurrency: 0,
@@ -699,11 +667,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -745,11 +708,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemUnit")) {
         headers.push({
diff --git a/ayanova/src/components/pm-items.vue b/ayanova/src/components/pm-items.vue
index 91f8a788..f9987fa1 100644
--- a/ayanova/src/components/pm-items.vue
+++ b/ayanova/src/components/pm-items.vue
@@ -1,7 +1,6 @@
 <template>
   <div v-if="value != null" class="mt-8">
     <v-row>
-      <!-- Title and menu -->
       <v-col cols="12">
         <v-menu offset-y max-width="600px">
           <template v-slot:activator="{ on, attrs }">
@@ -613,10 +612,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 import GzPMItemUnits from "../components/pm-item-units.vue";
 import GzPMItemScheduledUsers from "../components/pm-item-scheduled-users.vue";
 import GzPMItemLabors from "../components/pm-item-labors.vue";
@@ -674,7 +669,7 @@ export default {
   watch: {
     goto(val, oldVal) {
       if (val != oldVal) {
-        let navto = { woitemindex: null, childindex: null };
+        const navto = { woitemindex: null, childindex: null };
         //find the item in question then trigger the nav
         let keepgoing = true;
         this.value.items.forEach((z, itemindex) => {
@@ -822,7 +817,7 @@ export default {
   },
   methods: {
     newItem() {
-      let newIndex = this.value.items.length;
+      const newIndex = this.value.items.length;
 
       this.value.items.push({
         id: 0,
@@ -861,7 +856,7 @@ export default {
     },
     newSubItem(atype) {
       //new Id value to use (by convention goto negative will trigger create and then goto instead of simple goto)
-      let newId = -Math.abs(Date.now());
+      const newId = -Math.abs(Date.now());
       switch (atype) {
         case window.$gz.type.WorkOrderItemOutsideService:
           this.gotoOutsideServiceIndex = newId;
@@ -968,7 +963,7 @@ export default {
       return this.value.items[this.activeItemIndex].deleted === true;
     },
     headerList: function() {
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemSequence")) {
         headers.push({
diff --git a/ayanova/src/components/quote-header.vue b/ayanova/src/components/quote-header.vue
index f90b55dd..2218caf4 100644
--- a/ayanova/src/components/quote-header.vue
+++ b/ayanova/src/components/quote-header.vue
@@ -473,9 +473,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 import GzQuoteState from "./quote-state.vue";
 import GzWoAddress from "./work-order-address.vue";
 export default {
diff --git a/ayanova/src/components/quote-item-expenses.vue b/ayanova/src/components/quote-item-expenses.vue
index e8c970f2..ed036eef 100644
--- a/ayanova/src/components/quote-item-expenses.vue
+++ b/ayanova/src/components/quote-item-expenses.vue
@@ -437,10 +437,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -506,7 +502,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
 
       //#################################### IMPORTANT ##################################################
       //NOTE: default values are critical and must match server validation ExpenseValidateAsync for restricted users
@@ -586,11 +582,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -633,11 +624,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemExpenseName")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-labors.vue b/ayanova/src/components/quote-item-labors.vue
index 4bd82c81..4bc3fcd0 100644
--- a/ayanova/src/components/quote-item-labors.vue
+++ b/ayanova/src/components/quote-item-labors.vue
@@ -439,10 +439,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -526,7 +522,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].labors.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].labors.length;
 
       this.value.items[this.activeWoItemIndex].labors.push({
         id: 0,
@@ -723,11 +719,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLaborServiceStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-loans.vue b/ayanova/src/components/quote-item-loans.vue
index 3c335913..240eef85 100644
--- a/ayanova/src/components/quote-item-loans.vue
+++ b/ayanova/src/components/quote-item-loans.vue
@@ -409,10 +409,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -484,7 +480,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].loans.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].loans.length;
 
       this.value.items[this.activeWoItemIndex].loans.push({
         id: 0,
@@ -606,11 +602,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLoanUnit")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-outside-services.vue b/ayanova/src/components/quote-item-outside-services.vue
index f5e5c3fc..70241b34 100644
--- a/ayanova/src/components/quote-item-outside-services.vue
+++ b/ayanova/src/components/quote-item-outside-services.vue
@@ -591,10 +591,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -669,7 +665,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].outsideServices
+      const newIndex = this.value.items[this.activeWoItemIndex].outsideServices
         .length;
 
       this.value.items[this.activeWoItemIndex].outsideServices.push({
@@ -801,11 +797,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemOutsideServiceUnit")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-parts.vue b/ayanova/src/components/quote-item-parts.vue
index 72ba30c1..2b1800cf 100644
--- a/ayanova/src/components/quote-item-parts.vue
+++ b/ayanova/src/components/quote-item-parts.vue
@@ -465,10 +465,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -561,7 +557,7 @@ export default {
       if (!partId || partId == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`part/serials/${partId}`);
+      const res = await window.$gz.api.get(`part/serials/${partId}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -598,7 +594,7 @@ export default {
       this.$emit("change");
     },
     async addPartAssembly() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `part-assembly/${this.selectedPartAssembly}`
       );
       if (res.data && res.data.items) {
@@ -713,7 +709,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].parts.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].parts.length;
 
       this.value.items[this.activeWoItemIndex].parts.push({
         id: 0,
@@ -861,11 +857,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemPartPartID")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-scheduled-users.vue b/ayanova/src/components/quote-item-scheduled-users.vue
index b64f9d15..db77c129 100644
--- a/ayanova/src/components/quote-item-scheduled-users.vue
+++ b/ayanova/src/components/quote-item-scheduled-users.vue
@@ -303,10 +303,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -407,7 +403,7 @@ export default {
       ].serviceRateViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
+      const newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
         .length;
 
       this.value.items[this.activeWoItemIndex].scheduledUsers.push({
@@ -600,11 +596,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemScheduledUserStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-tasks.vue b/ayanova/src/components/quote-item-tasks.vue
index 46806eb6..635e6439 100644
--- a/ayanova/src/components/quote-item-tasks.vue
+++ b/ayanova/src/components/quote-item-tasks.vue
@@ -311,10 +311,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -371,7 +367,7 @@ export default {
   },
   methods: {
     async addTaskGroup() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `task-group/${this.selectedTaskGroup}`
       );
       if (res.data && res.data.items) {
@@ -390,7 +386,7 @@ export default {
           this.value.items[this.activeWoItemIndex].tasks.splice(0, 1);
         }
         let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
-        let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
+        const incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
           s => s.id == 1 //incomplete
         ).name;
         res.data.items.forEach(z => {
@@ -442,7 +438,7 @@ export default {
       }
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
       this.value.items[this.activeWoItemIndex].tasks.push({
         id: 0,
         concurrency: 0,
@@ -556,11 +552,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTaskSequence")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-travels.vue b/ayanova/src/components/quote-item-travels.vue
index 296298aa..08205998 100644
--- a/ayanova/src/components/quote-item-travels.vue
+++ b/ayanova/src/components/quote-item-travels.vue
@@ -470,10 +470,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -543,7 +539,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].travels.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].travels.length;
 
       this.value.items[this.activeWoItemIndex].travels.push({
         id: 0,
@@ -741,11 +737,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTravelStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/quote-item-units.vue b/ayanova/src/components/quote-item-units.vue
index 6b02f995..a7b9345f 100644
--- a/ayanova/src/components/quote-item-units.vue
+++ b/ayanova/src/components/quote-item-units.vue
@@ -338,10 +338,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -412,7 +408,7 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/active-contract/${id}`);
+      const res = await window.$gz.api.get(`unit/active-contract/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -434,7 +430,7 @@ export default {
           .t("ApplyUnitContract")
           .replace("{0}", res.data.name);
 
-        let dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
+        const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
           prompt,
           "question"
         );
@@ -457,27 +453,13 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
+      const res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
           window.$gz.errorHandler.errorToString(res, this)
         );
       } else {
-        /* {
-  "recentWorkOrders":[{"serial":10,"id":10,"serviceDate":"2021-01-19T22:00:00Z"},{"serial":8,"id":8,"serviceDate":"2021-04-08T22:00:00Z"},{"serial":7,"id":7,"serviceDate":"2021-04-18T20:00:00Z"}],
-  "purchaseDate":"2019-03-12T09:37:52.930923Z",
-  "purchasedFromVendor":null,
-  "purchaseFromVendorId":null,
-  "purchaseReceiptNumber":"139736",
-  "lifeTimeWarranty":false,
-  "warrantyExpiryDate":"2019-04-12T09:37:52.930923Z",
-  "warrantyTerms":"Shipping parts and service"} 
-  
-  "UnitPurchasedDate": "Purchased Date",
-  "UnitPurchaseFromID": "Purchased From",
-  "UnitReceipt": "Receipt Number",
-  */
         const r = res.data;
 
         let WarrantyInfo = `${this.$ay.t("Warranty")}: `;
@@ -511,7 +493,7 @@ export default {
             this.pvm.hour12
           );
         }
-        let PurchaseInfo = `${this.$ay.t(
+        const PurchaseInfo = `${this.$ay.t(
           "UnitPurchaseFromID"
         )}: ${PurchasedFrom}<br/>${this.$ay.t(
           "UnitPurchasedDate"
@@ -536,11 +518,11 @@ export default {
           RecentWorkOrderList = "-";
         }
 
-        let RecentWorkOrderInfo = `${this.$ay.t(
+        const RecentWorkOrderInfo = `${this.$ay.t(
           "RecentWorkOrders"
         )}:${RecentWorkOrderList}`;
 
-        let d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
+        const d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
 
         this.value.items[this.activeWoItemIndex].units[
           this.activeItemIndex
@@ -561,7 +543,7 @@ export default {
       this.selectedBulkUnits.splice(0);
       this.availableBulkUnits.splice(0);
 
-      let res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
+      const res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
         tags: this.selectedBulkUnitTags,
         restrictToCustomerId: this.selectedBulkUnitCustomer
       });
@@ -610,20 +592,7 @@ export default {
       await this.updateContractIfApplicable();
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].units.length;
-      // {
-      // 	"0": {
-      // 		"id": 53,
-      // 		"concurrency": 9586762,
-      // 		"notes": "Aut modi molestias molestiae ipsa id.",
-      // 		"wiki": null,
-      // 		"customFields": null,
-      // 		"tags": [],
-      // 		"unitId": 4,
-      // 		"unitViz": "83429560",
-      // 		"quoteItemId": 22
-      // 	}
-      // }
+      const newIndex = this.value.items[this.activeWoItemIndex].units.length;
 
       this.value.items[this.activeWoItemIndex].units.push({
         id: 0,
@@ -699,11 +668,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -745,11 +709,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemUnit")) {
         headers.push({
diff --git a/ayanova/src/components/quote-items.vue b/ayanova/src/components/quote-items.vue
index 706da49f..9b85e0a7 100644
--- a/ayanova/src/components/quote-items.vue
+++ b/ayanova/src/components/quote-items.vue
@@ -613,10 +613,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 import GzQuoteItemUnits from "../components/quote-item-units.vue";
 import GzQuoteItemScheduledUsers from "../components/quote-item-scheduled-users.vue";
 import GzQuoteItemLabors from "../components/quote-item-labors.vue";
@@ -674,7 +670,7 @@ export default {
   watch: {
     goto(val, oldVal) {
       if (val != oldVal) {
-        let navto = { woitemindex: null, childindex: null };
+        const navto = { woitemindex: null, childindex: null };
         //find the item in question then trigger the nav
         let keepgoing = true;
         this.value.items.forEach((z, itemindex) => {
@@ -822,7 +818,7 @@ export default {
   },
   methods: {
     newItem() {
-      let newIndex = this.value.items.length;
+      const newIndex = this.value.items.length;
 
       this.value.items.push({
         id: 0,
@@ -861,7 +857,7 @@ export default {
     },
     newSubItem(atype) {
       //new Id value to use (by convention goto negative will trigger create and then goto instead of simple goto)
-      let newId = -Math.abs(Date.now());
+      const newId = -Math.abs(Date.now());
       switch (atype) {
         case window.$gz.type.WorkOrderItemOutsideService:
           this.gotoOutsideServiceIndex = newId;
@@ -968,7 +964,7 @@ export default {
       return this.value.items[this.activeItemIndex].deleted === true;
     },
     headerList: function() {
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemSequence")) {
         headers.push({
diff --git a/ayanova/src/components/quote-state.vue b/ayanova/src/components/quote-state.vue
index b65e0a7a..1adaa287 100644
--- a/ayanova/src/components/quote-state.vue
+++ b/ayanova/src/components/quote-state.vue
@@ -136,10 +136,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   data() {
     return {
@@ -197,7 +193,7 @@ export default {
       }
     },
     getStateForDisplay(state) {
-      let ret = {
+      const ret = {
         id: Date.now,
         name: "??",
         color: "#ffffff",
@@ -259,7 +255,7 @@ export default {
       return this.value.states != null && this.value.states.length > 0;
     },
     stateDisplayList() {
-      let ret = [];
+      const ret = [];
       this.value.states.forEach(z => {
         ret.push(this.getStateForDisplay(z));
       });
@@ -281,7 +277,7 @@ export default {
 
       //ok, only thing left to check is if the current user can unlock this
       //get remove roles required for current state
-      let cs = this.pvm.currentState;
+      const cs = this.pvm.currentState;
       if (cs.removeRoles == null || cs.removeRoles == 0) {
         //no state set yet
         return true;
diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue
index 416727f0..f9030d75 100644
--- a/ayanova/src/components/report-selector-control.vue
+++ b/ayanova/src/components/report-selector-control.vue
@@ -88,27 +88,28 @@ export default {
       });
     },
     async renderReport(reportId, reportName) {
-      let vm = this;
-      if (vm.$route.params.recordid == 0) {
+      if (this.$route.params.recordid == 0) {
         return;
       }
 
-      let reportDataOptions = vm.reportDataOptions;
+      const reportDataOptions = this.reportDataOptions;
       if (!reportDataOptions) {
         this.reject("Missing report data unable to render report");
       }
       reportDataOptions.ReportId = reportId;
       //Meta data from client for use by report script
       reportDataOptions.ClientMeta = window.$gz.api.reportClientMetaData();
-      vm.rendering = true;
-      let url = "report/render";
+      this.rendering = true;
 
-      let res = await window.$gz.api.upsert(url, reportDataOptions);
-      vm.rendering = false;
+      const res = await window.$gz.api.upsert(
+        "report/render",
+        reportDataOptions
+      );
+      this.rendering = false;
       if (res.error) {
         this.reject(res);
       } else {
-        let reportUrl = window.$gz.api.reportDownloadUrl(res.data);
+        const reportUrl = window.$gz.api.reportDownloadUrl(res.data);
         if (window.open(reportUrl, "Report") == null) {
           this.reject(
             "Problem displaying report in new window.  Browser must allow pop-ups to view reports; check your browser setting"
@@ -123,7 +124,7 @@ export default {
       }
     },
     async open(reportDataOptions, preSelectReportId) {
-      let vm = this;
+      const vm = this;
       if (reportDataOptions == null) {
         throw new Error("report-selector:Open missing reportDataOptions");
       }
@@ -135,7 +136,7 @@ export default {
       this.preSelectReportId = preSelectReportId;
       if (!preSelectReportId) {
         //get report list from server
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           `report/list/${reportDataOptions.AType}`
         );
         if (res.error) {
diff --git a/ayanova/src/components/role-control.vue b/ayanova/src/components/role-control.vue
index 4262b6df..b6744576 100644
--- a/ayanova/src/components/role-control.vue
+++ b/ayanova/src/components/role-control.vue
@@ -17,11 +17,10 @@
   ></v-select>
 </template>
 <script>
-/*  Xeslint-disable */
 export default {
   async created() {
     await window.$gz.enums.fetchEnumList("AuthorizationRoles");
-    let rawRoles = window.$gz.enums.getSelectionList("AuthorizationRoles");
+    const rawRoles = window.$gz.enums.getSelectionList("AuthorizationRoles");
     if (this.limitSelectionTo == null) {
       this.availableRoles = rawRoles;
     } else {
@@ -55,10 +54,10 @@ export default {
   },
   computed: {
     selectedValue() {
-      let ret = [];
+      const ret = [];
       if (this.value != null && this.value != 0) {
         for (let i = 0; i < this.availableRoles.length; i++) {
-          let role = this.availableRoles[i];
+          const role = this.availableRoles[i];
           if (!!(this.value & role.id)) {
             ret.push(role.id);
           }
@@ -72,7 +71,7 @@ export default {
       let newValue = 0;
       if (value != null && value != [] && value.length > 0) {
         for (let i = 0; i < value.length; i++) {
-          let role = value[i];
+          const role = value[i];
           newValue = newValue | role;
         }
       }
diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue
index 9a6f042d..b7594226 100644
--- a/ayanova/src/components/tag-picker.vue
+++ b/ayanova/src/components/tag-picker.vue
@@ -32,26 +32,10 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  eslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
-  //this was the original code that was working for months, even years then suddenly stopped working after a vue update
-  // beforeUpdate() {
-  //    console.log("TAG-PICKER: beforeupdate called");
-  //   //Set the initial list items based on the record items, this only needs to be called once at init
-  //   if (!this.initialized && this.value != null && this.value.length > 0) {
-  //     console.log("TAG-PICKER: beforeupdate init in if statement");
-  //     this.sourcetags = this.value;
-  //     this.initialized = true;
-  //   }
-  // },
   created() {
-    
     //Set the initial list items based on the record items, this only needs to be called once at init
     if (!this.initialized && this.value != null && this.value.length > 0) {
-      
       this.sourcetags = this.value;
       this.initialized = true;
     }
@@ -66,25 +50,29 @@ export default {
   },
   props: {
     value: {
-      default: [],
+      default() {
+        return [];
+      },
       type: Array
     },
-    // value: Array,
-    label: String,
+    label: {
+      type: String,
+      default() {
+        return null;
+      }
+    },
     readonly: { type: Boolean, default: false },
     rules: { type: Array, default: undefined },
     errorMessages: { type: Array, default: null }
   },
   watch: {
     async tagSearchEntry(val) {
-      let vm = this;
-      if (!val || vm.tagSearchUnderway) {
+      if (!val || this.tagSearchUnderway) {
         return;
       }
-      vm.tagSearchUnderway = true;
+      this.tagSearchUnderway = true;
       try {
-        let res = await window.$gz.api.get("tag-list/list?query=" + val); //roles
-
+        const res = await window.$gz.api.get("tag-list/list?query=" + val);
         //We never expect there to be no data here
         if (!res.hasOwnProperty("data")) {
           throw new Error(res);
@@ -92,8 +80,8 @@ export default {
         //adding this to the property will automatically have it cached by the autocomplete component
         //as cache-items has been set so this just needs to be set here once and all is well in future
         //Any search will be kept for later so this is very efficient
-        vm.sourcetags = res.data;
-        vm.tagSearchUnderway = false;
+        this.sourcetags = res.data;
+        this.tagSearchUnderway = false;
       } catch (err) {
         window.$gz.errorHandler.handleFormError(err);
       }
@@ -112,8 +100,8 @@ export default {
       if (this.tagSearchEntry == null || this.tagSearchEntry == "") {
         return false;
       }
-      let searchTag = this.normalizeTag(this.tagSearchEntry);
-      if (this.value.some((z) => z == searchTag)) return false;
+      const searchTag = this.normalizeTag(this.tagSearchEntry);
+      if (this.value.some(z => z == searchTag)) return false;
       return true;
     },
     input(e) {
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index 8ca8ec74..a2c61f4e 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -57,17 +57,14 @@
   </div>
 </template>
 <script>
-/*  Xeslint-disable */
 //NOTE: this control also captures the date even though it's time only
 //this is an intentional design decision to support field change to date or date AND time and is considered a display issue
 export default {
   data: () => ({
     dlgtime: false,
-    //cache display format stuff
     timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
     languageName: window.$gz.locale.getResolvedLanguage(),
     hour12: window.$gz.locale.getHour12()
-    // defaultLocale: window.$gz.locale.g etBrowserFirstLanguage().split("-", 1)[0]
   }),
   props: {
     label: { type: String, default: null },
@@ -97,7 +94,7 @@ export default {
   },
   methods: {
     setNow() {
-      let v = window.$gz.locale
+      const v = window.$gz.locale
         .nowUTC8601String(this.timeZoneName)
         .split("T")[1];
       this.updateTimeValue(v);
@@ -123,11 +120,11 @@ export default {
       this.updateValue(this.dateValue, v);
     },
     updateValue(theDate, theTime) {
-      let vm = this;
+      const vm = this;
 
       if (!theDate) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -138,12 +135,10 @@ export default {
         }
         theDate = fullYear + "-" + fullMonth + "-" + fullDay;
       }
-
       if (!theTime) {
         theTime = "00:00:00";
       }
-
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         theDate + "T" + theTime,
         vm.timeZoneName
       );
diff --git a/ayanova/src/components/time-native-control.vue b/ayanova/src/components/time-native-control.vue
index 8d6ccbd0..feeaa8a8 100644
--- a/ayanova/src/components/time-native-control.vue
+++ b/ayanova/src/components/time-native-control.vue
@@ -23,20 +23,16 @@
     </template>
   </div>
 </template>
-
 <script>
-//==========================================
-//==========================================
 export default {
   data() {
     return {
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName()
     };
   },
-
   props: {
     label: { type: String, default: null },
-    rules: { type: Array, default: undefined},
+    rules: { type: Array, default: undefined },
     errorMessages: { type: Array, default: null },
     value: { type: String, default: null },
     readonly: { type: Boolean, default: false },
@@ -61,14 +57,13 @@ export default {
       );
     },
     updateValue() {
-      let vm = this;
       let dateValue = window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
-        vm.value,
-        vm.timeZoneName
+        this.value,
+        this.timeZoneName
       );
       if (!dateValue) {
-        let v = new Date();
-        let fullYear = v.getFullYear();
+        const v = new Date();
+        const fullYear = v.getFullYear();
         let fullMonth = v.getMonth() + 1;
         if (fullMonth < 10) {
           fullMonth = "0" + fullMonth.toString();
@@ -79,17 +74,15 @@ export default {
         }
         dateValue = fullYear + "-" + fullMonth + "-" + fullDay;
       }
-
-      let timeValue = vm.$refs.timeField.$refs.input.value;
+      let timeValue = this.$refs.timeField.$refs.input.value;
       if (!timeValue) {
         timeValue = "00:00:00";
       }
-
-      let ret = window.$gz.locale.localTimeDateStringToUTC8601String(
+      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
         dateValue + "T" + timeValue,
-        vm.timeZoneName
+        this.timeZoneName
       );
-      vm.$emit("input", ret);
+      this.$emit("input", ret);
     }
   }
 };
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 9d9070c5..84d5d5aa 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -333,7 +333,6 @@
 <script>
 import marked from "marked";
 import DOMPurify from "dompurify";
-
 export default {
   created() {
     // Add a hook to make all links open a new window
@@ -355,7 +354,6 @@ export default {
     });
   },
   beforeDestroy() {
-    //cleanup
     DOMPurify.removeAllHooks();
   },
   data() {
@@ -420,14 +418,16 @@ export default {
         return "";
       }
       //replace attachment urls with tokenized local urls
-      let src = this.localVal.replace(/\[ATTACH:(.*)\]/g, function(match, p1) {
+      const src = this.localVal.replace(/\[ATTACH:(.*)\]/g, function(
+        match,
+        p1
+      ) {
         return window.$gz.api.attachmentDownloadUrl(p1);
       });
 
       return DOMPurify.sanitize(marked(src, { breaks: true }));
     },
     onResize() {
-      // this.editAreaHeight = window.innerHeight / 2;
       this.editAreaHeight = window.innerHeight * 0.8;
     },
     toggleReveal() {
@@ -451,10 +451,9 @@ export default {
       }
     },
     getSelectedRange(forceBlock) {
-      let bodyTextArea = this.$refs.editArea.$el.querySelector("textarea");
+      const bodyTextArea = this.$refs.editArea.$el.querySelector("textarea");
       this.selection.start = bodyTextArea.selectionStart;
       this.selection.end = bodyTextArea.selectionEnd;
-
       //some edits only work on a block so if user is just clicked on a line then add make a selection
       if (forceBlock) {
         //add a character to selection forward if possible but if not then go backward one
@@ -474,7 +473,7 @@ export default {
       this.selection.startOfBlock = this.selection.start;
       if (this.selection.start > 0) {
         //find linefeed prior to current start
-        let indexOfLineFeed = this.localVal.lastIndexOf(
+        const indexOfLineFeed = this.localVal.lastIndexOf(
           "\n",
           this.selection.start
         );
@@ -491,14 +490,14 @@ export default {
       this.selection.endOfBlock = this.selection.end;
       if (this.selection.end > 0) {
         //find linefeed prior to current start
-        let indexOfLineFeed = this.localVal.indexOf("\n", this.selection.end);
+        const indexOfLineFeed = this.localVal.indexOf("\n", this.selection.end);
         if (indexOfLineFeed != -1) {
           this.selection.endOfBlock = indexOfLineFeed;
         }
       }
     },
     setSelectedRange(start, end) {
-      let bodyTextArea = this.$refs.editArea.$el.querySelector("textarea");
+      const bodyTextArea = this.$refs.editArea.$el.querySelector("textarea");
       bodyTextArea.setSelectionRange(start, end);
     },
     getSelectedText() {
@@ -545,9 +544,9 @@ export default {
       //the purpose of this is only to change the selection if it's got an extra space to the right
       //because double clicking on a word with another word after it causes the space to be included
       this.getSelectedRange();
-      let temp = this.getSelectedText();
-      let tempTrimmed = temp.trimEnd();
-      let diff = temp.length - tempTrimmed.length;
+      const temp = this.getSelectedText();
+      const tempTrimmed = temp.trimEnd();
+      const diff = temp.length - tempTrimmed.length;
       if (diff != 0) {
         //there were some spaces so update the selection range
         //force selection to be shorter by diff
@@ -568,7 +567,6 @@ export default {
         } else {
           return "$ayiEyeSlash";
         }
-        return;
       }
 
       switch (this.currentView) {
@@ -646,7 +644,7 @@ export default {
         case "heading":
           {
             this.getSelectedRange(true); //special forces
-            let prepend = "#".repeat(ex) + " ";
+            const prepend = "#".repeat(ex) + " ";
             let s = this.getSelectedBlock();
             s = s.replace(/\n/gi, "\n" + prepend);
             if (s.length > 0 && s[0] != "\n") {
@@ -688,7 +686,7 @@ export default {
         case "ol":
           {
             if (this.selection.hasSelection) {
-              let s = this.getSelectedBlock();
+              const s = this.getSelectedBlock();
               let ret = "\n1. ";
               let listItem = 1;
               for (let i = 0; i < s.length; i++) {
@@ -769,7 +767,7 @@ export default {
             if (!url.includes(":")) {
               url = "https://" + url;
             }
-            let t = "[" + this.linkText + "](" + url + ")";
+            const t = "[" + this.linkText + "](" + url + ")";
             // [MY Awesome LINK](www.ayanova.com)
             this.replaceSelectedText(t);
           }
@@ -801,7 +799,7 @@ export default {
               return;
             }
 
-            let txt = this.imageText;
+            const txt = this.imageText;
             //force it to a full url so it doesn't attempt to open it as a SPA window
             if (!url.includes(":")) {
               url = "https://" + url;
@@ -819,11 +817,7 @@ export default {
           break;
         default:
           throw new Error(`wiki-control: ${editType} NOT IMPLEMENTED`);
-          break;
       }
-
-      // //emit input event to parent form for dirty tracking
-      // this.handleInput(this.localVal);
     },
     openLinkMenu(e) {
       e.preventDefault();
@@ -848,18 +842,18 @@ export default {
       });
     },
     async getAttachments() {
-      let vm = this;
+      const vm = this;
       try {
         vm.attachments = [];
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           "attachment/list?ayatype=" + vm.ayaType + "&ayaid=" + vm.ayaId
         );
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
-          let ret = [];
+          const ret = [];
           for (let i = 0; i < res.data.length; i++) {
-            let o = res.data[i];
+            const o = res.data[i];
 
             if (
               window.$gz.util.isImageAttachment(
@@ -884,22 +878,22 @@ export default {
     },
     async upload() {
       //similar code in attachment-control upload
-      let vm = this;
-      let at = {
+      const vm = this;
+      const at = {
         ayaId: vm.ayaId,
         ayaType: vm.ayaType,
         files: vm.uploadFiles,
         notes: ""
       };
       try {
-        let res = await window.$gz.api.uploadAttachment(at);
+        const res = await window.$gz.api.uploadAttachment(at);
 
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
-          let ret = [];
+          const ret = [];
           for (let i = 0; i < res.data.length; i++) {
-            let o = res.data[i];
+            const o = res.data[i];
 
             //let them attach any file type to the wiki since it supports it anyway
             ret.push({
@@ -914,9 +908,9 @@ export default {
           //NOW iterate upload files list and insert into wiki based on attachments
           //insert into wiki
           for (let i = 0; i < vm.uploadFiles.length; i++) {
-            let upFile = vm.uploadFiles[i];
+            const upFile = vm.uploadFiles[i];
             for (let j = 0; j < vm.attachments.length; j++) {
-              let atFile = vm.attachments[j];
+              const atFile = vm.attachments[j];
               if (upFile.name == atFile.name) {
                 //found it
                 this.insertUrl(atFile.url, atFile.name);
@@ -944,7 +938,7 @@ export default {
         //if an image then put it directly in viewable, if not an image then make a link and keep as an attach
       } else {
         //maybe an url?
-        let url = ev.dataTransfer.getData("text");
+        const url = ev.dataTransfer.getData("text");
         this.insertUrl(url);
       }
     },
@@ -956,7 +950,7 @@ export default {
           //it's an attachment url so fixup accordingly
           //i paramter added by gzapi::attachmentDownloadUrl function
           isImageUrl = url.includes("&i=");
-          let m = url.match(/attachment\/download\/(.*)\?t=/);
+          const m = url.match(/attachment\/download\/(.*)\?t=/);
           if (m.length > 1) {
             url = "[ATTACH:" + m[1] + "]";
           } else {
@@ -993,12 +987,8 @@ export default {
             }
           }
         }
-
-        //handle accordingly
       }
     }
-
-    //----------end methods----------
   }
 };
 </script>
diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 7117188b..9106ffed 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -351,20 +351,15 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   data() {
     return {
       openDialog: false,
       openSelectDialog: false,
-      selectType: 1, //1==service / physical, 2==billing / postal
-      alternateAddresses: [] //{objectName:"NAME-Type",addressViz:"summary",addressFields:{address:aaa,city:aaa,region:aaa,country:ccc, code:ccc, lat:lll, long:lll}}
+      selectType: 1,
+      alternateAddresses: []
     };
   },
-
   props: {
     value: {
       default: null,
@@ -374,7 +369,6 @@ export default {
       default: null,
       type: Object
     },
-
     formKey: { type: String, default: "" }, //used to grab template from store
     readonly: Boolean,
     disabled: Boolean
@@ -471,17 +465,17 @@ export default {
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
-				if(mAddressType==AddressTypes.Physical)
-				{
-					if(mLatitude!=0 || mLongitude!=0)
-					{
-						sb.Append(" \r\n");
-						sb.Append(LongitudeToString(mLongitude));
-						sb.Append("   ");
-						sb.Append(LatitudeToString(mLatitude));
-						sb.Append(" \r\n");
-					}
-				} */
+    if(mAddressType==AddressTypes.Physical)
+    {
+     if(mLatitude!=0 || mLongitude!=0)
+     {
+      sb.Append(" \r\n");
+      sb.Append(LongitudeToString(mLongitude));
+      sb.Append("   ");
+      sb.Append(LatitudeToString(mLatitude));
+      sb.Append(" \r\n");
+     }
+    } */
     },
     AddressCopyPostalToClipBoard() {
       let ret = "";
@@ -512,14 +506,13 @@ export default {
     },
     async GeoCapture() {
       try {
-        //window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let loc = await window.$gz.util.getGeoLocation();
+        const loc = await window.$gz.util.getGeoLocation();
         this.value.latitude = loc.latitude;
         this.fieldValueChanged("latitude");
         this.value.longitude = loc.longitude;
         this.fieldValueChanged("longitude");
       } catch (ex) {
-        //window.$gz.errorHandler.handleFormError(ex, vm);
+        //could fail on some platforms
       }
     }
   },
@@ -547,7 +540,7 @@ async function populateAlternateAddresses(vm) {
   const ispostal = vm.selectType == 2;
   const wo = vm.value;
   if (wo.customerId != null) {
-    let res = await window.$gz.api.get(`customer/address/${wo.customerId}`);
+    const res = await window.$gz.api.get(`customer/address/${wo.customerId}`);
     if (res.data) {
       //customer first
       if (ispostal) {
@@ -579,13 +572,13 @@ async function populateAlternateAddresses(vm) {
   //Unit addresses
   //Units only have physical addresses
   if (!ispostal) {
-    let unitIdList = [];
+    const unitIdList = [];
     vm.value.items.forEach(i => {
       i.units.forEach(async u => {
         if (u.unitId != null && !unitIdList.includes(u.unitId)) {
           unitIdList.push(u.unitId);
           //get address
-          let res = await window.$gz.api.get(`unit/address/${u.unitId}`);
+          const res = await window.$gz.api.get(`unit/address/${u.unitId}`);
           if (res.data) {
             vm.alternateAddresses.push({
               name: res.data.unit.name,
@@ -605,7 +598,7 @@ async function populateAlternateAddresses(vm) {
 //
 function formatAddress(o) {
   //Format address(es) as compact as possible
-  let ret = { physical: "", postal: "" };
+  const ret = { physical: "", postal: "" };
 
   //Physical
   if (!window.$gz.util.stringIsNullOrEmpty(o.address)) {
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 5056f936..1ad48f14 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -447,9 +447,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 import GzWoState from "./work-order-state.vue";
 import GzWoAddress from "./work-order-address.vue";
 import GzWoSignature from "./work-order-signature.vue";
@@ -477,14 +474,12 @@ export default {
       type: Object
     }
   },
-
   methods: {
     form() {
       return window.$gz.form;
     },
     async fieldValueChanged(ref) {
       if (!this.formState.loading && !this.formState.readonly) {
-        //flag this record dirty so it gets picked up by save
         this.value.isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
       }
diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index 5109c1b0..b66a466e 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -437,10 +437,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -506,7 +502,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].expenses.length;
 
       //#################################### IMPORTANT ##################################################
       //NOTE: default values are critical and must match server validation ExpenseValidateAsync for restricted users
@@ -586,11 +582,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -633,11 +624,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemExpenseName")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index a9209254..02bb3ff2 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -439,10 +439,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -526,7 +522,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].labors.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].labors.length;
 
       this.value.items[this.activeWoItemIndex].labors.push({
         id: 0,
@@ -723,11 +719,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLaborServiceStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue
index cfa57eda..5a135c26 100644
--- a/ayanova/src/components/work-order-item-loans.vue
+++ b/ayanova/src/components/work-order-item-loans.vue
@@ -413,10 +413,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -488,7 +484,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].loans.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].loans.length;
 
       this.value.items[this.activeWoItemIndex].loans.push({
         id: 0,
@@ -610,11 +606,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemLoanUnit")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-outside-services.vue b/ayanova/src/components/work-order-item-outside-services.vue
index b81db346..824981a2 100644
--- a/ayanova/src/components/work-order-item-outside-services.vue
+++ b/ayanova/src/components/work-order-item-outside-services.vue
@@ -591,10 +591,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -669,7 +665,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].outsideServices
+      const newIndex = this.value.items[this.activeWoItemIndex].outsideServices
         .length;
 
       this.value.items[this.activeWoItemIndex].outsideServices.push({
@@ -801,11 +797,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemOutsideServiceUnit")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-part-requests.vue b/ayanova/src/components/work-order-item-part-requests.vue
index d7eb5e91..eeb76bfc 100644
--- a/ayanova/src/components/work-order-item-part-requests.vue
+++ b/ayanova/src/components/work-order-item-part-requests.vue
@@ -89,10 +89,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -190,15 +186,6 @@ export default {
     form() {
       return window.$gz.form;
     },
-    // fieldValueChanged(ref) {
-    //   if (!this.formState.loading && !this.formState.readonly) {
-    //     //flag this record dirty so it gets picked up by save
-    //     this.value.items[this.activeWoItemIndex].partRequests[
-    //       this.activeItemIndex
-    //     ].isDirty = true;
-    //     window.$gz.form.fieldValueChanged(this.pvm, ref);
-    //   }
-    // },
     itemRowClasses: function(item) {
       let ret = "";
       const isDeleted =
@@ -241,11 +228,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemPartRequestPartID")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index 27583ca0..f37664d3 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -465,10 +465,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -561,7 +557,7 @@ export default {
       if (!partId || partId == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`part/serials/${partId}`);
+      const res = await window.$gz.api.get(`part/serials/${partId}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -598,7 +594,7 @@ export default {
       this.$emit("change");
     },
     async addPartAssembly() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `part-assembly/${this.selectedPartAssembly}`
       );
       if (res.data && res.data.items) {
@@ -696,7 +692,6 @@ export default {
             ].quantity`);
       }
     },
-
     warehouseChange(newName) {
       this.value.items[this.activeWoItemIndex].parts[
         this.activeItemIndex
@@ -713,8 +708,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].parts.length;
-
+      const newIndex = this.value.items[this.activeWoItemIndex].parts.length;
       this.value.items[this.activeWoItemIndex].parts.push({
         id: 0,
         concurrency: 0,
@@ -861,11 +855,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemPartPartID")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index d1bf40ec..8361fe21 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -303,10 +303,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -407,7 +403,7 @@ export default {
       ].serviceRateViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
+      const newIndex = this.value.items[this.activeWoItemIndex].scheduledUsers
         .length;
 
       this.value.items[this.activeWoItemIndex].scheduledUsers.push({
@@ -600,11 +596,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemScheduledUserStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index 1978a9c0..780e0ddb 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -311,10 +311,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -371,7 +367,7 @@ export default {
   },
   methods: {
     async addTaskGroup() {
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         `task-group/${this.selectedTaskGroup}`
       );
       if (res.data && res.data.items) {
@@ -391,7 +387,7 @@ export default {
         }
 
         let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
-        let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
+        const incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
           s => s.id == 1 //incomplete
         ).name;
         res.data.items.forEach(z => {
@@ -443,7 +439,7 @@ export default {
       }
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
       this.value.items[this.activeWoItemIndex].tasks.push({
         id: 0,
         concurrency: 0,
@@ -557,11 +553,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTaskSequence")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue
index 48b0633e..34ce8109 100644
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -472,10 +472,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -545,7 +541,7 @@ export default {
       ].taxCodeViz = newName;
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].travels.length;
+      const newIndex = this.value.items[this.activeWoItemIndex].travels.length;
 
       this.value.items[this.activeWoItemIndex].travels.push({
         id: 0,
@@ -743,11 +739,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemTravelStartDate")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index 6408425c..d12b26eb 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -344,10 +344,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   created() {
     this.setDefaultView();
@@ -444,7 +440,7 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/work-order-info/${id}`);
+      const res = await window.$gz.api.get(`unit/work-order-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -469,7 +465,7 @@ export default {
             .t("ApplyUnitContract")
             .replace("{0}", res.data.name);
 
-          let dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
+          const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
             prompt,
             "question"
           );
@@ -493,27 +489,13 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      let res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
+      const res = await window.$gz.api.get(`unit/service-warranty-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
           window.$gz.errorHandler.errorToString(res, this)
         );
       } else {
-        /* {
-  "recentWorkOrders":[{"serial":10,"id":10,"serviceDate":"2021-01-19T22:00:00Z"},{"serial":8,"id":8,"serviceDate":"2021-04-08T22:00:00Z"},{"serial":7,"id":7,"serviceDate":"2021-04-18T20:00:00Z"}],
-  "purchaseDate":"2019-03-12T09:37:52.930923Z",
-  "purchasedFromVendor":null,
-  "purchaseFromVendorId":null,
-  "purchaseReceiptNumber":"139736",
-  "lifeTimeWarranty":false,
-  "warrantyExpiryDate":"2019-04-12T09:37:52.930923Z",
-  "warrantyTerms":"Shipping parts and service"} 
-  
-  "UnitPurchasedDate": "Purchased Date",
-  "UnitPurchaseFromID": "Purchased From",
-  "UnitReceipt": "Receipt Number",
-  */
         const r = res.data;
 
         let WarrantyInfo = `${this.$ay.t("Warranty")}: `;
@@ -547,7 +529,7 @@ export default {
             this.pvm.hour12
           );
         }
-        let PurchaseInfo = `${this.$ay.t(
+        const PurchaseInfo = `${this.$ay.t(
           "UnitPurchaseFromID"
         )}: ${PurchasedFrom}<br/>${this.$ay.t(
           "UnitPurchasedDate"
@@ -572,11 +554,11 @@ export default {
           RecentWorkOrderList = "-";
         }
 
-        let RecentWorkOrderInfo = `${this.$ay.t(
+        const RecentWorkOrderInfo = `${this.$ay.t(
           "RecentWorkOrders"
         )}:${RecentWorkOrderList}`;
 
-        let d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
+        const d = `<div>${WarrantyInfo}<br/>${PurchaseInfo}<br/>${RecentWorkOrderInfo}</div>`;
 
         this.value.items[this.activeWoItemIndex].units[
           this.activeItemIndex
@@ -597,7 +579,7 @@ export default {
       this.selectedBulkUnits.splice(0);
       this.availableBulkUnits.splice(0);
 
-      let res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
+      const res = await window.$gz.api.post(`unit/bulk-add-selection-list`, {
         tags: this.selectedBulkUnitTags,
         restrictToCustomerId: this.selectedBulkUnitCustomer
       });
@@ -646,21 +628,7 @@ export default {
       await this.handleUnitChange();
     },
     newItem() {
-      let newIndex = this.value.items[this.activeWoItemIndex].units.length;
-      // {
-      // 	"0": {
-      // 		"id": 53,
-      // 		"concurrency": 9586762,
-      // 		"notes": "Aut modi molestias molestiae ipsa id.",
-      // 		"wiki": null,
-      // 		"customFields": null,
-      // 		"tags": [],
-      // 		"unitId": 4,
-      // 		"unitViz": "83429560",
-      // 		"workOrderItemId": 22
-      // 	}
-      // }
-
+      const newIndex = this.value.items[this.activeWoItemIndex].units.length;
       this.value.items[this.activeWoItemIndex].units.push({
         id: 0,
         concurrency: 0,
@@ -735,11 +703,6 @@ export default {
           this.activeItemIndex
         ].isDirty = true;
         window.$gz.form.fieldValueChanged(this.pvm, ref);
-
-        // //set viz if applicable
-        // if(ref==""){
-        //    let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-        // }
       }
     },
     itemRowClasses: function(item) {
@@ -781,11 +744,7 @@ export default {
     },
 
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemUnit")) {
         headers.push({
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 9f4d583d..f47a6d89 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -1,25 +1,6 @@
 <template>
   <div v-if="value != null" class="mt-8">
-    <!-- {{
-      {
-        isRestrictedType: value.userIsRestrictedType,
-        isTechRestricted: value.userIsTechRestricted,
-        subfull: value.userIsSubContractorFull,
-        subRestricted: value.userIsSubContractorRestricted,
-        showLabors: showLabors,
-        showTravels: showTravels,
-        showExpenses: showExpenses,
-        showLoans: showLoans,
-        showOutsideServices: showOutsideServices,
-        showParts: showParts,
-        showPartRequests: showPartRequests,
-        showScheduledUsers: showScheduledUsers,
-        showTasks: showTasks,
-        showUnits: showUnits
-      }
-    }} -->
     <v-row>
-      <!-- Title and menu -->
       <v-col cols="12">
         <v-menu offset-y max-width="600px">
           <template v-slot:activator="{ on, attrs }">
@@ -708,10 +689,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 import GzWoItemUnits from "../components/work-order-item-units.vue";
 import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-users.vue";
 import GzWoItemLabors from "../components/work-order-item-labors.vue";
@@ -774,7 +751,7 @@ export default {
   watch: {
     goto(val, oldVal) {
       if (val != oldVal) {
-        let navto = { woitemindex: null, childindex: null };
+        const navto = { woitemindex: null, childindex: null };
         //find the item in question then trigger the nav
         let keepgoing = true;
         this.value.items.forEach((z, itemindex) => {
@@ -945,9 +922,9 @@ export default {
 
       //Self copy to current workorder??
       if (this.copyItemWoNumber == this.value.serial) {
-        let newIndex = this.value.items.length;
+        const newIndex = this.value.items.length;
 
-        let wi = JSON.parse(
+        const wi = JSON.parse(
           JSON.stringify(this.value.items[this.activeItemIndex])
         );
 
@@ -965,7 +942,7 @@ export default {
           }
         }
         //get id from number then push open
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           "workorder/id-from-number/" + this.copyItemWoNumber
         );
         if (res.error) {
@@ -986,7 +963,7 @@ export default {
       this.copyItemDialog = false;
     },
     newItem() {
-      let newIndex = this.value.items.length;
+      const newIndex = this.value.items.length;
 
       this.value.items.push({
         id: 0,
@@ -1027,7 +1004,7 @@ export default {
     },
     newSubItem(atype) {
       //new Id value to use (by convention goto negative will trigger create and then goto instead of simple goto)
-      let newId = -Math.abs(Date.now());
+      const newId = -Math.abs(Date.now());
       switch (atype) {
         case window.$gz.type.WorkOrderItemOutsideService:
           this.gotoOutsideServiceIndex = newId;
@@ -1134,32 +1111,7 @@ export default {
       return this.value.items[this.activeItemIndex].deleted === true;
     },
     headerList: function() {
-      /*
-         public uint Concurrency { get; set; }
-        public string Notes { get; set; }//Was Summary
-        public string Wiki { get; set; }
-        public string CustomFields { get; set; }
-        public List<string> Tags { get; set; } = new List<string>();
-
-        [Required]
-        public long WorkOrderId { get; set; }
-        public string TechNotes { get; set; }
-        public long? WorkOrderItemStatusId { get; set; }
-        public long? WorkOrderItemPriorityId { get; set; }
-        public DateTime RequestDate { get; set; }
-        public bool WarrantyService { get; set; } = false;
-
-
-IN ORDER: notes, status, date, priority, warranty, tags
-
-except they will not prefill at server but will be set here since the wo differs from the po in that there is no instant update with new viz fields to populate from server
-and it's probably not a big list to fill anyway
-
-
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
+      const headers = [];
 
       if (this.form().showMe(this, "WorkOrderItemSequence")) {
         headers.push({
@@ -1229,9 +1181,6 @@ and it's probably not a big list to fill anyway
           value: "tags"
         });
       }
-
-      // headers.push({ text: "", value: "actions" });
-
       return headers;
     },
     itemList: function() {
@@ -1365,7 +1314,6 @@ and it's probably not a big list to fill anyway
         !this.value.userIsSubContractorRestricted
       );
     },
-
     canAddLabor: function() {
       return this.form().showMe(this, "WorkOrderItemLaborList");
     },
diff --git a/ayanova/src/components/work-order-signature.vue b/ayanova/src/components/work-order-signature.vue
index 0cfff157..a9a6496c 100644
--- a/ayanova/src/components/work-order-signature.vue
+++ b/ayanova/src/components/work-order-signature.vue
@@ -109,15 +109,11 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 import vueSignature from "vue-signature";
 export default {
   components: {
     vueSignature
   },
-
   data() {
     return {
       selectedStatus: null,
@@ -131,7 +127,6 @@ export default {
       tempName: null
     };
   },
-
   props: {
     value: {
       default: null,
@@ -149,7 +144,6 @@ export default {
     readonly: Boolean,
     disabled: Boolean
   },
-
   methods: {
     showSign() {
       if (this.readonly) return;
@@ -164,16 +158,13 @@ export default {
     save() {
       let svg = this.$refs.sigCtrl.save("image/svg+xml");
       if (this.$refs.sigCtrl.isEmpty()) {
-        //console.log("IS EMPTY");
         svg = null;
       }
       this.setSig(svg);
       this.setCaptured(window.$gz.locale.nowUTC8601String());
       this.setName(this.tempName);
-      //console.log("SVG size IS ", svg == null ? 0 : svg.length);
       this.value.isDirty = true;
       this.pvm.formState.dirty = true;
-
       this.$emit("change");
       this.openDialog = false;
     },
diff --git a/ayanova/src/components/work-order-state.vue b/ayanova/src/components/work-order-state.vue
index 77964aa8..ba9e8479 100644
--- a/ayanova/src/components/work-order-state.vue
+++ b/ayanova/src/components/work-order-state.vue
@@ -3,7 +3,6 @@
     <div class="mb-n2 ml-10">
       <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
     </div>
-
     <template>
       <div class="mb-6 mb-sm-0">
         <v-btn icon class="ml-n1 mr-2" @click="openDialog = true">
@@ -22,7 +21,6 @@
         >
       </div>
     </template>
-
     <v-row justify="center">
       <v-dialog v-model="openDialog" max-width="600px">
         <v-card>
@@ -68,8 +66,6 @@
                 </div>
               </div>
             </template>
-            <!-- append-outer-icon="$ayiPlus"
-                  @click:append-outer="addState()" -->
             <template v-if="canAdd">
               <div class="mt-8">
                 <v-autocomplete
@@ -136,10 +132,6 @@
   </div>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  XXXeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 export default {
   data() {
     return {
@@ -177,12 +169,10 @@ export default {
         this.value.states = this.value.states.filter(
           z => z.concurrency != null
         );
-
         //is it a different state?
         if (this.selectedStatus == this.pvm.currentState.id) {
           return;
         }
-
         //push in new state
         this.value.states.push({
           workOrderId: this.value.id,
@@ -197,7 +187,7 @@ export default {
       }
     },
     getStateForDisplay(state) {
-      let ret = {
+      const ret = {
         id: Date.now,
         name: "??",
         color: "#ffffff",
@@ -259,7 +249,7 @@ export default {
       return this.value.states != null && this.value.states.length > 0;
     },
     stateDisplayList() {
-      let ret = [];
+      const ret = [];
       this.value.states.forEach(z => {
         ret.push(this.getStateForDisplay(z));
       });
@@ -270,28 +260,23 @@ export default {
       if (!this.pvm.rights.change) {
         return false;
       }
-
       //not currently locked, user has rights to do it so allow it
       if (!this.value.isLockedAtServer) {
         return true;
       }
-
       //locked, confirm if user can change it
       //if any role then no problem
-
-      //ok, only thing left to check is if the current user can unlock this
+      //only thing left to check is if the current user can unlock this
       //get remove roles required for current state
-      let cs = this.pvm.currentState;
+      const cs = this.pvm.currentState;
       if (cs.removeRoles == null || cs.removeRoles == 0) {
         //no state set yet
         return true;
       }
-
-      //ok, need to check the role here against current user roles to see if this is valid
+      //need to check the role here against current user roles to see if this is valid
       if (window.$gz.role.hasRole(cs.removeRoles)) {
         return true;
       }
-
       return false;
     }
   }
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index b45201eb..f4565ea6 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -127,24 +127,24 @@ Vue.config.productionTip = false;
 //
 
 // Store a copy of the fetch function
-let _oldFetch = fetch;
+const _oldFetch = fetch;
 
 // Create our new version of the fetch function
 window.fetch = function() {
   // Create hooks
-  let fetchStart = new Event("fetchStart", {
+  const fetchStart = new Event("fetchStart", {
     view: document,
     bubbles: true,
     cancelable: false
   });
-  let fetchEnd = new Event("fetchEnd", {
+  const fetchEnd = new Event("fetchEnd", {
     view: document,
     bubbles: true,
     cancelable: false
   });
 
   // Pass the supplied arguments to the real fetch function
-  let fetchCall = _oldFetch.apply(this, arguments);
+  const fetchCall = _oldFetch.apply(this, arguments);
 
   // Trigger the fetchStart event
   document.dispatchEvent(fetchStart);
@@ -170,21 +170,9 @@ document.addEventListener("fetchEnd", function() {
   NProgress.done();
 });
 
-/////////////////////////////////////////////////////////////////
-// FILTERS
-//
-
-//example filter kept for just in case
-// Vue.filter("capitalize", function vueFilterCapitalize(value) {
-//   if (!value) return "";
-//   value = value.toString();
-//   return value.charAt(0).toUpperCase() + value.slice(1);
-// });
-
 /////////////////////////////////////////////////////////////
 //GZ COMPONENTS
 //
-
 Vue.component("gz-date-time-picker", dateTimeControl);
 Vue.component("gz-date-picker", dateControl);
 Vue.component("gz-time-picker", timeControl);
@@ -216,7 +204,6 @@ Vue.component("gz-chart-line", chartLineControl);
 Vue.component("gz-chart-pie", chartPieControl);
 Vue.component("gz-chart-bar", chartBarControl);
 Vue.component("gz-chart-bar-horizontal", chartBarHorizontalControl);
-
 //3rd party components
 Vue.use(VueCurrencyInput);
 /////////////////////////////////////////////////////////////
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index f44b94f7..77e9ba56 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -1,5 +1,3 @@
-/* xeslint-disable */
-
 import Vue from "vue";
 import Vuetify from "vuetify/lib";
 
@@ -11,6 +9,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; //https://github.com/FortAwesome/vue-fontawesome
 
 /*
+NOTES: in case need to get fancy 
 https://github.com/FortAwesome/vue-fontawesome#advanced
 import {
   FontAwesomeIcon,
@@ -1511,20 +1510,19 @@ export default new Vuetify({
   theme: {
     themes: {
       light: {
-        primary: "#00205B", //Canucks dark blue
-        secondary: "#00843D", //canucks green
-        accent: "#db7022", //lighter orangey red, more friendly looking though not as much clarity it seems
-        error: "#ff5252", //lighter red, have to see if it's good for all screens and sizes as it's a bit light but it stands out as an error condition better
+        primary: "#00205B", //dark blue
+        secondary: "#00843D", //green
+        accent: "#db7022", //lighter orangey red, more friendly looking
+        error: "#ff5252", //lighter red
         disabled: "#c7c7c7",
         readonlybanner: "#808080"
       },
       dark: {
-        //here you will define primary secondary stuff for dark theme
         //color adjuster tool: https://www.hexcolortool.com/#00205c
-        primary: "#7F9FDA", //Canucks dark blue LIGHTENED 50%
-        secondary: "#006B24", //canucks green DARKENED 10%
-        accent: "#db7022", //lighter orangey red, more friendly looking though not as much clarity it seems
-        error: "#ff5252", //lighter red, have to see if it's good for all screens and sizes as it's a bit light but it stands out as an error condition better
+        primary: "#7F9FDA", //dark blue LIGHTENED 50%
+        secondary: "#006B24", //green DARKENED 10%
+        accent: "#db7022", //lighter orangey red, more friendly looking
+        error: "#ff5252", //lighter red
         disabled: "#c7c7c7",
         readonlybanner: "#808080"
       }
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index 29581a02..bac945b2 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -2,7 +2,6 @@ import Vue from "vue";
 import Router from "vue-router";
 
 Vue.use(Router);
-/* Xeslint-disable */
 
 // scrollBehavior:
 // - only available in html5 history mode
@@ -154,14 +153,6 @@ export default new Router({
           /* webpackChunkName: "ay-common" */ "./views/home-notifications.vue"
         )
     },
-    // {
-    //   path: "/home-notify-direct/:userIdList?",
-    //   name: "home-notify-direct",
-    //   component: () =>
-    //     import(
-    //       /* webpackChunkName: "ay-common" */ "./views/home-notify-direct.vue"
-    //     )
-    // },
     {
       path: "/home-notify-direct",
       name: "home-notify-direct",
@@ -1065,13 +1056,13 @@ export default new Router({
       path: "/viewreport",
       beforeEnter: async (to, from, next) => {
         //open report links have a query string /viewreport?oid=[objectid]&rid=[reportid]
-        let objectId = parseInt(to.query.oid);
-        let reportId = parseInt(to.query.rid);
+        const objectId = parseInt(to.query.oid);
+        const reportId = parseInt(to.query.rid);
 
-        let res = await window.$gz.api.renderReport(objectId, reportId, true);
+        const res = await window.$gz.api.renderReport(objectId, reportId, true);
         if (res.error) {
           //log the error and do a popup for it
-          let msg = `/viewReport, query ${JSON.stringify(
+          const msg = `/viewReport, query ${JSON.stringify(
             to.query
           )}, server error: ${JSON.stringify(res.error)}`;
           window.$gz.eventBus.$emit("notify-error", msg);
diff --git a/ayanova/src/store.js b/ayanova/src/store.js
index 3eafbddd..ed1bc94f 100644
--- a/ayanova/src/store.js
+++ b/ayanova/src/store.js
@@ -2,7 +2,6 @@ import Vue from "vue";
 import Vuex from "vuex";
 import createPersistedState from "vuex-persistedstate";
 
-/*  Xeslint-disable */
 const MaxLogLength = 100;
 
 Vue.use(Vuex);
@@ -163,7 +162,7 @@ export default new Vuex.Store({
       state.globalSettings = data;
     },
     setEnum(state, data) {
-      state.enums[data.enumKey] = data.items; //{enumKey:"AuthorizationRoles",items:[{0:"no role"},{1:"Restricted role"}]}
+      state.enums[data.enumKey] = data.items;
     },
     setAPIURL(state, data) {
       state.apiUrl = data;
diff --git a/ayanova/src/views/acc-service-bank.vue b/ayanova/src/views/acc-service-bank.vue
index 24397311..a69f2640 100644
--- a/ayanova/src/views/acc-service-bank.vue
+++ b/ayanova/src/views/acc-service-bank.vue
@@ -96,35 +96,25 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "service-bank-edit";
 const API_BASE_URL = "service-bank/";
-const FORM_CUSTOM_TEMPLATE_KEY = "ServiceBank"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "ServiceBank";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.ServiceBank);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //NOTE: THIS FORM IS CREATE ONLY NO OPEN OLD ONES SO...
 
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //Ok, we're here to *view* an existing record
         //so we must fetch the deets now
-        await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        await vm.getDataFromApi(vm.$route.params.recordid);
       } else {
         //New record so there has to be a object type and objectId in route
         // path: "/home-service-banks/:recordid/:aType?/:objectId?",
@@ -183,29 +173,18 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        /*
-        {"data":{"id":1,"concurrency":1387706,"name":"Prepaid for $500 labor","entryDate":"2005-11-27T19:04:00Z","lastEntryDate":null,"objectId":1,"aType":8,
-        "sourceId":0,"sourceType":55,"incidents":0.0000,"incidentsBalance":0.0000,"lastIncidentsBalance":null,
-        "currency":500.0000,"currencyBalance":500.0000,"lastCurrencyBalance":null,
-        "hours":0.0000,"hoursBalance":0.0000,"lastHoursBalance":null}}
-        */
-        //THIS FORM IS ONLY USED TO CREATE ENTRIES SO DEFAULTS TO THOSE REQUIREMENTS
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          objectId: null,
-          aType: null,
-          sourceId: 0, //default for manual entries
-          sourceType: window.$gz.type.ServiceBank,
-          incidents: 0,
-          currency: 0,
-          hours: 0
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        objectId: null,
+        aType: null,
+        sourceId: 0, //default for manual entries
+        sourceType: window.$gz.type.ServiceBank,
+        incidents: 0,
+        currency: 0,
+        hours: 0
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -220,23 +199,19 @@ export default {
       name: null
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -283,28 +258,23 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           JUST_SAVED = true;
-          //success, back to list, nothing to see here
+
           vm.$router.go(-1);
         }
       } catch (ex) {
@@ -317,7 +287,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -325,14 +295,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -340,14 +306,12 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
-            readOnly: true, //service banks are always read only after they are saved
+            readOnly: true,
             loading: false
           });
         }
@@ -360,8 +324,6 @@ export default {
         });
       }
     }
-
-    //end methods
   }
 };
 
@@ -372,7 +334,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -380,7 +342,7 @@ async function clickHandler(menuItem) {
         break;
 
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.ServiceBank,
             selectedRowIds: [m.vm.obj.id]
@@ -407,7 +369,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCarBattery",
diff --git a/ayanova/src/views/acc-service-banks.vue b/ayanova/src/views/acc-service-banks.vue
index b06cfdad..4aa136fa 100644
--- a/ayanova/src/views/acc-service-banks.vue
+++ b/ayanova/src/views/acc-service-banks.vue
@@ -1,11 +1,5 @@
 <template>
   <div>
-    <!-- <div v-if="aType && objectId" class="mb-6">
-      <v-icon data-cy="clickThru" @click="navToTarget()" large>{{
-        iconForType()
-      }}</v-icon
-      ><span @click="navToTarget()" class="text-h5"> {{ name }}</span>
-    </div> -->
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <gz-extensions
       :aya-type="$ay.ayt().ServiceBank"
@@ -34,7 +28,7 @@
 const FORM_KEY = "service-bank-list";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     vm.rights = window.$gz.role.getRights(window.$gz.type.ServiceBank);
     window.$gz.eventBus.$on("menu-click", clickHandler);
 
@@ -74,18 +68,9 @@ export default {
   },
 
   methods: {
-    // navToTarget: function() {
-    //   window.$gz.eventBus.$emit("openobject", {
-    //     type: this.aType,
-    //     id: this.objectId
-    //   });
-    // },
     handleSelected(selected) {
       this.selectedItems = selected;
     },
-    // iconForType() {
-    //   return window.$gz.util.iconForType(this.aType, 10);
-    // },
     clearPreFilter() {
       this.clientCriteria = null;
       this.preFilterMode = null;
@@ -101,7 +86,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -116,7 +101,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.ServiceBank
           )
@@ -127,7 +112,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.ServiceBank
             ),
@@ -137,7 +122,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -153,7 +138,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCarBattery",
     title: "ServiceBankList",
@@ -176,8 +161,6 @@ function generateMenu(vm) {
     }
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -185,8 +168,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue
index f130d397..b8c6d569 100644
--- a/ayanova/src/views/acc-service-rate.vue
+++ b/ayanova/src/views/acc-service-rate.vue
@@ -180,20 +180,14 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "service-rate-edit";
 const API_BASE_URL = "service-rate/";
-const FORM_CUSTOM_TEMPLATE_KEY = "ServiceRate"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "ServiceRate";
 
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
 
     try {
       await initForm(vm);
@@ -202,8 +196,6 @@ export default {
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -211,7 +203,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -230,7 +222,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       generateMenu(vm);
     } catch (error) {
@@ -256,25 +248,21 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          cost: 0,
-          charge: 0,
-          unit: null,
-          accountNumber: null,
-          contractOnly: false
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        cost: 0,
+        charge: 0,
+        unit: null,
+        accountNumber: null,
+        contractOnly: false
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -292,23 +280,19 @@ export default {
       }
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -349,7 +333,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -357,14 +341,13 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
+
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
 
-        let res = await window.$gz.api.get(url);
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -372,9 +355,9 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
+
           generateMenu(vm);
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -392,7 +375,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -402,36 +385,31 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
+        let res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
 
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
             //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
 
             this.$router.replace({
               name: "service-rate-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
+
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -448,42 +426,37 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
+
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -492,7 +465,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "service-rate-edit",
         params: {
@@ -501,8 +473,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -513,7 +483,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -533,7 +503,7 @@ async function clickHandler(menuItem) {
         break;
 
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.ServiceRate,
             selectedRowIds: [m.vm.obj.id]
@@ -560,7 +530,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCalculator",
@@ -595,8 +565,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -604,8 +572,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -687,7 +654,7 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get("service-rate/prior-unit-list");
+  const res = await window.$gz.api.get("service-rate/prior-unit-list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/acc-service-rates.vue b/ayanova/src/views/acc-service-rates.vue
index 74db3f09..f860cb05 100644
--- a/ayanova/src/views/acc-service-rates.vue
+++ b/ayanova/src/views/acc-service-rates.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "service-rate-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.ServiceRate
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.ServiceRate
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +99,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCalculator",
     title: "ServiceRateList",
@@ -121,8 +120,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +127,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index 13684ef4..e058c921 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -154,30 +154,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "tax-code-edit";
 const API_BASE_URL = "tax-code/";
-const FORM_CUSTOM_TEMPLATE_KEY = "TaxCode"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "TaxCode";
 
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.TaxCode);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -185,7 +175,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -204,7 +194,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -231,23 +221,19 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          taxAPct: 0,
-          taxBPct: 0,
-          taxOnTax: false
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        taxAPct: 0,
+        taxBPct: 0,
+        taxOnTax: false
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -262,23 +248,19 @@ export default {
       ayaType: window.$gz.type.TaxCode
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -319,7 +301,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -327,14 +309,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -342,9 +320,9 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
+
           generateMenu(vm);
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -362,46 +340,38 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
             //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "tax-code-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
+
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -418,42 +388,39 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
+          const url = API_BASE_URL + vm.$route.params.recordid;
 
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(url);
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
+
             JUST_DELETED = true;
-            // navigate backwards
+
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -462,7 +429,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "tax-code-edit",
         params: {
@@ -471,8 +437,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -483,7 +447,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -502,7 +466,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.TaxCode,
             selectedRowIds: [m.vm.obj.id]
@@ -529,7 +493,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiPercent",
@@ -564,8 +528,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -573,8 +535,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/acc-tax-codes.vue b/ayanova/src/views/acc-tax-codes.vue
index 4ee20efa..66451dee 100644
--- a/ayanova/src/views/acc-tax-codes.vue
+++ b/ayanova/src/views/acc-tax-codes.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "tax-code-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.TaxCode)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.TaxCode
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPercent",
     title: "TaxCodeList",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue
index ef95a065..77f9ddba 100644
--- a/ayanova/src/views/acc-travel-rate.vue
+++ b/ayanova/src/views/acc-travel-rate.vue
@@ -178,30 +178,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "travel-rate-edit";
 const API_BASE_URL = "travel-rate/";
-const FORM_CUSTOM_TEMPLATE_KEY = "TravelRate"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "TravelRate";
 
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.TravelRate);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -209,7 +199,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -223,12 +213,11 @@ export default {
           setDirty = true;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       generateMenu(vm);
     } catch (error) {
@@ -254,25 +243,21 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          cost: 0,
-          charge: 0,
-          unit: null,
-          accountNumber: null,
-          contractOnly: false
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        cost: 0,
+        charge: 0,
+        unit: null,
+        accountNumber: null,
+        contractOnly: false
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -290,23 +275,17 @@ export default {
       }
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -347,7 +326,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -355,14 +334,13 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
+      const url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
 
-        let res = await window.$gz.api.get(url);
+        const res = await window.$gz.api.get(url);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -370,9 +348,9 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
+
           generateMenu(vm);
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -390,7 +368,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -400,36 +378,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "travel-rate-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -446,42 +414,36 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -490,7 +452,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "travel-rate-edit",
         params: {
@@ -499,8 +460,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -511,7 +470,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -530,7 +489,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.TravelRate,
             selectedRowIds: [m.vm.obj.id]
@@ -556,7 +515,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCalculator",
@@ -591,8 +550,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -600,8 +557,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -683,7 +639,7 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get("travel-rate/prior-unit-list");
+  const res = await window.$gz.api.get("travel-rate/prior-unit-list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/acc-travel-rates.vue b/ayanova/src/views/acc-travel-rates.vue
index c84f0571..f47de30b 100644
--- a/ayanova/src/views/acc-travel-rates.vue
+++ b/ayanova/src/views/acc-travel-rates.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "travel-rate-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.TravelRate
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.TravelRate
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +99,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCalculator",
     title: "TravelRateList",
@@ -121,8 +120,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +127,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 6a91a17f..16ef240c 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -62,7 +62,6 @@
     </v-row>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "adm-attachments";
 export default {
@@ -132,14 +131,12 @@ export default {
         );
       }
     },
-    async moveSelected(aType, ayId) {
-      let vm = this;
+    async moveSelected() {
+      const vm = this;
       try {
-        //called from move dialog, already selected
         vm.moveDialog = false;
-
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert("attachment/batch-move", {
+        const res = await window.$gz.api.upsert("attachment/batch-move", {
           idList: this.selectedItems,
           toType: this.moveType,
           toId: this.moveId
@@ -154,15 +151,14 @@ export default {
       }
     },
     async deleteSelected() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(
+        const res = await window.$gz.api.upsert(
           "attachment/batch-delete",
           this.selectedItems
         );
@@ -176,11 +172,10 @@ export default {
       }
     },
     async startMaintenanceJob() {
-      let vm = this;
-
+      const vm = this;
       try {
         //warning about job exclusivity
-        let dialogResult = await window.$gz.dialog.confirmGeneric(
+        const dialogResult = await window.$gz.dialog.confirmGeneric(
           "JobExclusiveWarning",
           "warning"
         );
@@ -188,29 +183,13 @@ export default {
           return;
         }
 
-        //call seed route
         let jobId = await window.$gz.api.upsert("attachment/maintenance");
         if (jobId.error) {
-          //throw new Error(jobId.error);
           throw new Error(window.$gz.errorHandler.errorToString(jobId, vm));
         }
-        jobId = jobId.jobId; //it's in a sub key
+        jobId = jobId.jobId;
         vm.jobActive = true;
-
-        /*  /// <summary>
-    /// Job status for opsjobs
-    /// </summary>
-    public enum JobStatus : int
-    {
-        Absent=0,
-        Sleeping = 1,
-        Running = 2,
-        Completed = 3,
-        Failed = 4
-    } */
         let jobStatus = 1;
-        //get status
-
         while (vm.jobActive == true) {
           await window.$gz.util.sleepAsync(1000);
           //check if done
@@ -218,7 +197,6 @@ export default {
             `job-operations/status/${jobId}`
           );
           if (jobStatus.error) {
-            // throw new Error(jobStatus.error);
             throw new Error(
               window.$gz.errorHandler.errorToString(jobStatus, vm)
             );
@@ -231,8 +209,6 @@ export default {
             vm.jobActive = false;
           }
         }
-
-        //Here if it's completed successfully
         window.$gz.eventBus.$emit("notify-success", vm.$ay.t("JobCompleted"));
         this.reload = !this.reload;
       } catch (error) {
@@ -251,7 +227,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "START_MAINTENANCE_JOB":
@@ -277,16 +253,13 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFolder",
     title: "Attachments",
     helpUrl: "adm-attachments",
     menuItems: []
   };
-
-  //STUB REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -294,8 +267,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -352,11 +324,10 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get("enum-list/list/coreall");
+  const res = await window.$gz.api.get("enum-list/list/coreall");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
-    // window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.objectTypes = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
diff --git a/ayanova/src/views/adm-global-logo.vue b/ayanova/src/views/adm-global-logo.vue
index 744bb3c9..49ec088f 100644
--- a/ayanova/src/views/adm-global-logo.vue
+++ b/ayanova/src/views/adm-global-logo.vue
@@ -3,7 +3,12 @@
     <v-col>
       <v-form ref="form">
         <!-- Prevent implicit submission of the form on enter key, this is not necessary on a form with a text area which is why I never noticed it with the other forms -->
-
+        <button
+          type="submit"
+          disabled
+          style="display: none"
+          aria-hidden="true"
+        ></button>
         <v-row>
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
           <v-col cols="12">
@@ -73,27 +78,22 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //NOTE: This is a simple form with no need for business rules or validation so stripped out any extraneous code related to all that
 //
 const FORM_KEY = "adm-global-logo";
-
 export default {
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.formState.ready = true;
       vm.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-      //modify the menu as necessary
       generateMenu(vm);
       vm.smallUrl = `${window.$gz.api.logoUrl("small")}?x=${Date.now()}`;
       vm.mediumUrl = `${window.$gz.api.logoUrl("medium")}?x=${Date.now()}`;
@@ -101,7 +101,6 @@ export default {
       vm.fileSizeExceededWarning = vm.$ay
         .t("AyaFileFileTooLarge")
         .replace("{0}", "512KiB");
-
       vm.formState.loading = false;
     } catch (err) {
       vm.formState.ready = true;
@@ -139,7 +138,7 @@ export default {
     },
     async upload(size) {
       //similar code in wiki-control
-      let vm = this;
+      const vm = this;
       let fileData = null;
       switch (size) {
         case "small":
@@ -162,7 +161,7 @@ export default {
         return;
       }
       try {
-        let res = await window.$gz.api.uploadLogo(fileData, size);
+        const res = await window.$gz.api.uploadLogo(fileData, size);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -186,18 +185,18 @@ export default {
     },
 
     async remove(size) {
-      let vm = this;
+      const vm = this;
 
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        let url = "logo/" + size;
+        const url = "logo/" + size;
 
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.remove(url);
+        const res = await window.$gz.api.remove(url);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -230,15 +229,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      //   case "save":
-      //     m.vm.submit();
-      //     break;
-      //   case "delete":
-      //     m.vm.remove();
-      //     break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -252,7 +245,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: null,
@@ -260,27 +253,6 @@ function generateMenu(vm) {
     helpUrl: "adm-global-logo",
     menuItems: []
   };
-
-  //   if (vm.rights.change) {
-  //     menuOptions.menuItems.push({
-  //       title: "Save",
-  //       icon: "$ayiSave",
-  //       surface: true,
-  //       key: FORM_KEY + ":save",
-  //       vm: vm
-  //     });
-
-  //     if (vm.rights.delete) {
-  //       menuOptions.menuItems.push({
-  //         title: "ResetToDefault",
-  //         icon: "fa - undo",
-  //         surface: false,
-  //         key: FORM_KEY + ":delete",
-  //         vm: vm
-  //       });
-  //     }
-  //   }
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/adm-global-seeds.vue b/ayanova/src/views/adm-global-seeds.vue
index 220117ad..b5c55c87 100644
--- a/ayanova/src/views/adm-global-seeds.vue
+++ b/ayanova/src/views/adm-global-seeds.vue
@@ -96,9 +96,6 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //NOTE: This is a simple form with no need for business rules or validation so stripped out any extraneous code related to all that
 //
@@ -109,18 +106,15 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.formState.ready = true;
       vm.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-      //modify the menu as necessary
       generateMenu(vm);
       await vm.getDataFromApi();
-
       vm.formState.loading = false;
     } catch (err) {
       vm.formState.ready = true;
@@ -151,13 +145,10 @@ export default {
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -184,13 +175,12 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
 
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        //get current values
-        let res = await window.$gz.api.get(API_BASE_URL);
+        const res = await window.$gz.api.get(API_BASE_URL);
 
         if (res.error) {
           vm.formState.serverError = res.error;
@@ -198,7 +188,6 @@ export default {
         } else {
           vm.obj = res.data;
 
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -207,7 +196,6 @@ export default {
           });
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -216,27 +204,24 @@ export default {
       }
     },
     async submit(aType, nextNumber) {
-      let vm = this;
-      let url = `${API_BASE_URL}${aType}/${nextNumber}`;
-      //clear any errors vm might be around from previous submit
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
-
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       try {
-        let res = await window.$gz.api.put(url);
-
-        vm.formState.loading = false;
+        const res = await window.$gz.api.put(
+          `${API_BASE_URL}${aType}/${nextNumber}`
+        );
+        this.formState.loading = false;
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false
           });
         }
       } catch (error) {
-        vm.formState.loading = false;
-        window.$gz.errorHandler.handleFormError(error, vm);
+        this.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, this);
       }
     }
   }
@@ -249,7 +234,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -271,7 +256,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: null,
@@ -283,7 +268,6 @@ function generateMenu(vm) {
     },
     menuItems: []
   };
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index b6991b11..20553124 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -24,17 +24,6 @@
             >
             </v-select>
           </v-col>
-          <!-- <div>WORKING ARRAY: {{ workingArray }}</div> -->
-
-          <!-- <div>
-              TEMPLATE:
-              {{ obj }}
-            </div>
-
-            <div>
-              available fields:
-              {{ availableFields }}
-            </div> -->
           <template v-for="(item, index) in workingArray">
             <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
               <v-card>
@@ -79,9 +68,6 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //NOTE: This is a simple form with no need for business rules or validation so stripped out any extraneous code related to all that
 //
@@ -103,14 +89,13 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.formState.ready = true;
       vm.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-      //modify the menu as necessary
       generateMenu(vm);
       //init disable save button so it can be enabled only on edit to show dirty form
       window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
@@ -152,13 +137,10 @@ export default {
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -183,7 +165,7 @@ export default {
       });
     },
     move: function(direction, index) {
-      let totalItems = this.workingArray.length;
+      const totalItems = this.workingArray.length;
       let newIndex = 0;
       //calculate new index
       switch (direction) {
@@ -219,7 +201,7 @@ export default {
       });
     },
     templateSelected: function() {
-      let vm = this;
+      const vm = this;
       if (vm.lastFetchedTemplateId == vm.templateId) {
         return; //no change
       }
@@ -232,7 +214,7 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
       if (!vm.templateId || vm.templateId == 0) {
         return;
@@ -240,7 +222,6 @@ export default {
       vm.lastFetchedTemplateId = vm.templateId;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        //get available fields
         let res = await window.$gz.api.get(
           API_BASE_URL + "listfields/" + vm.templateId
         );
@@ -256,18 +237,14 @@ export default {
           }
           await window.$gz.translation.cacheTranslations(vm.fieldKeys);
         }
-
-        //weirdly, this wasn't working properly until I put it in a function, it was just executing immediately before translations were resolved from fetch above
         //get current edited template
         res = await window.$gz.api.get(API_BASE_URL + vm.templateId);
-
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
           synthesizeWorkingArray(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -276,7 +253,6 @@ export default {
           });
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -285,21 +261,17 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
-      let url = API_BASE_URL;
-      //clear any errors vm might be around from previous submit
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
-
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       //Create template data object here....
       //Note that server expects to see a string array of json template, not actual json
-      let newObj = {
-        id: vm.templateId,
+      const newObj = {
+        id: this.templateId,
         template: "[]"
       };
       //temporary array to hold template for later stringification
-      let temp = [];
-      for (let i = 0; i < vm.workingArray.length; i++) {
-        let ti = vm.workingArray[i];
+      const temp = [];
+      for (let i = 0; i < this.workingArray.length; i++) {
+        const ti = this.workingArray[i];
         if (ti.include == true) {
           temp.push({
             fld: ti.key
@@ -309,27 +281,26 @@ export default {
       try {
         //now set the template as a json string
         newObj.template = JSON.stringify(temp);
-        let res = await window.$gz.api.upsert(url, newObj);
-
-        vm.formState.loading = false;
+        const res = await window.$gz.api.upsert(API_BASE_URL, newObj);
+        this.formState.loading = false;
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
           //It's a 204 no data response so no error means it's ok
           //form is now clean
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false
           });
         }
       } catch (error) {
-        vm.formState.loading = false;
-        window.$gz.errorHandler.handleFormError(error, vm);
+        this.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, this);
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       if (
         (await window.$gz.dialog.confirmGeneric(
           "ResetToDefault",
@@ -339,15 +310,10 @@ export default {
         return;
       }
       try {
-        //do the delete
         vm.formState.loading = true;
-        //No need to delete a new record, just abandon it...
         if (vm.templateId && vm.templateId != 0) {
-          let url = API_BASE_URL + vm.templateId;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
-
+          const res = await window.$gz.api.remove(API_BASE_URL + vm.templateId);
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
@@ -357,7 +323,6 @@ export default {
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -375,7 +340,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -397,7 +362,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: null,
@@ -453,14 +418,13 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get(API_BASE_URL + "list");
+  const res = await window.$gz.api.get(API_BASE_URL + "list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
   } else {
     res.data.sort(window.$gz.util.sortByKey("name"));
     vm.selectLists.pickListTemplates = res.data;
-
     window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates);
   }
 }
@@ -472,19 +436,11 @@ function synthesizeWorkingArray(vm) {
   if (vm.obj.template == null) {
     return;
   }
-  let template = JSON.parse(vm.obj.template);
-
+  const template = JSON.parse(vm.obj.template);
   //first, insert the templated fields into the working array so they are in current selected order
   for (let i = 0; i < template.length; i++) {
-    let templateItem = template[i];
-    //de-lodash
-    // let afItem = window.$gz. _.find(vm.availableFields, [
-    //   "fieldKey",
-    //   templateItem.fld
-    // ]);
-
-    let afItem = vm.availableFields.find(z => z.fieldKey == templateItem.fld);
-
+    const templateItem = template[i];
+    const afItem = vm.availableFields.find(z => z.fieldKey == templateItem.fld);
     if (afItem != null) {
       //Push into working array
       vm.workingArray.push({
@@ -498,21 +454,15 @@ function synthesizeWorkingArray(vm) {
 
   //Now iterate all the available fields and insert the ones that were not in the current template
   for (let i = 0; i < vm.availableFields.length; i++) {
-    let afItem = vm.availableFields[i];
+    const afItem = vm.availableFields[i];
     //skip the active column
     if (afItem.isActiveColumn == true) {
       continue;
     }
     //is this field already in the template and was added above?
-    //de-lodash
-    // if (window.$gz ._.find(template, ["fld", afItem.fieldKey]) != null) {
-    //   continue;
-    // }
-
     if (template.find(z => z.fld == afItem.fieldKey) != null) {
       continue;
     }
-
     //Push into working array
     vm.workingArray.push({
       key: afItem.fieldKey,
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 551df133..916f9ff3 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -684,24 +684,14 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "global-settings-edit";
 const API_BASE_URL = "global-biz-setting/";
-//const FORM_CUSTOM_TEMPLATE_KEY = "Global"; //<-- Should always be CoreBizObject AyaType name here where possible
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Global);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -715,7 +705,7 @@ export default {
           loading: false
         });
       } else {
-        await vm.getDataFromApi(); //let getdata handle loading
+        await vm.getDataFromApi();
       }
       window.$gz.form.setFormState({
         vm: vm,
@@ -745,57 +735,51 @@ export default {
   },
   data() {
     return {
-      // formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          filterCaseSensitive: false,
-          useInventory: true,
-          taxPartPurchaseId: null,
-          taxPartSaleId: null,
-          taxRateSaleId: null,
-          workOrderCompleteByAge: "00:00:00",
-          allowScheduleConflicts: false,
-          workOrderTravelDefaultMinutes: 0,
-          workLaborScheduleDefaultMinutes: 0,
-          customerDefaultWorkOrderReportId: null,
-          customerServiceRequestInfoText: null,
-          signatureTitle: null,
-          signatureHeader: null,
-          signatureFooter: null,
-          customerAllowCSR: false,
-          customerAllowCSRInTags: [],
-          customerAllowCSROutTags: [],
-          customerAllowViewWO: false,
-          customerAllowViewWOInTags: [],
-          customerAllowViewWOOutTags: [],
-          customerAllowWOWiki: false,
-          customerAllowWOWikiInTags: [],
-          customerAllowWOWikiOutTags: [],
-          customerAllowUserSettings: false,
-          customerAllowUserSettingsInTags: [],
-          customerAllowUserSettingsOutTags: [],
-          customerAllowNotifyServiceImminent: false,
-          customerAllowNotifyServiceImminentInTags: [],
-          customerAllowNotifyServiceImminentOutTags: [],
-          customerAllowNotifyCSRAccepted: false,
-          customerAllowNotifyCSRAcceptedInTags: [],
-          customerAllowNotifyCSRAcceptedOutTags: [],
-          customerAllowNotifyCSRRejected: false,
-          customerAllowNotifyCSRRejectedInTags: [],
-          customerAllowNotifyCSRRejectedOutTags: [],
-          customerAllowNotifyWOCreated: false,
-          customerAllowNotifyWOCreatedInTags: [],
-          customerAllowNotifyWOCreatedOutTags: [],
-          customerAllowNotifyWOCompleted: false,
-          customerAllowNotifyWOCompletedInTags: [],
-          customerAllowNotifyWOCompletedOutTags: []
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        filterCaseSensitive: false,
+        useInventory: true,
+        taxPartPurchaseId: null,
+        taxPartSaleId: null,
+        taxRateSaleId: null,
+        workOrderCompleteByAge: "00:00:00",
+        allowScheduleConflicts: false,
+        workOrderTravelDefaultMinutes: 0,
+        workLaborScheduleDefaultMinutes: 0,
+        customerDefaultWorkOrderReportId: null,
+        customerServiceRequestInfoText: null,
+        signatureTitle: null,
+        signatureHeader: null,
+        signatureFooter: null,
+        customerAllowCSR: false,
+        customerAllowCSRInTags: [],
+        customerAllowCSROutTags: [],
+        customerAllowViewWO: false,
+        customerAllowViewWOInTags: [],
+        customerAllowViewWOOutTags: [],
+        customerAllowWOWiki: false,
+        customerAllowWOWikiInTags: [],
+        customerAllowWOWikiOutTags: [],
+        customerAllowUserSettings: false,
+        customerAllowUserSettingsInTags: [],
+        customerAllowUserSettingsOutTags: [],
+        customerAllowNotifyServiceImminent: false,
+        customerAllowNotifyServiceImminentInTags: [],
+        customerAllowNotifyServiceImminentOutTags: [],
+        customerAllowNotifyCSRAccepted: false,
+        customerAllowNotifyCSRAcceptedInTags: [],
+        customerAllowNotifyCSRAcceptedOutTags: [],
+        customerAllowNotifyCSRRejected: false,
+        customerAllowNotifyCSRRejectedInTags: [],
+        customerAllowNotifyCSRRejectedOutTags: [],
+        customerAllowNotifyWOCreated: false,
+        customerAllowNotifyWOCreatedInTags: [],
+        customerAllowNotifyWOCreatedOutTags: [],
+        customerAllowNotifyWOCompleted: false,
+        customerAllowNotifyWOCompletedInTags: [],
+        customerAllowNotifyWOCompletedOutTags: []
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -810,16 +794,13 @@ export default {
       ayaType: window.$gz.type.Project
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -833,7 +814,6 @@ export default {
     canSave: function() {
       return this.formState.valid && this.formState.dirty;
     },
-
     ayaTypes: function() {
       return window.$gz.type;
     },
@@ -850,20 +830,15 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
       });
-
-      let url = API_BASE_URL;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -871,9 +846,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -891,40 +864,31 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.put(url, vm.obj);
-
+        const res = await window.$gz.api.put(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-          //Handle "put" of an existing record (UPDATE)
+          //PUT
           vm.obj.concurrency = res.data.concurrency;
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true
           });
-
           //refresh the local global settings cache so user can try their settings right away
           //get the client version of the global settings object values
-          let gsets = await window.$gz.api.get("global-biz-setting/client");
+          const gsets = await window.$gz.api.get("global-biz-setting/client");
           if (!gsets.error) {
             window.$gz.store.commit("setGlobalSettings", gsets.data);
           }
@@ -938,7 +902,6 @@ export default {
         });
       }
     }
-    //end methods
   }
 };
 
@@ -949,13 +912,12 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
         m.vm.submit();
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -969,23 +931,19 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCogs",
-    //title: vm.$ay.t("AdministrationGlobalSettings"),
     title: "AdministrationGlobalSettings",
     helpUrl: "adm-global-settings",
     formData: {
       ayaType: window.$gz.type.Project,
       recordId: vm.$route.params.recordid,
       recordName: vm.$ay.t("AdministrationGlobalSettings")
-      //,
-      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
     },
     menuItems: []
   };
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
@@ -995,9 +953,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -1006,7 +962,6 @@ function generateMenu(vm) {
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index 08b01605..13b045b6 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -19,7 +19,6 @@ export default {
   async created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.Global);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-    //await fetchTranslatedText(this);
     generateMenu(this);
   },
   beforeDestroy() {
@@ -37,7 +36,6 @@ export default {
     handleSelected(selectedItems) {}
   }
 };
-
 /////////////////////////////
 //
 //
@@ -45,15 +43,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "adm-translation",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -62,12 +54,11 @@ function clickHandler(menuItem) {
     }
   }
 }
-
 //////////////////////
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiHistory",
     title: "History",
diff --git a/ayanova/src/views/adm-import.vue b/ayanova/src/views/adm-import.vue
index 54497356..aa1483ef 100644
--- a/ayanova/src/views/adm-import.vue
+++ b/ayanova/src/views/adm-import.vue
@@ -43,7 +43,6 @@
     </v-row>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "adm-import";
 export default {
@@ -73,21 +72,20 @@ export default {
   methods: {
     async upload() {
       //similar code in wiki-control
-      let vm = this;
-      let fileData = [];
-      let importResult = "";
+      const vm = this;
+      const fileData = [];
       for (let i = 0; i < vm.uploadFiles.length; i++) {
-        let f = vm.uploadFiles[i];
+        const f = vm.uploadFiles[i];
         fileData.push({ name: f.name, lastModified: f.lastModified });
       }
-      let at = {
+      const at = {
         ayaType: vm.ayaType,
         files: vm.uploadFiles,
         fileData: JSON.stringify(fileData)
       };
       try {
         vm.uploading = true;
-        let res = await window.$gz.api.upload("import/upload", at);
+        const res = await window.$gz.api.upload("import/upload", at);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -107,7 +105,7 @@ export default {
         vm.uploading = false;
       }
     },
-    handleSelected(selectedItems) {}
+    handleSelected() {}
   }
 };
 
@@ -118,15 +116,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "adm-import",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -140,7 +132,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFileImport",
     title: "Import",
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index 56f52e12..8bdb9469 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -96,7 +96,6 @@
                 $ay.t("CheckForLicense")
               }}</v-btn>
             </v-col>
-            <!-- </div> -->
           </template>
           <template
             v-if="
@@ -221,17 +220,11 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "adm-license";
-const API_BASE_URL = null;
 const FORM_CUSTOM_TEMPLATE_KEY = null;
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.rights = window.$gz.role.getRights(window.$gz.type.License);
@@ -275,17 +268,13 @@ export default {
       rights: window.$gz.role.getRights(window.$gz.type.License)
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -358,7 +347,7 @@ export default {
       ]);
     },
     async sendEvaluationRequest() {
-      let vm = this;
+      const vm = this;
       try {
         if (this.dbIsEmpty != true) {
           //Need to erase database
@@ -384,17 +373,14 @@ export default {
           "license/permanently-erase-all-data",
           "I understand"
         );
-
         //send request
         r = await window.$gz.api.upsert("license/trialRequest", vm.request);
         if (r.error) {
-          //throw new Error(r);
           throw new Error(window.$gz.errorHandler.errorToString(r, vm));
         }
         //a string is returned and will start with E1 if it's an error
         if (r.startsWith("E1")) {
           throw new Error(window.$gz.errorHandler.errorToString(r, vm));
-          //throw new Error(r);
         }
 
         if (r == "ok") {
@@ -410,13 +396,12 @@ export default {
       }
     },
     async fetchKey() {
-      let vm = this;
+      const vm = this;
       try {
         //check if we're still on the same "page" or the server has a different license
         //It might have been just installed by the server on it's own so check if we are not working with the most current license
         let currentServerLicenseInfo = await window.$gz.api.get("license");
         if (currentServerLicenseInfo.error) {
-          //throw new Error(currentServerLicenseInfo.error);
           throw new Error(
             window.$gz.errorHandler.errorToString(currentServerLicenseInfo, vm)
           );
@@ -433,22 +418,18 @@ export default {
           vm.$router.push("/login");
           return;
         }
-
         //call fetch key on server
         let r = await window.$gz.api.upsert("license");
         //r should just be a string response unless there is an error in which case it's an object
         if (r.error) {
-          // throw new Error(r);
           throw new Error(window.$gz.errorHandler.errorToString(r, vm));
         }
 
         if (r.startsWith("E1")) {
-          //throw new Error(r);
           throw new Error(window.$gz.errorHandler.errorToString(r, vm));
         }
         //If here, there is no technical error
         //key might not exist or be not found but no error so r contains the deets
-
         if (r == "ok") {
           //all ok, new key installed time to logout and back in
           await window.$gz.dialog.displayLTModalNotificationMessage(
@@ -466,7 +447,7 @@ export default {
       }
     },
     async erase() {
-      let vm = this;
+      const vm = this;
 
       try {
         if (this.dbIsEmpty != true) {
@@ -520,7 +501,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "fetch":
@@ -548,7 +529,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTicket",
     title: "HelpLicense",
@@ -594,14 +575,12 @@ function generateMenu(vm) {
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   let res = await window.$gz.api.get("license");
-  //We never expect there to be no data here
   if (!res.hasOwnProperty("data")) {
     return Promise.reject(res);
   }
   vm.currentLicenseInfo = res.data.license;
 
   res = await window.$gz.api.get("license/database-empty");
-  //We never expect there to be no data here
   if (!res.hasOwnProperty("data")) {
     return Promise.reject(res);
   }
diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue
index 650289ff..46081352 100644
--- a/ayanova/src/views/adm-report-templates.vue
+++ b/ayanova/src/views/adm-report-templates.vue
@@ -35,7 +35,6 @@ export default {
   async created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.Report);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-    //await fetchTranslatedText(this);
     generateMenu(this);
   },
   beforeDestroy() {
@@ -52,21 +51,19 @@ export default {
   methods: {
     async upload() {
       //similar code in wiki-control
-      let vm = this;
-      let fileData = [];
+      const vm = this;
+      const fileData = [];
       for (let i = 0; i < vm.uploadFiles.length; i++) {
-        let f = vm.uploadFiles[i];
+        const f = vm.uploadFiles[i];
         fileData.push({ name: f.name, lastModified: f.lastModified });
       }
-      let at = {
-        // ayaId: vm.ayaId,
-        // ayaType: vm.ayaType,
+      const at = {
         files: vm.uploadFiles,
         fileData: JSON.stringify(fileData)
       };
       try {
         vm.uploading = true;
-        let res = await window.$gz.api.upload("report/upload", at);
+        const res = await window.$gz.api.upload("report/upload", at);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -91,15 +88,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "adm-translation",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -113,7 +104,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiDraftingCompass",
     title: "ReportList",
@@ -126,12 +117,4 @@ function generateMenu(vm) {
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
-//////////////////////////////////////////////////////////
-//
-// Ensures UI translated text is available
-//
-async function fetchTranslatedText(vm) {
-  await window.$gz.translation.cacheTranslations(["ReadOnly"]);
-}
 </script>
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index 45f78a55..74e32d4f 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <!-- {{ formState }} -->
     <v-row justify="center">
       <v-dialog v-model="replaceDialog" persistent max-width="600px">
         <v-card>
@@ -111,7 +110,7 @@
                       :return-value.sync="props.item.display"
                       :cancel-text="$ay.t('Cancel')"
                       :save-text="$ay.t('OK')"
-                      @save="saveItem(props.item)"
+                      @save="saveItem()"
                     >
                       {{ props.item.display }}
                       <template v-slot:input>
@@ -136,21 +135,14 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "translation-edit";
 const API_BASE_URL = "translation/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Translation"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "Translation";
 
 export default {
   async created() {
-    //created is called when the route is updated to show a new record even though we don't need to re-init again
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -166,7 +158,7 @@ export default {
           this.obj = this.$route.params.obj;
           vm.formState.loading = false; //here we handle it immediately
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         vm.formState.loading = false; //here we handle it immediately
@@ -224,7 +216,6 @@ export default {
       ayaType: window.$gz.type.Translation
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
@@ -232,14 +223,12 @@ export default {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -289,16 +278,12 @@ export default {
       }
       this.replaceDialog = false;
     },
-    saveItem(updatedItem) {
-      //just called to flag as dirty
+    saveItem() {
       window.$gz.form.setFormState({
         vm: this,
         dirty: true
       });
     },
-    // filteredItems() {
-    //   return this.obj.translationItems;//I don't think anything is calling this
-    // },
     canDuplicate: function() {
       return this.formState.valid && !this.formState.dirty && vm.rights.change;
     },
@@ -318,19 +303,17 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
 
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
+
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -339,9 +322,7 @@ export default {
           vm.formState.loading = false;
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -356,30 +337,23 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
 
       try {
         vm.formState.loading = true;
-        let url = API_BASE_URL;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
             //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "adm-translation",
               params: {
@@ -388,17 +362,13 @@ export default {
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
-
             //Update local copy of translations if that's the same one in use
             if (vm.editingActiveTranslation) {
               await window.$gz.translation.updateCache(vm.obj);
             }
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -412,34 +382,26 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
@@ -450,27 +412,26 @@ export default {
       }
     },
     async duplicate() {
-      let vm = this;
+      const vm = this;
       if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
         return;
       }
       vm.formState.loading = true;
-      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         vm.duplicating = true;
-        let res = await window.$gz.api.upsert(url);
+        const res = await window.$gz.api.upsert(
+          API_BASE_URL + "duplicate/" + vm.$route.params.recordid
+        );
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Navigate to new record
           this.$router.push({
             name: "adm-translation",
             params: {
               recordid: res.data.id,
-              obj: res.data // pass data object to new form
+              obj: res.data
             }
           });
         }
@@ -491,7 +452,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -516,7 +477,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Translation,
             selectedRowIds: [m.vm.obj.id]
@@ -529,7 +490,6 @@ async function clickHandler(menuItem) {
         window.$gz.form.setLastReport(FORM_KEY, res);
         generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -543,7 +503,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiLanguage",
@@ -552,12 +512,10 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.Translation,
       recordId: vm.$route.params.recordid,
-      // formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       recordName: vm.obj.name
     },
     menuItems: []
   };
-
   if (vm.rights.change && vm.obj.stock != true) {
     menuOptions.menuItems.push({
       title: "Save",
@@ -567,7 +525,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   if (
     vm.rights.delete &&
     vm.$route.params.recordid != 0 &&
@@ -581,18 +538,13 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
-  //STUB REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
-
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -602,7 +554,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
@@ -612,7 +563,6 @@ function generateMenu(vm) {
     });
   }
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   if (vm.rights.change && vm.obj.stock != true) {
     menuOptions.menuItems.push({
       title: "FindAndReplace",
@@ -624,10 +574,9 @@ function generateMenu(vm) {
 
   //EXPORT
   if (vm.$route.params.recordid != 0) {
-    let href = window.$gz.api.genericDownloadUrl(
+    const href = window.$gz.api.genericDownloadUrl(
       "translation/download/" + vm.$route.params.recordid
     );
-
     menuOptions.menuItems.push({
       title: "Export",
       icon: "$ayiFileDownload",
@@ -650,7 +599,6 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
   await setEditingActiveTranslation(vm);
 }
 
@@ -662,6 +610,7 @@ async function fetchTranslatedText(vm) {
   await window.$gz.translation.cacheTranslations([
     "Translation",
     "Name",
+    "ReadOnly",
     "TranslationKey",
     "TranslationDisplayText",
     "FindAndReplace",
@@ -677,7 +626,9 @@ async function fetchTranslatedText(vm) {
 //
 async function setEditingActiveTranslation(vm) {
   if (vm.$route.params.recordid != 0) {
-    let res = await window.$gz.api.get("user-option/" + vm.$store.state.userId);
+    const res = await window.$gz.api.get(
+      "user-option/" + vm.$store.state.userId
+    );
     vm.editingActiveTranslation =
       res.data.translationId == vm.$route.params.recordid;
   }
diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue
index ac756204..d9e8a8da 100644
--- a/ayanova/src/views/adm-translations.vue
+++ b/ayanova/src/views/adm-translations.vue
@@ -27,14 +27,13 @@
     >
   </div>
 </template>
-
 <script>
 const FORM_KEY = "adm-translations";
 export default {
   async created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.Translation);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-    await fetchTranslatedText(this);
+
     generateMenu(this);
   },
   beforeDestroy() {
@@ -50,14 +49,13 @@ export default {
   },
   methods: {
     async upload() {
-      //similar code in wiki-control
-      let vm = this;
-      let fileData = [];
+      const vm = this;
+      const fileData = [];
       for (let i = 0; i < vm.uploadFiles.length; i++) {
-        let f = vm.uploadFiles[i];
+        const f = vm.uploadFiles[i];
         fileData.push({ name: f.name, lastModified: f.lastModified });
       }
-      let at = {
+      const at = {
         ayaId: vm.ayaId,
         ayaType: vm.ayaType,
         files: vm.uploadFiles,
@@ -65,7 +63,7 @@ export default {
       };
       try {
         vm.uploading = true;
-        let res = await window.$gz.api.upload("translation/upload", at);
+        const res = await window.$gz.api.upload("translation/upload", at);
         if (res.error) {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
@@ -89,15 +87,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "adm-translation",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -111,7 +103,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiLanguage",
     title: "TranslationList",
@@ -124,12 +116,4 @@ function generateMenu(vm) {
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
-//////////////////////////////////////////////////////////
-//
-// Ensures UI translated text is available
-//
-async function fetchTranslatedText(vm) {
-  await window.$gz.translation.cacheTranslations(["ReadOnly"]);
-}
 </script>
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 805cefff..956ac9d2 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -1,15 +1,12 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <v-tabs mobile-breakpoint="100" v-model="tab">
           <v-tab>{{ $ay.t("User") }}</v-tab>
           <v-tab>{{ $ay.t("UserSettings") }}</v-tab>
-
           <v-tabs-items v-model="tab">
             <v-tab-item class="mt-4 ml-2">
               <v-row>
@@ -26,7 +23,6 @@
                     @input="fieldValueChanged('name')"
                   ></v-text-field>
                 </v-col>
-
                 <v-col v-if="obj.userType == 5" cols="12" sm="6" lg="4" xl="3">
                   <gz-pick-list
                     :aya-type="ayaTypes().Vendor"
@@ -40,7 +36,6 @@
                     @input="fieldValueChanged('vendorId')"
                   ></gz-pick-list>
                 </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'EmployeeNumber') && obj.id != 1"
                   cols="12"
@@ -213,7 +208,6 @@
                 ></v-col>
               </v-row>
             </v-tab-item>
-            <!-- v-if="obj.id != 0 || isUnsavedDuplicate" -->
             <v-tab-item class="mt-4 ml-2">
               <v-row>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -408,31 +402,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "user-edit";
 const API_BASE_URL = "user/";
-const FORM_CUSTOM_TEMPLATE_KEY = "User"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "User";
 
 export default {
   async created() {
-    //created is called when the route is updated to show a new record even though we don't need to re-init again
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.User);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -441,7 +424,7 @@ export default {
           this.obj = this.$route.params.obj;
           this.optionsObj = this.$route.params.optionsObj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -464,7 +447,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -515,19 +498,6 @@ export default {
       },
 
       optionsObj: {
-        /*concurrency": 7490431,
-    "translationId": 1,
-    "emailAddress": null,
-    "uiColor": "#000000",
-    "languageOverride": null,
-    "timeZoneOverride": null,
-    "currencyName": "USD",
-    "hour12": true,
-    "userId": 1 
-    
-     CurrencyName = "USD";
-            Hour12 = true;
-            UiColor = "#000000"*/
         id: 0,
         concurrency: 0,
         emailAddress: null,
@@ -542,7 +512,6 @@ export default {
         hour12: true,
         translationId: 1
       },
-
       login: null,
       password: null,
       reveal: true,
@@ -561,22 +530,18 @@ export default {
       ayaType: window.$gz.type.User
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -594,7 +559,6 @@ export default {
       deep: true
     }
   },
-
   methods: {
     goHelp() {
       window.open(
@@ -634,19 +598,15 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -655,17 +615,13 @@ export default {
           vm.formState.loading = false;
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-
           await vm.getUserOptionsDataFromApi();
         }
       } catch (error) {
@@ -674,17 +630,13 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         vm.formState.loading = true;
-        let url = API_BASE_URL;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
         //add in password and login if changed
         if (vm.password != null && vm.password != "") {
           vm.obj.password = vm.password;
@@ -695,20 +647,16 @@ export default {
         if (vm.obj.roles == null) {
           vm.obj.roles = 0;
         }
-        let res = await window.$gz.api.upsert(url, vm.obj);
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
             vm.optionsObj.userId = res.data.id;
             await vm.submitOptions();
-
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
             this.$router.replace({
               name: "adm-user",
               params: {
@@ -718,13 +666,10 @@ export default {
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
             await vm.submitOptions();
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -738,34 +683,26 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
@@ -776,61 +713,22 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "adm-user",
         params: {
           recordid: 0,
-          obj: this.obj, // pass data object to new form
+          obj: this.obj,
           optionsObj: this.optionsObj
         }
       });
     },
-    // async duplicate() {
-    //   let vm = this;
-    //   if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-    //     return;
-    //   }
-    //   vm.formState.loading = true;
-    //   let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
-    //   try {
-    //     window.$gz.form.deleteAllErrorBoxErrors(vm);
-    //     let res = await window.$gz.api.upsert(url);
-    //     if (res.error) {
-    //       vm.formState.serverError = res.error;
-    //       window.$gz.form.setErrorBoxErrors(vm);
-    //     } else {
-    //       vm.obj = res.data;
-    //       await vm.getUserOptionsDataFromApi();
-
-    //       //Navigate to new record
-    //       this.$router.push({
-    //         name: "adm-user",
-    //         params: {
-    //           recordid: res.data.id,
-    //           obj: res.data, // pass data object to new form
-    //           optionsObj: vm.optionsObj
-    //         }
-    //       });
-    //     }
-    //   } catch (ex) {
-    //     window.$gz.errorHandler.handleFormError(ex, vm);
-    //   } finally {
-    //     vm.formState.loading = false;
-    //   }
-    // },
     async getUserOptionsDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
-      let url = `user-option/${vm.obj.id}`;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(`user-option/${vm.obj.id}`);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -838,19 +736,15 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.optionsObj = res.data;
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-          //modify the menu as necessary
           generateMenu(vm);
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -859,18 +753,16 @@ export default {
       }
     },
     async submitOptions() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
-
-        let url = `user-option/${vm.obj.id}`;
-
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         try {
           //always a put but may not have a concurrency token if it's a duplicate
-          let res = await window.$gz.api.put(url, vm.optionsObj);
-
+          const res = await window.$gz.api.put(
+            `user-option/${vm.obj.id}`,
+            vm.optionsObj
+          );
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
@@ -889,10 +781,10 @@ export default {
       }
     },
     async sendResetCode() {
-      let vm = this;
+      const vm = this;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.post(
+        const res = await window.$gz.api.post(
           `auth/request-reset-password/${vm.obj.id}`,
           null
         );
@@ -907,15 +799,13 @@ export default {
       }
     },
     async disableTfa() {
-      let vm = this;
+      const vm = this;
 
       vm.formState.loading = true;
 
-      //clear any errors vm might be around from previous submit
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
-
+        const res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -930,8 +820,6 @@ export default {
         vm.loading = false;
       }
     }
-
-    //------more above here
   }
 };
 
@@ -942,7 +830,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -961,7 +849,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.User,
             selectedRowIds: [m.vm.obj.id]
@@ -974,7 +862,6 @@ async function clickHandler(menuItem) {
         window.$gz.form.setLastReport(FORM_KEY, res);
         generateMenu(m.vm);
         break;
-
       case "directnotify":
         if (m.vm.obj.id == 0) {
           m.vm.$router.push({
@@ -1026,7 +913,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiUser",
@@ -1040,7 +927,6 @@ function generateMenu(vm) {
     },
     menuItems: []
   };
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
@@ -1050,7 +936,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
@@ -1060,18 +945,13 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
-  //STUB REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
-
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1081,7 +961,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
@@ -1090,7 +969,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
@@ -1107,7 +985,6 @@ function generateMenu(vm) {
       key: FORM_KEY + ":directnotify",
       vm: vm
     });
-
     if (vm.rights.change) {
       menuOptions.menuItems.push({
         title: "SendPasswordResetCode",
@@ -1115,7 +992,6 @@ function generateMenu(vm) {
         key: FORM_KEY + ":sendreset",
         vm: vm
       });
-
       if (vm.obj.twoFactorEnabled) {
         menuOptions.menuItems.push({
           title: "AuthDisableTwoFactor",
@@ -1124,7 +1000,6 @@ function generateMenu(vm) {
           vm: vm
         });
       }
-
       if (vm.obj.userType == 1 || vm.obj.userType == 5) {
         menuOptions.menuItems.push({
           title: "WorkOrderItemScheduledUserList",
@@ -1146,7 +1021,6 @@ function generateMenu(vm) {
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
 let JUST_DELETED = false;
 
 /////////////////////////////////
@@ -1162,7 +1036,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "Vendor",
     "User",
@@ -1221,10 +1095,9 @@ async function populateSelectionLists(vm) {
   vm.selectLists.usertypes = window.$gz.enums.getSelectionList(
     "insideusertype"
   );
-
   //------------
   //http://localhost:7575/api/v8/translation/list
-  let res = await window.$gz.api.get("translation/list");
+  const res = await window.$gz.api.get("translation/list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 8a59b867..919e9cc5 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -53,7 +53,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +63,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
         );
         if (res && res.refresh == true) {
@@ -72,7 +72,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User),
             m.id
           );
@@ -80,12 +80,12 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route
-        let selected = m.vm.$refs.gzdatatable.getDataListSelection(
+        const selected = m.vm.$refs.gzdatatable.getDataListSelection(
           window.$gz.type.User
         ).selectedRowIds;
         if (selected.length == 0) {
@@ -96,7 +96,6 @@ async function clickHandler(menuItem) {
           m.vm.$router.push({
             name: "home-notify-direct",
             params: { userIdList: selected.toString() }
-            //params: { userIdList: m.vm.selected.map(z => z.id).toString() }
           });
         }
         break;
@@ -113,7 +112,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUsers",
     title: "UserList",
@@ -134,8 +133,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -143,8 +140,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index be8d9afe..5bc8cecc 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -127,14 +127,11 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/* xeslint-disable */
 import ayaNovaVersion from "../api/ayanova-version";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.formState.ready = true;
@@ -175,12 +172,6 @@ export default {
       return window.$gz.locale;
     },
     canViewLicenseInfo() {
-      /*
-      Service = 1,
-        NotService = 2,
-        Customer = 3,
-        HeadOffice = 4,        
-        ServiceContractor = 5 */
       return (
         window.$gz.store.state.userType == 1 ||
         window.$gz.store.state.userType == 2
@@ -193,7 +184,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     icon: "$ayiInfoCircle",
     title: "HelpAboutAyaNova",
@@ -231,28 +222,19 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == "about" && !m.disabled) {
     switch (m.key) {
       case "contact":
         break;
       case "copysupportinfo":
         //put the support info on the clipboard:
-        let element = document.getElementById("ayaNovaVersioncard");
-        let text = element.innerText || element.textContent;
-
+        const element = document.getElementById("ayaNovaVersioncard");
+        const text = element.innerText || element.textContent;
         let logText = "";
-        //de-lodash
-        // window.$gz. _.forEach(m.vm.$store.state.logArray, function appendLogItem(
-        //   value
-        // ) {
-        //   logText += value + "\n";
-        // });
-
         m.vm.$store.state.logArray.forEach(function appendLogItem(value) {
           logText += value + "\n";
         });
-
         window.$gz.util.copyToClipboard(text + "\nCLIENT LOG\n" + logText);
         break;
       default:
@@ -270,7 +252,7 @@ function clickHandler(menuItem) {
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   await getServerInfo(vm);
-  await getBrowserInfo(vm);
+  getBrowserInfo(vm);
 }
 
 //////////////////////////////////////////////////////////
@@ -305,8 +287,7 @@ async function fetchTranslatedText(vm) {
 ////////////////////
 //
 async function getServerInfo(vm) {
-  let res = await window.$gz.api.get("server-info");
-  //We never expect there to be no data here
+  const res = await window.$gz.api.get("server-info");
   if (!res.hasOwnProperty("data")) {
     return Promise.reject(res);
   } else {
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index bf7c5328..e07a03ff 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -56,9 +56,6 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  CUSTOMIZE A FORM'S FIELDS
 //
@@ -80,14 +77,13 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-      //modify the menu as necessary
       generateMenu(vm);
       //init disable save button so it can be enabled only on edit to show dirty form
       window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
@@ -119,16 +115,12 @@ export default {
       rights: window.$gz.role.getRights(window.$gz.type.FormCustom)
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -168,26 +160,20 @@ export default {
       this.formState.dirty = true;
     },
     async submit() {
-      let vm = this;
-
-      vm.formState.loading = true;
-      let url = API_BASE_URL + vm.formCustomTemplateKey;
-
-      //clear any errors vm might be around from previous submit
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
-
+      this.formState.loading = true;
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       //Create template data object here....
       //Note that server expects to see a string array of json template, not actual json
-      let newObj = {
-        formKey: vm.formCustomTemplateKey,
-        concurrency: vm.concurrency,
+      const newObj = {
+        formKey: this.formCustomTemplateKey,
+        concurrency: this.concurrency,
         template: "[]"
       };
       //temporary array to hold template for later stringification
-      let temp = [];
+      const temp = [];
       //Rules:
-      for (let i = 0; i < vm.obj.length; i++) {
-        let fldItem = vm.obj[i];
+      for (let i = 0; i < this.obj.length; i++) {
+        const fldItem = this.obj[i];
         if (fldItem.custom == false) {
           //Process regular stock field
           //If it's set to hidden or required then it's template-worthy
@@ -214,33 +200,36 @@ export default {
       try {
         //now set the template as a json string
         newObj.template = JSON.stringify(temp);
-        let res = await window.$gz.api.upsert(url, newObj);
+        const res = await window.$gz.api.upsert(
+          API_BASE_URL + this.formCustomTemplateKey,
+          newObj
+        );
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          //Handle "put" of an existing record (UPDATE) (there is no POST of a new record for this particular object)
+          // (there is no POST of a new record for this particular object)
 
           //Set store values for template and token
           //(update our local cached copy of the form customizations)
           window.$gz.formCustomTemplate.set(
-            vm.formCustomTemplateKey,
+            this.formCustomTemplateKey,
             res.data.concurrency,
             newObj.template
           );
           //set our local concurrency token value
-          vm.concurrency = res.data.concurrency;
+          this.concurrency = res.data.concurrency;
 
           //form is now clean
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false
           });
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       } finally {
-        vm.formState.loading = false;
+        this.formState.loading = false;
       }
     },
     hideAll() {
@@ -259,7 +248,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -282,7 +271,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCustomize",
@@ -382,7 +371,6 @@ function populateSelectionLists(vm) {
 //
 function ensureTemplateIsInStore(vm) {
   //Pre-cache if necessary the form customization settings that have been set before now
-
   return window.$gz.formCustomTemplate.get(
     vm.$route.params.formCustomTemplateKey
   );
@@ -393,10 +381,10 @@ function ensureTemplateIsInStore(vm) {
 async function initDataObject(vm) {
   //Get all the fields *available* to this form (all the fields for the object defined in AyaFormFieldDefinitions.cs as SERVER)
   //Note: this is not the actual customization data, just the list of fields that could be customized (or not if required mandatory)
-  let url = "form-field-reference/" + vm.$route.params.formCustomTemplateKey;
-  let res = await window.$gz.api.get(url);
+  const res = await window.$gz.api.get(
+    "form-field-reference/" + vm.$route.params.formCustomTemplateKey
+  );
   if (res.error) {
-    //throw new Error(res.error);
     throw new Error(window.$gz.errorHandler.errorToString(res, vm));
   }
   //set vm.obj to the combined synthesized snapshot array of template and availble fields for working data for this form
@@ -407,7 +395,7 @@ async function initDataObject(vm) {
   //Iterate first  to ensure the cached translations of field keys
   //(due to this form being opened directly from things like record history so might not be cached yet)
   //if they *are* cached then this is a pretty fast operation and no trip is made to the server
-  let requiredTranslations = [];
+  const requiredTranslations = [];
   for (let i = 0; i < res.data.length; i++) {
     if (
       requiredTranslations.indexOf(res.data[i].tKey) === -1 &&
@@ -423,19 +411,15 @@ async function initDataObject(vm) {
     }
   }
   await window.$gz.translation.cacheTranslations(requiredTranslations);
-
   //Iterate a second time to build the working collection
   for (let i = 0; i < res.data.length; i++) {
     //get the formAvailableField record into an object to save typing
-    let faf = res.data[i];
-
+    const faf = res.data[i];
     //get the customTemplate record for this field if it exists
-
     let templateItem = window.$gz.formCustomTemplate.getFieldTemplateValue(
       vm.formCustomTemplateKey,
       faf.fieldKey
     );
-
     //handle non-existent template item (expected)
     if (templateItem == null) {
       templateItem = {
@@ -444,8 +428,7 @@ async function initDataObject(vm) {
         type: 4 //text
       };
     }
-
-    let objItem = {
+    const objItem = {
       key: faf.fieldKey,
       tKey: faf.tKey,
       title: null,
@@ -456,16 +439,13 @@ async function initDataObject(vm) {
       hideable: faf.hideable,
       requireable: faf.requireable
     };
-
     //set title including optional section prepended
     if (faf.tKeySection != null) {
       objItem.title = vm.$ay.t(faf.tKeySection) + "." + vm.$ay.t(faf.tKey);
     } else {
       objItem.title = vm.$ay.t(faf.tKey);
     }
-
     vm.obj.push(objItem);
-
     vm.concurrency = window.$gz.formCustomTemplate.getTemplateConcurrencyToken(
       vm.formCustomTemplateKey
     );
diff --git a/ayanova/src/views/ay-data-list-column-view.vue b/ayanova/src/views/ay-data-list-column-view.vue
index 4a807016..d1b9a067 100644
--- a/ayanova/src/views/ay-data-list-column-view.vue
+++ b/ayanova/src/views/ay-data-list-column-view.vue
@@ -4,7 +4,6 @@
       <v-form data-cy="dlcForm" ref="form">
         <v-row>
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
           <template v-for="(item, index) in editView">
             <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
               <v-card
@@ -66,15 +65,11 @@
   </v-row>
 </template>
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  CUSTOMIZE A DATA GRID'S VISIBLE COLUMNS
 //
 const FORM_KEY = "ay-data-list-column-view";
 const API_BASE_URL = "data-list-column-view/";
-
 export default {
   async beforeRouteLeave(to, from, next) {
     if (!this.formState.dirty) {
@@ -91,14 +86,12 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       vm.dataListKey = this.$route.params.dataListKey;
-
       if (this.$route.params.hiddenAffectiveColumns) {
         vm.hiddenAffectiveColumns = this.$route.params.hiddenAffectiveColumns;
       }
-
       await initForm(vm);
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -138,17 +131,13 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -180,7 +169,7 @@ export default {
       });
     },
     move: function(direction, index) {
-      let totalItems = this.editView.length;
+      const totalItems = this.editView.length;
       let newIndex = 0;
       //calculate new index
       switch (direction) {
@@ -198,13 +187,11 @@ export default {
           if (newIndex > totalItems - 1) {
             newIndex = totalItems - 1;
           }
-
           break;
         case "end":
           newIndex = totalItems - 1;
           break;
       }
-
       this.editView.splice(newIndex, 0, this.editView.splice(index, 1)[0]);
       window.$gz.form.setFormState({
         vm: this,
@@ -221,53 +208,41 @@ export default {
     },
     async submit() {
       if (this.canSave) {
-        let vm = this;
-
-        vm.formState.loading = true;
-
-        let url = API_BASE_URL;
-
-        let columnView = {
-          userId: vm.$store.state.userId,
-          listKey: vm.dataListKey,
-          columns: JSON.stringify(generateColumnViewFromEditView(vm)),
-          sort: vm.obj.sort //not set here, just keep existing one that was fetched when opened this form
+        this.formState.loading = true;
+        const columnView = {
+          userId: this.$store.state.userId,
+          listKey: this.dataListKey,
+          columns: JSON.stringify(generateColumnViewFromEditView(this)),
+          sort: this.obj.sort //not set here, just keep existing one that was fetched when opened this form
         };
-
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(this);
         try {
-          let res = await window.$gz.api.post(url, columnView);
-
-          vm.formState.loading = false;
+          const res = await window.$gz.api.post(API_BASE_URL, columnView);
+          this.formState.loading = false;
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
-            vm.obj = res.data;
-            initWorkingView(vm);
+            this.obj = res.data;
+            initWorkingView(this);
             window.$gz.form.setFormState({
-              vm: vm,
+              vm: this,
               dirty: false,
               valid: true
             });
           }
         } catch (error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
+          this.formState.loading = false;
+          window.$gz.errorHandler.handleFormError(error, this);
         }
       }
     },
     async reset() {
-      let vm = this;
+      const vm = this;
       try {
         vm.formState.loading = true;
-
-        let url = API_BASE_URL + vm.dataListKey;
-
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.remove(url);
-
+        const res = await window.$gz.api.remove(API_BASE_URL + vm.dataListKey);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -282,7 +257,6 @@ export default {
           });
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -300,7 +274,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -325,7 +299,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiColumns",
@@ -384,11 +358,10 @@ async function fetchTranslatedText(vm) {
 ////////////////////
 //
 async function populateFieldDefinitions(vm) {
-  let res = await window.$gz.api.get(
+  const res = await window.$gz.api.get(
     "data-list/listfields?DataListKey=" + vm.dataListKey
   );
   if (res.error) {
-    //throw new Error(res.error);
     throw new Error(window.$gz.errorHandler.errorToString(res, vm));
   } else {
     vm.fieldDefinitions = res.data;
@@ -400,9 +373,9 @@ async function populateFieldDefinitions(vm) {
 // Ensures column names are present in translation table
 //
 async function fetchTranslatedFieldNames(vm) {
-  let columnKeys = [];
+  const columnKeys = [];
   for (let i = 0; i < vm.fieldDefinitions.length; i++) {
-    let cm = vm.fieldDefinitions[i];
+    const cm = vm.fieldDefinitions[i];
     if (!columnKeys.includes(cm.tKey)) {
       columnKeys.push(cm.tKey);
     }
@@ -418,7 +391,7 @@ async function fetchTranslatedFieldNames(vm) {
 //
 //
 async function fetchColumnView(vm) {
-  let res = await window.$gz.api.get(API_BASE_URL + vm.dataListKey);
+  const res = await window.$gz.api.get(API_BASE_URL + vm.dataListKey);
   if (res.error) {
     throw new Error(window.$gz.errorHandler.errorToString(res, vm));
   } else {
@@ -434,68 +407,55 @@ function initWorkingView(vm) {
       "ay-data-list::initWorkingView - fieldDefinitions are not set"
     );
   }
-
-  let ret = [];
-  let columns = JSON.parse(vm.obj.columns);
-
+  const ret = [];
+  const columns = JSON.parse(vm.obj.columns);
   //Pass 1, iterate the columns first
   for (let i = 0; i < columns.length; i++) {
-    let fld = vm.fieldDefinitions.find(z => z.fieldKey == columns[i]);
+    const fld = vm.fieldDefinitions.find(z => z.fieldKey == columns[i]);
     //there can be a column definition that doesn't exist due to updates or misconfiguration or other issues so ignore it if that's the case
     if (fld) {
-      let o = {
+      const o = {
         key: fld.fieldKey,
         title: null,
         include: true
       };
-
       if (fld.tKeySection != null) {
         o.title = vm.$ay.t(fld.tKeySection) + "." + vm.$ay.t(fld.tKey);
       } else {
         o.title = vm.$ay.t(fld.tKey);
       }
-
       if (fld.isRowId) {
         o.rid = true;
       }
-
       ret.push(o);
     }
   }
-
   //Pass 2, remaining fields not already dealt with
   for (let i = 0; i < vm.fieldDefinitions.length; i++) {
-    let fld = vm.fieldDefinitions[i];
-
+    const fld = vm.fieldDefinitions[i];
     if (null == ret.find(z => z.key == fld.fieldKey)) {
       //nope, so add it
-      let o = {
+      const o = {
         key: fld.fieldKey,
         title: null,
         include: false
       };
-
       if (fld.tKeySection != null) {
         o.title = vm.$ay.t(fld.tKeySection) + "." + vm.$ay.t(fld.tKey);
       } else {
         o.title = vm.$ay.t(fld.tKey);
       }
-
       if (fld.isRowId) {
         o.rid = true;
         o.include = true;
       }
-
       if (vm.hiddenAffectiveColumns.includes(fld.fieldKey)) {
         o.affective = true;
       }
-
       ret.push(o);
     }
   }
   vm.editView = ret;
-
-  //eoc
 }
 
 //////////////////////////////////////////////////////////
@@ -503,18 +463,14 @@ function initWorkingView(vm) {
 // Convert editedList view to real list view and return
 //
 function generateColumnViewFromEditView(vm) {
-  let ret = [];
-
+  const ret = [];
   for (let i = 0; i < vm.editView.length; i++) {
-    let ev = vm.editView[i];
+    const ev = vm.editView[i];
     if (!ev.include) {
       continue;
     }
     ret.push(ev.key);
   }
   return ret;
-  //eoc
 }
-
-/////////////END OF FORM//////////////////
 </script>
diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue
index 47144286..27913aa4 100644
--- a/ayanova/src/views/ay-evaluate.vue
+++ b/ayanova/src/views/ay-evaluate.vue
@@ -102,24 +102,16 @@
     </v-row>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ay-evaluate";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.obj.timeZoneOffset =
         Math.floor(new Date().getTimezoneOffset() / 60) * -1;
-      //get rights to generate sample data and erase db I guess
       vm.rights = window.$gz.role.getRights(window.$gz.type.TrialSeeder);
-      //set form readonly if it's so
       vm.formState.readOnly = !vm.rights.change;
       generateMenu(vm);
       vm.formState.ready = true;
@@ -130,7 +122,6 @@ export default {
       window.$gz.errorHandler.handleFormError(err, vm);
     }
   },
-
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
@@ -160,7 +151,6 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
-
   methods: {
     form() {
       return window.$gz.form;
@@ -180,7 +170,7 @@ export default {
       return window.$gz.menu.contactSupportUrl();
     },
     async generate() {
-      let vm = this;
+      const vm = this;
 
       if (vm.formState.readOnly) {
         window.$gz.eventBus.$emit(
@@ -197,7 +187,6 @@ export default {
         if (dialogResult == false) {
           return;
         }
-
         dialogResult = await window.$gz.dialog.confirmGeneric(
           "AdminEraseDatabaseLastWarning",
           "error"
@@ -205,41 +194,22 @@ export default {
         if (dialogResult == false) {
           return;
         }
-
         //call seed route
         let jobId = await window.$gz.api.upsert(
           `trial/seed/${vm.obj.seedLevel}/${vm.obj.timeZoneOffset}`
         );
         if (jobId.error) {
-          //throw new Error(jobId.error);
           throw new Error(window.$gz.errorHandler.errorToString(jobId, vm));
         }
-        jobId = jobId.jobId; //it's in a sub key
-        //indicate loading by setting on button
+        jobId = jobId.jobId;
         vm.seedingJobActive = true;
-
-        /*  /// <summary>
-    /// Job status for opsjobs
-    /// </summary>
-    public enum JobStatus : int
-    {
-        Absent=0,
-        Sleeping = 1,
-        Running = 2,
-        Completed = 3,
-        Failed = 4
-    } */
         let jobStatus = 1;
-        //get status
-
         while (vm.seedingJobActive == true) {
           await window.$gz.util.sleepAsync(2000);
-          //check if done
           jobStatus = await window.$gz.api.get(
             `job-operations/status/${jobId}`
           );
           if (jobStatus.error) {
-            //throw new Error(jobStatus.error);
             throw new Error(
               window.$gz.errorHandler.errorToString(jobStatus, vm)
             );
@@ -252,8 +222,6 @@ export default {
             vm.seedingJobActive = false;
           }
         }
-
-        //Here if it's completed successfully
         window.$gz.eventBus.$emit("notify-success", vm.$ay.t("JobCompleted"));
         vm.$router.push("/login");
       } catch (error) {
@@ -272,7 +240,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       default:
@@ -288,7 +256,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiRocket",
     title: "Evaluate",
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index cd85650a..afa3d8b7 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -6,7 +6,6 @@
     >
     <v-row>
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-col rows="12">
         <template v-if="$route.params.userlog">
           <!-- **** USER LOG ****** -->
@@ -98,21 +97,15 @@
     </v-row>
   </v-card>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ay-history";
 const API_BASE_URL = "event-log/";
 const DEFAULT_EVENTS_PAGE_SIZE = 200;
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.readOnly = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       generateMenu(vm, false);
@@ -196,7 +189,7 @@ export default {
       );
     },
     getIconForPage() {
-      let vm = this;
+      const vm = this;
       if (vm.$route.params.userlog) {
         return vm.ayaTypes[window.$gz.type.User].icon;
       } else {
@@ -245,7 +238,7 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       if (vm.formState.loading) {
         return;
       }
@@ -271,10 +264,9 @@ export default {
       url += "&Offset=" + vm.page * DEFAULT_EVENTS_PAGE_SIZE;
       url += "&limit=" + DEFAULT_EVENTS_PAGE_SIZE;
       try {
-        let res = await window.$gz.api.get(url);
+        const res = await window.$gz.api.get(url);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -286,11 +278,11 @@ export default {
           vm.name = await window.$gz.translation.translateStringWithMultipleKeysAsync(
             res.data.name
           );
-          let temp = res.data.events;
-          let currentEventCount = vm.obj.length;
-          let timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
-          let languageName = window.$gz.locale.getResolvedLanguage();
-          let hour12 = window.$gz.store.state.userOptions.hour12;
+          const temp = res.data.events;
+          const currentEventCount = vm.obj.length;
+          const timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
+          const languageName = window.$gz.locale.getResolvedLanguage();
+          const hour12 = window.$gz.store.state.userOptions.hour12;
           for (let i = 0; i < temp.length; i++) {
             temp[i].date = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
               temp[i].date,
@@ -303,24 +295,17 @@ export default {
             ].name = await window.$gz.translation.translateStringWithMultipleKeysAsync(
               temp[i].name
             );
-
             temp[i].index = currentEventCount + i;
           }
-
           vm.obj = [...vm.obj, ...temp];
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-          //modify the menu as necessary
-          //  generateMenu(vm);
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -338,7 +323,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       default:
@@ -354,7 +339,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     icon: "$ayiHistory",
     title: "History",
@@ -369,17 +354,17 @@ function generateMenu(vm) {
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   await populateAyaTypeList(vm);
-  await populateEventTypeList(vm);
+  populateEventTypeList(vm);
 }
 //////////////////////
 //
 //
 async function populateAyaTypeList(vm) {
   await window.$gz.enums.fetchEnumList("ayatype");
-  let ayt = window.$gz.enums.getSelectionList("ayatype");
-  let temp = {};
+  const ayt = window.$gz.enums.getSelectionList("ayatype");
+  const temp = {};
   for (let i = 0; i < ayt.length; i++) {
-    let item = ayt[i];
+    const item = ayt[i];
     let openableObject = false;
     //CoreBizObject add here
     //todo: centralize this if reuqired one more time anywhere
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index 786014e2..207b124e 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -12,12 +12,10 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/*  Xeslint-disable */
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     window.$gz.eventBus.$emit("menu-change", {
       isMain: false,
       icon: "$ayiInfoCircle",
@@ -26,7 +24,6 @@ export default {
 
       menuItems: []
     });
-
     let outText = "";
     vm.$store.state.logArray.forEach(function appendLogItem(value) {
       outText += value + "\n";
diff --git a/ayanova/src/views/ay-open.vue b/ayanova/src/views/ay-open.vue
index 25f4f99a..57fd7716 100644
--- a/ayanova/src/views/ay-open.vue
+++ b/ayanova/src/views/ay-open.vue
@@ -1,8 +1,10 @@
 <template>
-  <div>Opening...</div>
+  <div>📖...</div>
 </template>
 
 <script>
+//THIS FORM IS USED WHEN CLICKING ON A OPEN URL FROM A NOTIFICATION EMAIL ETC
+//it's only ever called from the router directly for certain urls see below
 export default {
   data() {
     return {};
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 2959b8d7..514ad9b3 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -6,8 +6,6 @@
     >
       <v-progress-circular indeterminate size="64"></v-progress-circular>
     </v-overlay>
-
-    <!-- {{ formState }} -->
     <v-row v-show="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <v-col cols="12" class="d-sm-none accent--text">
@@ -311,42 +309,22 @@
     </v-row>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 import * as monaco from "monaco-editor";
-
 //Monaco editor info page with links
 //https://microsoft.github.io/monaco-editor/
-
 const FORM_KEY = "ay-report-edit";
 let JUST_DELETED = false;
 let editor = null;
 export default {
   async created() {
-    let vm = this;
-
-    // console.log(
-    //   "ay-report created reportdataoptions:",
-    //   vm.$route.params.reportDataOptions
-    // );
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Report);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
-      //console.log("report-edit created params are:", vm.$route.params);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -355,7 +333,7 @@ export default {
           this.obj = this.$route.params.obj;
         } else {
           //FETCH EXISTING
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -375,12 +353,11 @@ export default {
               "notify-error",
               "ay-report-edit::created - missing report data options cannot proceed"
             );
-            // // navigate backwards
+            //
             vm.$router.go(-1);
             return;
           }
           vm.obj.aType = vm.$route.params.reportDataOptions.AType;
-
           //trigger rule breaking / validation
           this.$nextTick(() => {
             this.obj.name = null;
@@ -388,14 +365,12 @@ export default {
           });
         }
       }
-
       //in any case we need the sample data so fetch it here after the setup for new or existing or duplicate is completed above
       await fetchReportData(vm);
-
       //---------------
       //setup the editor and models
-
       //Created editor models for each type of report element that can be edited
+
       vm.editData.template.model = monaco.editor.createModel(
         vm.obj.template,
         "html"
@@ -427,9 +402,8 @@ export default {
       vm.editData.template.state = editor.saveViewState();
 
       //change subscription
-      editor.onDidChangeModelContent(event => {
+      editor.onDidChangeModelContent(() => {
         const editorValue = editor.getValue();
-
         switch (vm.activeTab) {
           case "template":
             vm.obj.template = editorValue;
@@ -450,24 +424,13 @@ export default {
         //pretend the name field changed even though it didn't
         vm.fieldValueChanged("name");
       });
-
       vm.view = "properties";
-
-      //---------------
-
-      // window.$gz.form.setFormState({
-      //   vm: vm,
-      //   dirty: false,
-      //   valid: true
-      // });
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -488,7 +451,7 @@ export default {
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
-    //TODO: dispose all models and editor
+    //dispose all models and editor
     editor && editor.dispose();
   },
 
@@ -498,7 +461,7 @@ export default {
       editAreaHeight: 300,
       activeTab: "properties",
       lastTab: "properties",
-      view: "edit", //"edit","properties","test"
+      view: "edit",
       editData: {
         template: {
           model: null,
@@ -533,10 +496,10 @@ export default {
         template: `<html>
 
 <body>
-	{{#each ayReportData}}
-	<h2>{{ Name }}</h2>
-	<div>Notes: <span class='example'>{{ Notes }}</span></div>
-	{{/each}}
+ {{#each ayReportData}}
+ <h2>{{ Name }}</h2>
+ <div>Notes: <span class='example'>{{ Notes }}</span></div>
+ {{/each}}
 </body>
 
 </html>`,
@@ -602,32 +565,18 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     };
   },
-  /*{"data":{"id":10,"concurrency":19494847,"name":"test basic","active":true,"notes":"",
-  "roles":124927,"aType":2,
-  "template":"<html>\n\n<body>\n\t{{#each ayReportData}}\n\t<h2>{{ Name }}</h2>\n\t<div>Notes: <span class='example'>{{ Notes }}</span></div>\n\t{{/each}}\n</body>\n\n</html>","style":".example {\n  color: blue;\n}","jsPrerender":"async function ayPrepareData(reportData){         \n    //this function (if present) is called with the report data \n    //before the report is rendered\n    //modify data as required here and return it to change the data before the report renders\n    //see the help documentation for details\n    return reportData;\n}","jsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n    return aString.toUpperCase()\n})",
-  "renderType":0,
-  "headerTemplate":null,"footerTemplate":null,"displayHeaderFooter":false,
-  "paperFormat":0,"landscape":false,"marginOptionsBottom":null,
-  "marginOptionsLeft":null,"marginOptionsRight":null,
-  "marginOptionsTop":null,"pageRanges":null,"preferCSSPageSize":false,
-  "printBackground":false,"scale":1}} 
-  */
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
         //enable / disable RENDER button if it can be rendered (has data)
         if (this.reportData != null) {
           if (!val.dirty) {
@@ -641,8 +590,6 @@ Handlebars.registerHelper('loud', function (aString) {
             );
           }
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -680,18 +627,9 @@ Handlebars.registerHelper('loud', function (aString) {
     }
   },
   methods: {
-    //alternate method, one editor with tabs example
-    //probably should do this way
-    //https://github.com/Microsoft/monaco-editor/issues/604
-    //https://github.com/Microsoft/monaco-editor/blob/bad3c34056624dca34ac8be5028ae3454172125c/website/playground/playground.js#L108
-    //https://github.com/microsoft/monaco-editor-samples/tree/master/browser-esm-webpack-monaco-plugin
-    //
     onViewChange() {
-      let vm = this;
-
-      let currentState = editor.saveViewState();
-      let currentModel = editor.getModel();
-      // debugger;
+      const vm = this;
+      const currentState = editor.saveViewState();
       //save edit state before switching
       switch (vm.lastTab) {
         case "properties":
@@ -717,17 +655,13 @@ Handlebars.registerHelper('loud', function (aString) {
           break;
       }
       vm.lastTab = vm.activeTab;
-
-      //set new view stuff
       switch (vm.activeTab) {
         case "properties":
           vm.view = "properties";
           return;
-          break;
         case "pdfoptions":
           vm.view = "pdfoptions";
           return;
-          break;
         case "template":
           editor.setModel(vm.editData.template.model);
           editor.restoreViewState(vm.editData.template.state);
@@ -763,13 +697,12 @@ Handlebars.registerHelper('loud', function (aString) {
         editor.layout();
         editor.focus();
       });
-      // vm.lastTab = vm.activeTab;
     },
     onResize() {
       this.$nextTick(() => {
         //resize related links:
         //https://github.com/Microsoft/monaco-editor/issues/28
-        let el = document.getElementById("editContainer");
+        const el = document.getElementById("editContainer");
         el.style = `width:100%;height:${window.innerHeight * 0.77}px`;
         if (editor != null) {
           editor.layout();
@@ -798,7 +731,7 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -806,12 +739,10 @@ Handlebars.registerHelper('loud', function (aString) {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = "report/" + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.get(url);
+        const res = await window.$gz.api.get("report/" + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -819,9 +750,7 @@ Handlebars.registerHelper('loud', function (aString) {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -839,13 +768,7 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     },
     async submit() {
-      //######################
-      //need to set vm.obj first with model get value of text of each type being edited
-      //as only properties will be set already on obj, the rest is still as it was upon initial fetch
-      //unless I code it to always save to obj on each change of view or something but not necessary really
-      //USE MODEL.getValue() to get the text value of the model being edited
-      //Models sb already set in vm if they were set or edited previously
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -855,37 +778,27 @@ Handlebars.registerHelper('loud', function (aString) {
           vm: vm,
           loading: true
         });
-        let url = "report/"; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert("report/", vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "ay-report-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data, // Pass data object to new form
+                obj: res.data,
                 reportDataOptions: vm.$route.params.reportDataOptions
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -902,41 +815,33 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = "report/" + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            "report/" + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -945,50 +850,46 @@ Handlebars.registerHelper('loud', function (aString) {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "ay-report-edit",
         params: {
           recordid: 0,
-          obj: this.obj, // Pass data object to new form
+          obj: this.obj,
           reportDataOptions: this.$route.params.reportDataOptions
         }
       });
     },
-
     async render() {
-      let vm = this;
+      const vm = this;
       if (vm.$route.params.recordid == 0) {
         return;
       }
-
-      let reportDataOptions = vm.$route.params.reportDataOptions;
+      const reportDataOptions = vm.$route.params.reportDataOptions;
       if (!reportDataOptions) {
         throw new Error(
           "Missing report data: to view report must come here from an object edit form or list so data can be provided for viewing the report"
         );
       }
       reportDataOptions.ReportId = vm.obj.id;
-
       //Meta data from client for use by report script
       reportDataOptions.ClientMeta = window.$gz.api.reportClientMetaData();
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
       });
-      let url = "report/render";
-
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         vm.rendering = true;
-        let res = await window.$gz.api.upsert(url, reportDataOptions);
+        const res = await window.$gz.api.upsert(
+          "report/render",
+          reportDataOptions
+        );
         vm.rendering = false;
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          let reportUrl = window.$gz.api.reportDownloadUrl(res.data);
+          const reportUrl = window.$gz.api.reportDownloadUrl(res.data);
           if (window.open(reportUrl, "Report") == null) {
             vm.formState.serverError =
               "Problem displaying report in new window.  Browser must allow pop-ups to view reports; check your browser setting";
@@ -1008,7 +909,6 @@ Handlebars.registerHelper('loud', function (aString) {
     }
   }
 };
-//end of vue object
 
 /////////////////////////////
 //
@@ -1017,7 +917,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "export":
@@ -1055,7 +955,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiDraftingCompass",
@@ -1120,7 +1020,7 @@ function generateMenu(vm) {
 
   //EXPORT
   if (vm.$route.params.recordid != 0) {
-    let href = window.$gz.api.genericDownloadUrl(
+    const href = window.$gz.api.genericDownloadUrl(
       "report/export/" + vm.$route.params.recordid
     );
 
@@ -1179,7 +1079,7 @@ async function fetchTranslatedText(vm) {
 ////////////////////
 //
 async function fetchReportData(vm) {
-  let reportDataOptions = vm.$route.params.reportDataOptions;
+  const reportDataOptions = vm.$route.params.reportDataOptions;
   if (!reportDataOptions) {
     vm.reportData = null;
     return;
@@ -1190,15 +1090,10 @@ async function fetchReportData(vm) {
     );
   }
   vm.obj.aType = reportDataOptions.AType;
-
   //handle includeWoItemDescendants by adding it's value to the request for report data
   reportDataOptions["includeWoItemDescendants"] =
     vm.obj.includeWoItemDescendants;
-
-  //reportDataOptions["reportDesignerSample"] = true; //used to indicate to server that it should limit the rows returned to a sensible level
-
-  let res = await window.$gz.api.upsert("report/data", reportDataOptions);
-  //We never expect there to be no data here
+  const res = await window.$gz.api.upsert("report/data", reportDataOptions);
   if (!res.hasOwnProperty("data")) {
     return Promise.reject(res);
   } else {
diff --git a/ayanova/src/views/cust-customer-note.vue b/ayanova/src/views/cust-customer-note.vue
index 7c987c8d..79248ef0 100644
--- a/ayanova/src/views/cust-customer-note.vue
+++ b/ayanova/src/views/cust-customer-note.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <!-- {{ formState }} -->
-
     <v-form ref="form" v-if="formState.ready">
       <v-row>
         <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
@@ -60,23 +58,14 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "customer-note-edit";
 const API_BASE_URL = "customer-note/";
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.CustomerNote);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -91,7 +80,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
           if (!vm.customername) {
             await fetchCustomerName(vm).catch(err => {
               window.$gz.errorHandler.handleFormError(err, vm);
@@ -111,7 +100,6 @@ export default {
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -140,9 +128,6 @@ export default {
       },
       customername: undefined,
       obj: {
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
         id: 0,
         concurrency: 0,
         notes: null,
@@ -165,23 +150,17 @@ export default {
       ayaType: window.$gz.type.CustomerNote
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
         } else {
@@ -214,7 +193,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -222,14 +201,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -237,10 +212,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -258,47 +230,36 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "customer-note-edit",
               params: {
                 recordid: res.data.id,
                 customerid: res.data.customerId,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -315,42 +276,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -368,7 +320,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -384,7 +336,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.CustomerNote,
             selectedRowIds: [m.vm.obj.id]
@@ -397,7 +349,6 @@ async function clickHandler(menuItem) {
         window.$gz.form.setLastReport(FORM_KEY, res);
         generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -411,7 +362,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiClipboard",
@@ -444,8 +395,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -453,8 +402,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -473,9 +421,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -506,12 +452,9 @@ async function fetchCustomerName(vm) {
   //If customer name is missing then fetch it here to display
   //this will happen when this form is directly opened from a search
   //or record history etc
-
-  let res = await window.$gz.api.get(
+  const res = await window.$gz.api.get(
     `name/${window.$gz.type.Customer}/${vm.obj.customerId}`
   );
-
-  //We never expect there to be no data here
   if (!res.hasOwnProperty("data")) {
     return Promise.reject(res);
   } else {
diff --git a/ayanova/src/views/cust-customer-notes.vue b/ayanova/src/views/cust-customer-notes.vue
index 4007a079..e53ad2da 100644
--- a/ayanova/src/views/cust-customer-notes.vue
+++ b/ayanova/src/views/cust-customer-notes.vue
@@ -21,13 +21,7 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "cust-customer-notes";
 export default {
   created() {
@@ -51,7 +45,6 @@ export default {
   data() {
     return {
       customerId: undefined,
-      // customername: undefined,
       clientCriteria: undefined,
       preFilterMode: null,
       rights: window.$gz.role.defaultRightsObject(),
@@ -76,7 +69,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -89,7 +82,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.CustomerNote
           )
@@ -100,7 +93,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.CustomerNote
             ),
@@ -110,7 +103,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -126,7 +119,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: !vm.rights.change,
     icon: "$ayiClipboard",
@@ -148,8 +141,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -157,8 +148,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index 9644aa84..2160fc52 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -3,13 +3,11 @@
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <v-tabs mobile-breakpoint="100" v-model="tab" @change="tabChanged">
           <v-tab>{{ $ay.t("Customer") }}</v-tab>
           <v-tab>{{ $ay.t("Address") }}</v-tab>
           <v-tab>{{ $ay.t("Contacts") }}</v-tab>
-
           <v-tabs-items v-model="tab">
             <v-tab-item class="mt-4 ml-2">
               <v-row>
@@ -25,7 +23,6 @@
                     @input="fieldValueChanged('name')"
                   ></v-text-field>
                 </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'AccountNumber')"
                   cols="12"
@@ -170,28 +167,6 @@
                   ></gz-phone>
                 </v-col>
 
-                <!-- <v-col
-                  v-if="form().showMe(this, 'DefaultServiceTemplateId')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-pick-list
-                    :aya-type="ayaTypes().WorkOrderTemplate"
-                    show-edit-icon
-                    v-model="obj.defaultServiceTemplatedId"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('WorkOrderTemplate')"
-                    ref="defaultServiceTemplateId"
-                    data-cy="defaultServiceTemplateId"
-                    :error-messages="
-                      form().serverErrors(this, 'defaultServiceTemplateId')
-                    "
-                    @input="fieldValueChanged('defaultServiceTemplateId')"
-                  ></gz-pick-list>
-                </v-col> -->
-
                 <v-col
                   v-if="form().showMe(this, 'BillHeadOffice')"
                   cols="12"
@@ -742,40 +717,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "customer-edit";
 const API_BASE_URL = "customer/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Customer"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Customer";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     let completelyNew = false;
-    //Prevent returning back to the /0 NEW route after having just created a new record and instead return to the original new source page
-    // console.log("cust-customer created params: ", vm.$route.params);
-    // if (
-    //   vm.$route.params.recordid == null ||
-    //   (vm.$route.params.recordid == 0 && vm.$route.params.newRecord == null) //here recordid will technically be "0" if returned back to it from prior new
-    // ) {
-    //   // navigate backwards
-    //   vm.$router.go(-1);
-    //   return;
-    // }
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Customer);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -783,7 +738,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -799,12 +754,11 @@ export default {
           completelyNew = true;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       generateMenu(vm);
     } catch (error) {
@@ -841,47 +795,43 @@ export default {
       selectLists: {
         usertypes: []
       },
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: undefined,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          webAddress: null,
-          alertNotes: null,
-          billHeadOffice: false,
-          headOfficeId: null,
-          techNotes: null,
-          accountNumber: null,
-          //usesBanking: false,
-          contractId: null,
-          contractExpires: null,
-          defaultServiceTemplateId: null,
-          phone1: null,
-          phone2: null,
-          phone3: null,
-          phone4: null,
-          phone5: null,
-          emailAddress: null,
-          postAddress: null,
-          postCity: null,
-          postRegion: null,
-          postCountry: null,
-          postCode: null,
-          address: null,
-          city: null,
-          region: null,
-          country: null,
-          latitude: null,
-          longitude: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: undefined,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        webAddress: null,
+        alertNotes: null,
+        billHeadOffice: false,
+        headOfficeId: null,
+        techNotes: null,
+        accountNumber: null,
+        //usesBanking: false,
+        contractId: null,
+        contractExpires: null,
+        defaultServiceTemplateId: null,
+        phone1: null,
+        phone2: null,
+        phone3: null,
+        phone4: null,
+        phone5: null,
+        emailAddress: null,
+        postAddress: null,
+        postCity: null,
+        postRegion: null,
+        postCountry: null,
+        postCode: null,
+        address: null,
+        city: null,
+        region: null,
+        country: null,
+        latitude: null,
+        longitude: null
+      },
       tab: 0,
       formState: {
         ready: false,
@@ -905,23 +855,19 @@ export default {
       hour12: window.$gz.locale.getHour12()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -978,7 +924,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -986,14 +932,11 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
+
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -1001,9 +944,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1021,46 +962,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "customer-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1077,42 +1007,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -1121,7 +1042,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "customer-edit",
         params: {
@@ -1137,10 +1057,6 @@ export default {
           await this.contactsGetDataFromApi();
         }
       }
-      // let vm = this;
-      // if (vm[tabIndexToRoute(vm.tab)].isnew) {
-      //   vm.getDataFromApi();
-      // }
     },
     addContact() {
       if (this.obj.id == 0) {
@@ -1159,10 +1075,10 @@ export default {
       });
     },
     rolesDisplayFromRoles(roles) {
-      let roleNames = [];
+      const roleNames = [];
       if (roles != null && roles != 0) {
         for (let i = 0; i < this.availableRoles.length; i++) {
-          let role = this.availableRoles[i];
+          const role = this.availableRoles[i];
           if (!!(roles & role.id)) {
             roleNames.push(role.name);
           }
@@ -1171,16 +1087,15 @@ export default {
       return roleNames.join(", ");
     },
     async contactsGetDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
 
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           `user/customer-contacts/${vm.obj.id}`
         );
         vm.hasFetchedContacts = true;
-
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -1189,14 +1104,9 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           if (res.data) {
-            /*   Id = z.Id,
-                Active = z.Active,
-                Name = z.Name,
-                UserType = z.UserType,
-                LastLogin = z.LastLogin */
-            let ret = [];
+            const ret = [];
             for (let i = 0; i < res.data.length; i++) {
-              let o = res.data[i];
+              const o = res.data[i];
               ret.push({
                 id: o.id,
                 name: o.name,
@@ -1213,13 +1123,11 @@ export default {
                 )
               });
             }
-
             vm.contactsObj = ret;
           } else {
             vm.rawObj = [];
             vm.contactsObj = [];
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1237,25 +1145,23 @@ export default {
       }
     },
     AddressCopyToPostal() {
-      let vm = this;
+      const vm = this;
       vm.obj.postAddress = vm.obj.address;
       vm.obj.postCity = vm.obj.city;
       vm.obj.postRegion = vm.obj.region;
       vm.obj.postCountry = vm.obj.country;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyToPhysical() {
-      let vm = this;
+      const vm = this;
       vm.obj.address = vm.obj.postAddress;
       vm.obj.city = vm.obj.postCity;
       vm.obj.region = vm.obj.postRegion;
       vm.obj.country = vm.obj.postCountry;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyPhysicalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -1278,20 +1184,20 @@ export default {
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
-				if(mAddressType==AddressTypes.Physical)
-				{
-					if(mLatitude!=0 || mLongitude!=0)
-					{
-						sb.Append(" \r\n");
-						sb.Append(LongitudeToString(mLongitude));
-						sb.Append("   ");
-						sb.Append(LatitudeToString(mLatitude));
-						sb.Append(" \r\n");
-					}
-				} */
+    if(mAddressType==AddressTypes.Physical)
+    {
+     if(mLatitude!=0 || mLongitude!=0)
+     {
+      sb.Append(" \r\n");
+      sb.Append(LongitudeToString(mLongitude));
+      sb.Append("   ");
+      sb.Append(LatitudeToString(mLatitude));
+      sb.Append(" \r\n");
+     }
+    } */
     },
     AddressCopyPostalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -1319,10 +1225,10 @@ export default {
       window.$gz.util.copyToClipboard(ret);
     },
     async GeoCapture() {
-      let vm = this;
+      const vm = this;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let loc = await window.$gz.util.getGeoLocation();
+        const loc = await window.$gz.util.getGeoLocation();
         vm.obj.latitude = loc.latitude;
         vm.fieldValueChanged("latitude");
         vm.obj.longitude = loc.longitude;
@@ -1331,8 +1237,6 @@ export default {
         window.$gz.errorHandler.handleFormError(ex, vm);
       }
     }
-
-    //end methods
   }
 };
 
@@ -1343,7 +1247,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1362,7 +1266,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Customer,
             selectedRowIds: [m.vm.obj.id]
@@ -1445,7 +1349,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiAddressCard",
@@ -1480,8 +1384,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1489,8 +1391,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1544,7 +1445,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //MIGRATE_OUTSTANDING show all: unitlist, quotelist, pmlist
   menuOptions.menuItems.push({
     title: "QuoteList",
     icon: "$ayiPencilAlt",
@@ -1558,7 +1458,6 @@ function generateMenu(vm) {
     key: FORM_KEY + ":PMList",
     vm: vm
   });
-  //--- /show all ---
 
   menuOptions.menuItems.push({
     title: "GeoView",
@@ -1568,7 +1467,6 @@ function generateMenu(vm) {
   });
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -1580,8 +1478,6 @@ let JUST_DELETED = false;
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
-  // await populateSelectionLists(vm);
-  // await cacheEnums(vm);
   await createTableHeaders(vm);
 }
 
diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue
index f7fef128..d71b5b12 100644
--- a/ayanova/src/views/cust-customers.vue
+++ b/ayanova/src/views/cust-customers.vue
@@ -7,7 +7,6 @@
       ref="extensions"
     >
     </gz-extensions>
-
     <gz-data-table
       ref="gzdatatable"
       form-key="customer-list"
@@ -85,7 +84,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -95,7 +94,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Customer)
         );
         if (res && res.refresh == true) {
@@ -104,7 +103,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Customer
             ),
@@ -114,7 +113,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -130,7 +129,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiAddressCard",
     title: "CustomerList",
@@ -151,8 +150,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -160,8 +157,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 9807df8f..9e94dfe3 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -1,11 +1,8 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <!-- {{ formState }} -->
-    <!-- {{ obj.contractId }} -->
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <v-tabs mobile-breakpoint="100" v-model="tab" @change="tabChanged">
           <v-tab>{{ $ay.t("HeadOffice") }}</v-tab>
@@ -648,31 +645,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "head-office-edit";
 const API_BASE_URL = "head-office/";
-const FORM_CUSTOM_TEMPLATE_KEY = "HeadOffice"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "HeadOffice";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.HeadOffice);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -680,7 +665,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -694,12 +679,11 @@ export default {
           setDirty = true;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       generateMenu(vm);
     } catch (error) {
@@ -728,42 +712,38 @@ export default {
       selectLists: {
         usertypes: []
       },
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          webAddress: null,
-          accountNumber: null,
-          // usesBanking: false,
-          contractId: null,
-          contractExpires: null,
-          phone1: null,
-          phone2: null,
-          phone3: null,
-          phone4: null,
-          phone5: null,
-          emailAddress: null,
-          postAddress: null,
-          postCity: null,
-          postRegion: null,
-          postCountry: null,
-          postCode: null,
-          address: null,
-          city: null,
-          region: null,
-          country: null,
-          latitude: null,
-          longitude: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        webAddress: null,
+        accountNumber: null,
+        // usesBanking: false,
+        contractId: null,
+        contractExpires: null,
+        phone1: null,
+        phone2: null,
+        phone3: null,
+        phone4: null,
+        phone5: null,
+        emailAddress: null,
+        postAddress: null,
+        postCity: null,
+        postRegion: null,
+        postCountry: null,
+        postCode: null,
+        address: null,
+        city: null,
+        region: null,
+        country: null,
+        latitude: null,
+        longitude: null
+      },
       tab: 0,
       formState: {
         ready: false,
@@ -787,23 +767,17 @@ export default {
       hour12: window.$gz.locale.getHour12()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -860,7 +834,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -868,14 +842,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -883,9 +853,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -903,7 +871,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -913,36 +881,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "head-office-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -959,42 +917,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -1003,7 +952,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "head-office-edit",
         params: {
@@ -1020,10 +968,6 @@ export default {
           await this.contactsGetDataFromApi();
         }
       }
-      // let vm = this;
-      // if (vm[tabIndexToRoute(vm.tab)].isnew) {
-      //   vm.getDataFromApi();
-      // }
     },
     addContact() {
       if (this.obj.id == 0) {
@@ -1042,10 +986,10 @@ export default {
       });
     },
     rolesDisplayFromRoles(roles) {
-      let roleNames = [];
+      const roleNames = [];
       if (roles != null && roles != 0) {
         for (let i = 0; i < this.availableRoles.length; i++) {
-          let role = this.availableRoles[i];
+          const role = this.availableRoles[i];
           if (!!(roles & role.id)) {
             roleNames.push(role.name);
           }
@@ -1054,16 +998,15 @@ export default {
       return roleNames.join(", ");
     },
     async contactsGetDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
 
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(
+        const res = await window.$gz.api.get(
           `user/head-office-contacts/${vm.obj.id}`
         );
         vm.hasFetchedContacts = true;
-
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -1072,14 +1015,9 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           if (res.data) {
-            /*   Id = z.Id,
-                Active = z.Active,
-                Name = z.Name,
-                UserType = z.UserType,
-                LastLogin = z.LastLogin */
-            let ret = [];
+            const ret = [];
             for (let i = 0; i < res.data.length; i++) {
-              let o = res.data[i];
+              const o = res.data[i];
               ret.push({
                 id: o.id,
                 name: o.name,
@@ -1096,13 +1034,11 @@ export default {
                 )
               });
             }
-
             vm.contactsObj = ret;
           } else {
             vm.rawObj = [];
             vm.contactsObj = [];
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1120,25 +1056,23 @@ export default {
       }
     },
     AddressCopyToPostal() {
-      let vm = this;
+      const vm = this;
       vm.obj.postAddress = vm.obj.address;
       vm.obj.postCity = vm.obj.city;
       vm.obj.postRegion = vm.obj.region;
       vm.obj.postCountry = vm.obj.country;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyToPhysical() {
-      let vm = this;
+      const vm = this;
       vm.obj.address = vm.obj.postAddress;
       vm.obj.city = vm.obj.postCity;
       vm.obj.region = vm.obj.postRegion;
       vm.obj.country = vm.obj.postCountry;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyPhysicalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -1161,20 +1095,20 @@ export default {
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
-				if(mAddressType==AddressTypes.Physical)
-				{
-					if(mLatitude!=0 || mLongitude!=0)
-					{
-						sb.Append(" \r\n");
-						sb.Append(LongitudeToString(mLongitude));
-						sb.Append("   ");
-						sb.Append(LatitudeToString(mLatitude));
-						sb.Append(" \r\n");
-					}
-				} */
+    if(mAddressType==AddressTypes.Physical)
+    {
+     if(mLatitude!=0 || mLongitude!=0)
+     {
+      sb.Append(" \r\n");
+      sb.Append(LongitudeToString(mLongitude));
+      sb.Append("   ");
+      sb.Append(LatitudeToString(mLatitude));
+      sb.Append(" \r\n");
+     }
+    } */
     },
     AddressCopyPostalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -1202,10 +1136,10 @@ export default {
       window.$gz.util.copyToClipboard(ret);
     },
     async GeoCapture() {
-      let vm = this;
+      const vm = this;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let loc = await window.$gz.util.getGeoLocation();
+        const loc = await window.$gz.util.getGeoLocation();
         vm.obj.latitude = loc.latitude;
         vm.fieldValueChanged("latitude");
         vm.obj.longitude = loc.longitude;
@@ -1214,8 +1148,6 @@ export default {
         window.$gz.errorHandler.handleFormError(ex, vm);
       }
     }
-
-    //end methods
   }
 };
 
@@ -1226,7 +1158,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1245,7 +1177,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.HeadOffice,
             selectedRowIds: [m.vm.obj.id]
@@ -1292,7 +1224,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiSitemap",
@@ -1327,8 +1259,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1336,8 +1266,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1368,9 +1297,6 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  //---- SHOW ALL ---
-  //todo: this will need to show a customer list filtered by meta filter for headoffices
-  //so the user can then view customer or show all to view all wo, units, quotes etc
   menuOptions.menuItems.push({
     title: "CustomerList",
     icon: "$ayiAddressCard",
@@ -1378,8 +1304,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //--- /show all ---
-
   menuOptions.menuItems.push({
     title: "GeoView",
     icon: "$ayiMapMarked",
@@ -1388,7 +1312,6 @@ function generateMenu(vm) {
   });
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -1400,8 +1323,6 @@ let JUST_DELETED = false;
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
-  // await populateSelectionLists(vm);
-  // await cacheEnums(vm);
   await createTableHeaders(vm);
 }
 
diff --git a/ayanova/src/views/cust-head-offices.vue b/ayanova/src/views/cust-head-offices.vue
index c9adcfba..edf289e6 100644
--- a/ayanova/src/views/cust-head-offices.vue
+++ b/ayanova/src/views/cust-head-offices.vue
@@ -53,7 +53,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +63,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.HeadOffice
           )
@@ -74,7 +74,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.HeadOffice
             ),
@@ -84,7 +84,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +100,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiSitemap",
     title: "HeadOfficeList",
@@ -121,8 +121,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +128,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 5395d2b0..244cb125 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -1,15 +1,12 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <v-tabs mobile-breakpoint="100" v-model="tab">
           <v-tab>{{ $ay.t("Contact") }}</v-tab>
           <v-tab>{{ $ay.t("UserSettings") }}</v-tab>
-
           <v-tabs-items v-model="tab">
             <v-tab-item class="mt-4 ml-2">
               <v-row>
@@ -393,74 +390,21 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "contact-edit";
 const API_BASE_URL = "user/";
 const FORM_CUSTOM_TEMPLATE_KEY = "Contact"; //<--- deliberately not 'User' as is customary as this is it's own form but also edit's User type objects so needs it's own customization key
 
 export default {
   async created() {
-    //created is called when the route is updated to show a new record even though we don't need to re-init again
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       //## NOTE: This is a Contact form so follows Customer rights even  though User object
       vm.rights = window.$gz.role.getRights(window.$gz.type.Customer);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
-      // //id 0 means create or duplicate to new
-      // if (vm.$route.params.recordid != 0) {
-      //   //is there already an obj from a prior operation?
-      //   if (this.$route.params.obj) {
-      //     //yes, no need to fetch it
-      //     this.obj = this.$route.params.obj;
-      //     this.optionsObj = this.$route.params.optionsObj;
-      //     vm.formState.loading = false; //here we handle it immediately
-      //   } else {
-      //     await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
-      //   }
-      // } else {
-      //   vm.password = window.$gz.util.getRandomPassword();
-      //   // vm.login = window.$gz.util.getRandomPassword();
-      //   /* Customer = 3,
-      //   HeadOffice = 4,     */
-      //   if (vm.$route.params.customerid && vm.$route.params.customerid != 0) {
-      //     vm.obj.customerId = vm.$route.params.customerid;
-      //     vm.obj.userType = 3;
-      //   } else if (
-      //     vm.$route.params.headofficeid &&
-      //     vm.$route.params.headofficeid != 0
-      //   ) {
-      //     vm.obj.headOfficeId = vm.$route.params.headofficeid;
-      //     vm.obj.userType = 4;
-      //   } else {
-      //     //no customer or headoffice id, can't proceed
-      //     // navigate backwards
-      //     vm.$router.go(-1);
-      //     //if above turns out to be problematic just go to customers list instead
-      //     // vm.$router.push({
-      //     //   name: "cust-customers"
-      //     // });
-      //   }
-      //   vm.formState.loading = false; //here we handle it immediately
-      // }
-      // //set initial form status
-      // window.$gz.form.setFormState({
-      //   vm: vm,
-      //   dirty: false,
-      //   valid: true
-      // });
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -469,7 +413,7 @@ export default {
           this.obj = this.$route.params.obj;
           this.optionsObj = this.$route.params.optionsObj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -487,9 +431,6 @@ export default {
           setDirty = true;
         } else {
           vm.password = window.$gz.util.getRandomPassword();
-
-          /* Customer = 3,
-        HeadOffice = 4,     */
           if (vm.$route.params.customerid && vm.$route.params.customerid != 0) {
             vm.obj.customerId = vm.$route.params.customerid;
             vm.obj.userType = 3;
@@ -501,23 +442,16 @@ export default {
             vm.obj.userType = 4;
           } else {
             //no customer or headoffice id, can't proceed
-            // navigate backwards
             vm.$router.go(-1);
-            //if above turns out to be problematic just go to customers list instead
-            // vm.$router.push({
-            //   name: "cust-customers"
-            // });
           }
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -565,15 +499,6 @@ export default {
         lastLogin: null
       },
       optionsObj: {
-        /*concurrency": 7490431,
-    "translationId": 1,
-    "emailAddress": null,
-    "uiColor": "#000000",
-    "languageOverride": null,
-    "timeZoneOverride": null,
-    "currencyName": "USD",
-    "hour12": true,
-    "userId": 1 */
         id: 0,
         concurrency: 0,
         emailAddress: null,
@@ -606,22 +531,17 @@ export default {
       ayaType: window.$gz.type.User
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -639,7 +559,6 @@ export default {
       deep: true
     }
   },
-
   methods: {
     goHelp() {
       window.open(
@@ -679,19 +598,15 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -700,17 +615,13 @@ export default {
           vm.formState.loading = false;
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-
           await vm.getUserOptionsDataFromApi();
         }
       } catch (error) {
@@ -719,17 +630,13 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         vm.formState.loading = true;
-        let url = API_BASE_URL;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
         //add in password and login if changed
         if (vm.password != null && vm.password != "") {
           vm.obj.password = vm.password;
@@ -740,20 +647,16 @@ export default {
         if (vm.obj.roles == null) {
           vm.obj.roles = 0;
         }
-        let res = await window.$gz.api.upsert(url, vm.obj);
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
             vm.optionsObj.userId = res.data.id;
             await vm.submitOptions();
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "cust-user",
               params: {
@@ -763,13 +666,10 @@ export default {
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
             await vm.submitOptions();
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -783,34 +683,26 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
@@ -821,57 +713,22 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "cust-user",
         params: {
           recordid: 0,
-          obj: this.obj, // pass data object to new form
+          obj: this.obj,
           optionsObj: this.optionsObj
         }
       });
     },
-    // async duplicate() {
-    //   let vm = this;
-    //   if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-    //     return;
-    //   }
-    //   vm.formState.loading = true;
-    //   let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
-    //   try {
-    //     window.$gz.form.deleteAllErrorBoxErrors(vm);
-    //     let res = await window.$gz.api.upsert(url);
-    //     if (res.error) {
-    //       vm.formState.serverError = res.error;
-    //       window.$gz.form.setErrorBoxErrors(vm);
-    //     } else {
-    //       //Navigate to new record
-    //       this.$router.push({
-    //         name: "adm-user",
-    //         params: {
-    //           recordid: res.data.id,
-    //           obj: res.data // pass data object to new form
-    //         }
-    //       });
-    //     }
-    //   } catch (ex) {
-    //     window.$gz.errorHandler.handleFormError(ex, vm);
-    //   } finally {
-    //     vm.formState.loading = false;
-    //   }
-    // },
     async getUserOptionsDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
-      let url = `user-option/${vm.obj.id}`;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(`user-option/${vm.obj.id}`);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -879,19 +736,15 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.optionsObj = res.data;
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-          //modify the menu as necessary
           generateMenu(vm);
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -900,25 +753,21 @@ export default {
       }
     },
     async submitOptions() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
-
-        let url = `user-option/${vm.obj.id}`;
-
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         try {
-          let res = await window.$gz.api.put(url, vm.optionsObj);
-
+          const res = await window.$gz.api.put(
+            `user-option/${vm.obj.id}`,
+            vm.optionsObj
+          );
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
-
-            //Handle "put" of an existing record (UPDATE)
             vm.optionsObj.concurrency = res.data.concurrency;
             window.$gz.form.setFormState({
               vm: vm,
@@ -932,10 +781,10 @@ export default {
       }
     },
     async sendResetCode() {
-      let vm = this;
+      const vm = this;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.post(
+        const res = await window.$gz.api.post(
           `auth/request-reset-password/${vm.obj.id}`,
           null
         );
@@ -950,15 +799,11 @@ export default {
       }
     },
     async disableTfa() {
-      let vm = this;
-
+      const vm = this;
       vm.formState.loading = true;
-
-      //clear any errors vm might be around from previous submit
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
-
+        const res = await window.$gz.api.post(`auth/totp-disable/${vm.obj.id}`);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -973,8 +818,6 @@ export default {
         vm.loading = false;
       }
     }
-
-    //------more above here
   }
 };
 
@@ -985,7 +828,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -994,17 +837,11 @@ async function clickHandler(menuItem) {
       case "delete":
         m.vm.remove();
         break;
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "adm-user",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       case "duplicate":
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.User,
             selectedRowIds: [m.vm.obj.id]
@@ -1049,7 +886,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiUser",
@@ -1084,8 +921,6 @@ function generateMenu(vm) {
     });
   }
 
-  //STUB REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1093,8 +928,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1104,16 +938,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
-  // if (vm.rights.change) {
-  //   menuOptions.menuItems.push({
-  //     title: "New",
-  //     icon: "$ayiPlus",
-  //     key: FORM_KEY + ":new",
-  //     vm: vm
-  //   });
-  // }
-
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
@@ -1221,11 +1045,10 @@ async function fetchTranslatedText(vm) {
 //
 async function populateSelectionLists(vm) {
   //http://localhost:7575/api/v8/translation/list
-  let res = await window.$gz.api.get("translation/list");
+  const res = await window.$gz.api.get("translation/list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
-    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.translations = res.data;
   }
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index 9299aec3..8a5b8a74 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -53,17 +53,11 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "new":
-      //   m.vm.$router.push({
-      //     name: "cust-user",
-      //     params: { recordid: 0 }
-      //   });
-      //   break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
         );
         if (res && res.refresh == true) {
@@ -72,7 +66,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User),
             m.id
           );
@@ -80,12 +74,12 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route
-        let selected = m.vm.$refs.gzdatatable.getDataListSelection(
+        const selected = m.vm.$refs.gzdatatable.getDataListSelection(
           window.$gz.type.User
         ).selectedRowIds;
         if (selected.length == 0) {
@@ -96,7 +90,6 @@ async function clickHandler(menuItem) {
           m.vm.$router.push({
             name: "home-notify-direct",
             params: { userIdList: selected.toString() }
-            //params: { userIdList: m.vm.selected.map(z => z.id).toString() }
           });
         }
         break;
@@ -113,7 +106,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUsers",
     title: "Contacts",
@@ -124,18 +117,6 @@ function generateMenu(vm) {
     }
   };
 
-  // if (vm.rights.change) {
-  //   menuOptions.menuItems.push({
-  //     title: "New",
-  //     icon: "$ayiPlus",
-  //     surface: true,
-  //     key: FORM_KEY + ":new",
-  //     vm: vm
-  //   });
-  // }
-
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -143,8 +124,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/customer-csr-edit.vue b/ayanova/src/views/customer-csr-edit.vue
index 874a40cf..baae942f 100644
--- a/ayanova/src/views/customer-csr-edit.vue
+++ b/ayanova/src/views/customer-csr-edit.vue
@@ -258,21 +258,13 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "customer-csr-edit";
 const API_BASE_URL = "csr/";
-const FORM_CUSTOM_TEMPLATE_KEY = "CustomerServiceRequest"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "CustomerServiceRequest";
 export default {
   async created() {
-    let vm = this;
-    //'[{"fld":"UnitSerial"},{"fld":"UnitModelModelNumber"},{"fld":"UnitModelVendorID"}]'
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -293,7 +285,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //NEW
@@ -343,50 +335,24 @@ export default {
         status: [],
         priorities: []
       },
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        /*{
-	"data": {
-		"id": 1,
-		"concurrency": 3058764,
-		"name": "We need to quantify the optical SQL circuit!",
-		"notes": "Ab impedit unde voluptate ipsam doloremque deserunt est eos ut.",
-		"wiki": null,
-		"customFields": null,
-		"tags": [
-			"green",
-			"violet"
-		],
-		"dateRequested": "2020-01-10T18:20:31.294229Z",
-		"customerId": 28,
-		"unitId": null,
-		"workOrderItemId": null,
-		"requestedByUserId": 48,
-		"customerReferenceNumber": "65560804",
-		"status": 0,
-		"priority": 2
-	}
-} */
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          dateRequested: window.$gz.locale.nowUTC8601String(),
-          customerId: null,
-          unitId: null,
-          workOrderItemId: null,
-          requestedByUserId: this.$store.state.userId, //window.$gz.store.state.userId, for outside version of this form
-          customerReferenceNumber: null,
-          status: 0,
-          priority: 0
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        dateRequested: window.$gz.locale.nowUTC8601String(),
+        customerId: null,
+        unitId: null,
+        workOrderItemId: null,
+        requestedByUserId: this.$store.state.userId,
+        customerReferenceNumber: null,
+        status: 0,
+        priority: 0
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -401,23 +367,17 @@ export default {
       ayaType: window.$gz.type.CustomerServiceRequest
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -471,7 +431,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -479,14 +439,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -494,9 +450,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -515,46 +469,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "customer-csr-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -571,42 +514,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -615,7 +549,7 @@ export default {
       }
     },
     async reject() {
-      let vm = this;
+      const vm = this;
       if (vm.obj.status != 0 || vm.$route.params.recordid == 0) {
         return;
       }
@@ -623,21 +557,19 @@ export default {
         vm: vm,
         loading: true
       });
-      let url = API_BASE_URL + "reject/" + vm.$route.params.recordid;
-
+      const url = API_BASE_URL + "reject/" + vm.$route.params.recordid;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
+        const res = await window.$gz.api.upsert(url);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Navigate to new record
           this.$router.push({
             name: "csr-edit",
             params: {
               recordid: res.data.id,
-              obj: res.data // Pass data object to new form
+              obj: res.data
             }
           });
         }
@@ -651,7 +583,7 @@ export default {
       }
     },
     async accept(toExistingId) {
-      let vm = this;
+      const vm = this;
       if (vm.obj.status != 0 || vm.$route.params.recordid == 0) {
         return;
       }
@@ -659,24 +591,20 @@ export default {
         vm: vm,
         loading: true
       });
-
       //get workorder if to existing
-
-      let url = `${API_BASE_URL}accept/${vm.$route.params.recordid}/${toExistingId}`;
-
+      const url = `${API_BASE_URL}accept/${vm.$route.params.recordid}/${toExistingId}`;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
+        const res = await window.$gz.api.upsert(url);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Navigate to new record
           this.$router.push({
             name: "csr-edit",
             params: {
               recordid: res.data.id,
-              obj: res.data // Pass data object to new form
+              obj: res.data
             }
           });
         }
@@ -689,7 +617,6 @@ export default {
         });
       }
     }
-    //end methods
   }
 };
 
@@ -700,7 +627,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -719,21 +646,6 @@ async function clickHandler(menuItem) {
       case "acceptnew":
         m.vm.accept(0);
         break;
-      // case "report":
-      //   let res = await m.vm.$refs.reportSelector.open(
-      //     {
-      //       AType: window.$gz.type.CustomerServiceRequest,
-      //       selectedRowIds: [m.vm.obj.id]
-      //     },
-      //     m.id
-      //   );
-      //   if (res == null) {
-      //     return;
-      //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
-      //   break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -747,19 +659,13 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly || vm.obj.status != 0,
     icon: "$ayiConciergeBell",
     title: "CustomerServiceRequest",
     helpUrl: "customer-csr",
     hideSearch: true,
-    // formData: {
-    //   ayaType: window.$gz.type.CustomerServiceRequest,
-    //   recordId: vm.$route.params.recordid,
-    //   formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-    //   recordName: vm.obj.name
-    // },
     menuItems: []
   };
 
@@ -787,54 +693,7 @@ function generateMenu(vm) {
     });
   }
 
-  // //REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // //get last report selected
-  // let lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  // if (lastReport != null) {
-  //   menuOptions.menuItems.push({
-  //     title: lastReport.name,
-  //    notrans: true,
-  //     icon: "$ayiFileAlt",
-  //     key: FORM_KEY + ":report:" + lastReport.id,
-  //     vm: vm
-  //   });
-  // }
-
-  // menuOptions.menuItems.push({ divider: true, inset: false });
-
-  // if (vm.obj.status == 0) {
-  //   menuOptions.menuItems.push({
-  //     title: "CustomerServiceRequestAcceptToNew",
-  //     icon: null,
-  //     key: FORM_KEY + ":acceptnew",
-  //     vm: vm
-  //   });
-
-  //   menuOptions.menuItems.push({
-  //     title: "CustomerServiceRequestAcceptToExisting",
-  //     icon: null,
-  //     key: FORM_KEY + ":acceptexisting",
-  //     vm: vm
-  //   });
-
-  //   menuOptions.menuItems.push({
-  //     title: "CustomerServiceRequestReject",
-  //     icon: null,
-  //     key: FORM_KEY + ":reject",
-  //     vm: vm
-  //   });
-  // }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/customer-csr.vue b/ayanova/src/views/customer-csr.vue
index 37318b89..19e5cab3 100644
--- a/ayanova/src/views/customer-csr.vue
+++ b/ayanova/src/views/customer-csr.vue
@@ -1,12 +1,5 @@
 <template>
   <div>
-    <!-- <gz-report-selector ref="reportSelector"></gz-report-selector> -->
-    <!-- <gz-extensions
-      :aya-type="aType"
-      :selected-items="selectedItems"
-      ref="extensions"
-    >
-    </gz-extensions> -->
     <gz-data-table
       ref="gzdatatable"
       form-key="csr-list"
@@ -54,7 +47,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,30 +56,6 @@ async function clickHandler(menuItem) {
           params: { recordid: 0 }
         });
         break;
-      // case "extensions":
-      //   let res = await m.vm.$refs.extensions.open(
-      //     m.vm.$refs.gzdatatable.getDataListSelection(
-      //       window.$gz.type.CustomerServiceRequest
-      //     )
-      //   );
-      //   if (res && res.refresh == true) {
-      //     m.vm.reload = !m.vm.reload;
-      //   }
-      //   break;
-      //  case "report":
-      //     let res = await m.vm.$refs.reportSelector.open(
-      //       {
-      //         AType: window.$gz.type.CustomerServiceRequest,
-      //         selectedRowIds: [m.vm.obj.id]
-      //       },
-      //       m.id
-      //     );
-      //     if (res == null) {
-      //       return;
-      //     }
-      //     window.$gz.form.setLastReport(FORM_KEY, res);
-      //     generateMenu(m.vm);
-      //     break;
 
       default:
         window.$gz.eventBus.$emit(
@@ -101,7 +70,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiConciergeBell",
     title: "CustomerServiceRequestList",
@@ -122,34 +91,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
-  // //REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // //get last report selected
-  // let lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  // if (lastReport != null) {
-  //   menuOptions.menuItems.push({
-  //     title: lastReport.name,
-  //      notrans: true,
-  //     icon: "$ayiFileAlt",
-  //     key: FORM_KEY + ":report:" + lastReport.id,
-  //     vm: vm
-  //   });
-  // }
-
-  // menuOptions.menuItems.push({
-  //   title: "Extensions",
-  //   icon: "$ayiPuzzlePiece",
-  //   key: FORM_KEY + ":extensions",
-  //   vm: vm
-  // });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 </script>
diff --git a/ayanova/src/views/customer-workorder.vue b/ayanova/src/views/customer-workorder.vue
index 87abf056..5e933b16 100644
--- a/ayanova/src/views/customer-workorder.vue
+++ b/ayanova/src/views/customer-workorder.vue
@@ -21,10 +21,6 @@
 </template>
 
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //THIS FORM IS CREATE ONLY
 //no delete, no duplicate, no fetch, just create or leave
 //
@@ -33,7 +29,7 @@ const FORM_KEY = "customer-workorder";
 
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
 
     try {
       await initForm();
@@ -85,7 +81,6 @@ export default {
     form() {
       return window.$gz.form;
     }
-    //end methods
   }
 };
 
@@ -96,7 +91,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       default:
@@ -112,7 +107,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiTools",
@@ -127,7 +122,6 @@ function generateMenu(vm) {
   };
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/home-dashboard.vue b/ayanova/src/views/home-dashboard.vue
index eb700770..4faac889 100644
--- a/ayanova/src/views/home-dashboard.vue
+++ b/ayanova/src/views/home-dashboard.vue
@@ -71,13 +71,11 @@
 <script>
 const FORM_KEY = "home-dashboard";
 import DashRegistry from "../api/dash-registry";
-
 //---------- DASH ITEMS ----------
 import GzDashTestListWidgetsPriciest from "../components/dash-test-list-widgets-priciest.vue";
 import GzDashTestBarWidgetCountByUserType from "../components/dash-test-bar-widget-count-by-usertype.vue";
 import GzDashTestLineWidgetMonthlyTotalPrice from "../components/dash-test-line-widget-monthly-total-price.vue";
 import GzDashTestDayCalendarWidget from "../components/dash-test-day-calendar-widget.vue";
-
 export default {
   components: {
     GzDashTestListWidgetsPriciest,
@@ -94,7 +92,7 @@ export default {
     });
   },
   async created() {
-    let vm = this;
+    const vm = this;
     //------------------
     //Test ui feedback mechanisms here:
     //this.formState.errorBoxMessage = "This is a test crlf\r\nOnly a test lf\nEot";
@@ -151,7 +149,7 @@ export default {
       this.move("end", id);
     },
     dashRemove: function(id) {
-      let index = this.getEffectiveViewItemIndexById(id);
+      const index = this.getEffectiveViewItemIndexById(id);
       if (index == -1) {
         return;
       }
@@ -159,12 +157,12 @@ export default {
       this.saveView();
     },
     move: function(direction, id) {
-      let index = this.getEffectiveViewItemIndexById(id);
+      const index = this.getEffectiveViewItemIndexById(id);
       if (index == -1) {
         return;
       }
 
-      let totalItems = this.effectiveView.length;
+      const totalItems = this.effectiveView.length;
       let newIndex = 0;
       //calculate new index
       switch (direction) {
@@ -204,14 +202,14 @@ export default {
       this.saveView();
     },
     availableItems: function() {
-      let allItems = DashRegistry.availableItems();
-      let newItems = allItems.filter(
+      const allItems = DashRegistry.availableItems();
+      const newItems = allItems.filter(
         z => !this.effectiveView.find(m => m.id == z.id)
       );
       return newItems;
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -219,27 +217,21 @@ export default {
 
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get("dashboard-view");
-
+        const res = await window.$gz.api.get("dashboard-view");
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          let savedView = JSON.parse(res.data.view);
-          let availableItems = DashRegistry.availableItems();
-          let allowedView = savedView.filter(z =>
+          const savedView = JSON.parse(res.data.view);
+          const availableItems = DashRegistry.availableItems();
+          const allowedView = savedView.filter(z =>
             availableItems.find(m => m.id == z.id)
           );
-
           vm.effectiveView = allowedView;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -257,21 +249,17 @@ export default {
       }
     },
     async saveView() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.put(
+        const res = await window.$gz.api.put(
           "dashboard-view",
           JSON.stringify(vm.effectiveView)
         );
@@ -280,7 +268,6 @@ export default {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -322,7 +309,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "add-dash":
@@ -365,7 +352,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTachometer",
     title: "Dashboard",
@@ -396,21 +383,4 @@ function generateMenu(vm) {
   }
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
-// /////////////////////////////////
-// //
-// //
-// async function initForm(vm) {
-//   await fetchTranslatedText(vm);
-//   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
-//   await populateSelectionLists(vm);
-// }
-
-// //////////////////////////////////////////////////////////
-// //
-// // Ensures UI translated text is available
-// //
-// async function fetchTranslatedText(vm) {
-//   await window.$gz.translation.cacheTranslations(["Widget", "WidgetName"]);
-// }
 </script>
diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue
index 46c2fe4c..8a7e9d85 100644
--- a/ayanova/src/views/home-memo.vue
+++ b/ayanova/src/views/home-memo.vue
@@ -3,7 +3,6 @@
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <template v-if="!composing">
           <v-row>
@@ -158,28 +157,18 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "memo-edit";
 const API_BASE_URL = "memo/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Memo"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Memo";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Memo);
       vm.formState.readOnly = false; //can always do things with your own memos
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         vm.composing = false;
@@ -192,7 +181,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //NEW MEMO, set defaults
@@ -233,25 +222,21 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          viewed: false,
-          replied: false,
-          fromId: 1,
-          toId: 1,
-          sent: null,
-          fromName: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        viewed: false,
+        replied: false,
+        fromId: 1,
+        toId: 1,
+        sent: null,
+        fromName: null
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -271,24 +256,19 @@ export default {
       toUsers: []
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        let hasSelection = this.toUsers.length > 0;
-        //enable / disable save button
+        const hasSelection = this.toUsers.length > 0;
         if (val.dirty && val.valid && !val.readOnly && hasSelection) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
         } else {
@@ -298,23 +278,20 @@ export default {
       deep: true
     }
   },
-
   methods: {
     userSelected(e) {
-      let vm = this;
+      const vm = this;
       if (!e) {
         return;
       }
-      let user = vm.$refs.userid.getFullSelectionValue();
+      const user = vm.$refs.userid.getFullSelectionValue();
       if (vm.selectedUsers.find(z => z.id == user.id)) {
         return;
       }
       vm.selectedUsers.push(user);
     },
     updateSave: function() {
-      let hasSelection = this.toUsers.length > 0;
-
-      //enable / disable save button
+      const hasSelection = this.toUsers.length > 0;
       if (
         this.formState.dirty &&
         this.formState.valid &&
@@ -326,16 +303,15 @@ export default {
         window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
       }
     },
-
     closeChip(item) {
-      let i = this.toUsers.findIndex(z => z.id == item.id);
+      const i = this.toUsers.findIndex(z => z.id == item.id);
       if (i != -1) {
         this.toUsers.splice(i, 1);
       }
       this.updateSave();
     },
     addSelected() {
-      let selected = this.$refs.userPickList.getFullSelectionValue();
+      const selected = this.$refs.userPickList.getFullSelectionValue();
       if (selected == null) {
         return;
       }
@@ -343,7 +319,6 @@ export default {
       if (this.toUsers.find(z => z.id == selected.id)) {
         return;
       }
-
       this.toUsers.push(selected);
       this.pickListSelectedUserId = null;
       this.updateSave();
@@ -364,7 +339,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -372,14 +347,11 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
+
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -387,9 +359,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -407,30 +377,26 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
-      let userIdList = [];
+      const vm = this;
+      const userIdList = [];
       if (vm.toUsers.length > 0) {
         vm.toUsers.forEach(z => {
           userIdList.push(z.id);
         });
       } else {
-        throw "No users selected";
+        throw new Error("No users selected");
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         vm.obj.sent = window.$gz.locale.nowUTC8601String();
-        let res = await window.$gz.api.post(url, {
+        const res = await window.$gz.api.post(API_BASE_URL, {
           users: userIdList,
           memo: vm.obj
         });
-
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -448,42 +414,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           LEAVE_OK = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             LEAVE_OK = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -492,23 +449,21 @@ export default {
       }
     },
     replyForward(forward) {
-      let vm = this;
+      const vm = this;
       if (!forward) {
         //REPLY MODE
         vm.obj.toId = vm.obj.fromId;
         vm.replyMode = true;
         vm.toUsers.push({ id: vm.obj.fromId });
       }
-      let header = `${vm.$ay.t("MemoSent")} ${vm.$ay.dt(
+      const header = `${vm.$ay.t("MemoSent")} ${vm.$ay.dt(
         vm.obj.sent
       )}\n${vm.$ay.t("MemoFromID")} ${vm.obj.fromName}\n${vm.$ay.t(
         "MemoSubject"
       )} ${vm.obj.name}\n`;
-
       vm.obj.name = `${vm.$ay.t("MemoRe")} ${vm.obj.name}`;
       vm.obj.notes = `\n\n-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n${header}\n\n${vm.obj.notes}`;
       vm.obj.id = 0;
-
       vm.composing = true;
       generateMenu(vm);
       window.$gz.form.setFormState({
@@ -517,16 +472,13 @@ export default {
         valid: true,
         loading: false
       });
-
       vm.updateSave();
       this.$nextTick(() => {
-        let el = document.getElementById("notes");
+        const el = document.getElementById("notes");
         el.focus();
         el.setSelectionRange(0, 0);
       });
     }
-
-    //end methods
   }
 };
 
@@ -537,7 +489,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -552,7 +504,7 @@ async function clickHandler(menuItem) {
           params: { recordid: 0 }
         });
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Memo,
             selectedRowIds: [m.vm.obj.id]
@@ -585,7 +537,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiInbox",
@@ -619,8 +571,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -628,8 +578,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -715,21 +664,21 @@ async function fetchTranslatedText(vm) {
   ]);
 } /*
 
-		/// <summary>
-		/// Generate a new memo as a Reply or Forward based on this fetched read only memo
-		/// </summary>
-		/// <param name="bForward">If true, this is a forward reply to don't set the toID just yet</param>
-		/// <returns>A memo object with fields filled in ready for typing reply/forward text</returns>
-		public Memo ReplyForward(bool bForward)
-		{
-			Memo m=Memo.NewItem();
-			if(!bForward)
-				m.ToID=this.FromID;
-			
-			m.Subject=LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.Re")+ " " + this.Subject;
-			m.Message="\r\n\r\n-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r\n" + this.Header + "\r\n\r\n" + this.Message;
-			
-			return m;
-		}
+  /// <summary>
+  /// Generate a new memo as a Reply or Forward based on this fetched read only memo
+  /// </summary>
+  /// <param name="bForward">If true, this is a forward reply to don't set the toID just yet</param>
+  /// <returns>A memo object with fields filled in ready for typing reply/forward text</returns>
+  public Memo ReplyForward(bool bForward)
+  {
+   Memo m=Memo.NewItem();
+   if(!bForward)
+    m.ToID=this.FromID;
+   
+   m.Subject=LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.Re")+ " " + this.Subject;
+   m.Message="\r\n\r\n-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r\n" + this.Header + "\r\n\r\n" + this.Message;
+   
+   return m;
+  }
  */
 </script>
diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue
index 0ae7ca74..7cc35ea6 100644
--- a/ayanova/src/views/home-memos.vue
+++ b/ayanova/src/views/home-memos.vue
@@ -53,7 +53,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +63,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Memo)
         );
         if (res && res.refresh == true) {
@@ -72,7 +72,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Memo),
             m.id
           );
@@ -80,7 +80,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -96,7 +96,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiInbox",
     title: "MemoList",
@@ -117,8 +117,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -126,8 +124,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -137,7 +134,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   menuOptions.menuItems.push({
     title: "Extensions",
     icon: "$ayiPuzzlePiece",
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index 54780d14..5b71f2c6 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -66,7 +66,7 @@
 const FORM_KEY = "notifications";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -116,70 +116,41 @@ export default {
       });
     },
     async deleteItem(item) {
-      //prompt
-      //delete
-
-      let vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.remove(
+        window.$gz.form.deleteAllErrorBoxErrors(this);
+        const res = await window.$gz.api.remove(
           `notify/${item.id}`,
           this.selectedItems
         );
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         }
         await this.getDataFromApi();
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       }
     },
-
     async getDataFromApi() {
-      let vm = this;
-
       try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get("notify/app-notifications");
-
+        window.$gz.form.deleteAllErrorBoxErrors(this);
+        const res = await window.$gz.api.get("notify/app-notifications");
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
-            window.$gz.form.handleObjectNotFound(vm);
+            window.$gz.form.handleObjectNotFound(this);
           }
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          //pre-make the display list object
-          //source object:
-          //[ { "id": 1, "concurrency": 18835104, "userId": 1, "created": "2020-07-20T19:35:49.665888Z", "ayaType": 2,
-          // "objectId": 101, "eventType": 2, "notifySubscriptionId": 1, "message": null, "fetched": true } ]
-          //display object:
-          //{event:"",objectname:"",objecttype:null,icon:null,eventdate:null,openurl:null,suburl:null,eventid}
-
-          let temp = res.data;
-
-          //Nice touch to show super faded just before deletion but don't have time for this at the moment
-          // let dtNow = window.$gz.DateTime.local();
-          // let dtToday = window.$gz.DateTime.local(
-          //   dtNow.year,
-          //   dtNow.month,
-          //   dtNow.day
-          // );
-          // let dtPrecipice = dtToday.plus({ days: -85 }).toUTC();
-
+          const temp = res.data;
           const timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
           const languageName = window.$gz.locale.getResolvedLanguage();
           const hour12 = window.$gz.store.state.userOptions.hour12;
           const currencyName = window.$gz.locale.getCurrencyName();
-
           for (let i = 0; i < temp.length; i++) {
             temp[
               i
@@ -190,24 +161,20 @@ export default {
               hour12
             );
 
-            temp[i]["uievent"] = vm.selectLists.eventTypes.find(
+            temp[i]["uievent"] = this.selectLists.eventTypes.find(
               z => z.id == temp[i].eventType
             ).name;
 
-            temp[i]["uiayatype"] = vm.selectLists.ayaTypes.find(
+            temp[i]["uiayatype"] = this.selectLists.ayaTypes.find(
               z => z.id == temp[i].ayaType
             ).name;
 
             temp[i].icon = window.$gz.util.iconForType(temp[i].ayaType);
 
             if (temp[i].name == "~SERVER~") {
-              temp[i].name = vm.$ay.t("Server");
+              temp[i].name = this.$ay.t("Server");
             }
 
-            // if (temp[i].message && temp[i].message.includes("\n")) {
-            //   temp[i].message = temp[i].message.replace("\n", "<br/>");
-            // }
-
             temp[i].ageValueViz = window.$gz.locale.durationLocalized(
               temp[i].ageValue
             );
@@ -228,33 +195,30 @@ export default {
               temp[i].decValueViz = "";
             }
           }
-
-          vm.obj = [...temp];
-
-          //modify the menu as necessary
-          generateMenu(vm);
-          //Update the form status
+          this.obj = [...temp];
+          generateMenu(this);
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false,
             valid: true,
             loading: false
           });
-
           //Check the new count and update accordingly
           //this is to ensure that when a user is viewing the latest notifications they don't see the NEW count still in the bell icon in menu since they are viewing them live
-          let status = await window.$gz.api.get("notify/new-count");
+          const status = await window.$gz.api.get("notify/new-count");
           if (status.error) {
             //throw new Error(status.error);
-            throw new Error(window.$gz.errorHandler.errorToString(status, vm));
+            throw new Error(
+              window.$gz.errorHandler.errorToString(status, this)
+            );
           }
           window.$gz.store.commit("setNewNotificationCount", status.data);
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
       }
@@ -269,16 +233,12 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "refresh":
         await m.vm.getDataFromApi();
         break;
-      // case "directnotify":
-      //   let res = await m.vm.$refs.extensions.open();
-      //   break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -292,7 +252,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBell",
     title: "Notifications",
diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue
index 9300cb01..d88f0fb9 100644
--- a/ayanova/src/views/home-notify-direct.vue
+++ b/ayanova/src/views/home-notify-direct.vue
@@ -3,7 +3,6 @@
     <v-col>
       <v-form ref="form">
         <v-row>
-          <!-- {{ toUsers }} -->
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
           <v-col cols="12">
             <gz-pick-list
@@ -46,23 +45,15 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "notify-direct";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.fullRightsObject();
       generateMenu(vm);
-
       vm.formState.ready = true;
       window.$gz.form.setFormState({
         vm: vm,
@@ -72,9 +63,6 @@ export default {
         readOnly: false
       });
       window.$gz.eventBus.$on("menu-click", clickHandler);
-      //-------------
-
-      //------------------
     } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
@@ -114,18 +102,13 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-
-        let hasSelection = this.toUsers.length > 0;
+        const hasSelection = this.toUsers.length > 0;
         if (val.dirty && val.valid && !val.readOnly && hasSelection) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -142,8 +125,7 @@ export default {
   },
   methods: {
     updateSave: function() {
-      let hasSelection = this.toUsers.length > 0;
-      //enable / disable save button
+      const hasSelection = this.toUsers.length > 0;
       if (
         this.formState.dirty &&
         this.formState.valid &&
@@ -156,22 +138,20 @@ export default {
       }
     },
     closeChip(item) {
-      let i = this.toUsers.findIndex(z => z.id == item.id);
+      const i = this.toUsers.findIndex(z => z.id == item.id);
       if (i != -1) {
         this.toUsers.splice(i, 1);
       }
       this.updateSave();
     },
     addSelected() {
-      let selected = this.$refs.userPickList.getFullSelectionValue();
+      const selected = this.$refs.userPickList.getFullSelectionValue();
       if (selected == null) {
         return;
       }
-      //already in the list?
       if (this.toUsers.find(z => z.id == selected.id)) {
         return;
       }
-
       this.toUsers.push(selected);
       this.pickListSelectedUserId = 0;
       this.updateSave();
@@ -179,7 +159,6 @@ export default {
     ayaTypes: function() {
       return window.$gz.type;
     },
-
     form() {
       return window.$gz.form;
     },
@@ -193,49 +172,40 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
-
-      vm.formState.loading = true;
-
-      //always submit from this form for the current logged in user id
-      let url = "notify/direct-message";
-
-      //clear any errors vm might be around from previous submit
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
+      this.formState.loading = true;
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       try {
-        let userIdList = [];
-        if (vm.toUsers.length > 0) {
-          vm.toUsers.forEach(z => {
+        const userIdList = [];
+        if (this.toUsers.length > 0) {
+          this.toUsers.forEach(z => {
             userIdList.push(z.id);
           });
         } else {
-          //just accept the single userid in the pickLkist
-          userIdList.push(vm.pickListSelectedUserId);
+          userIdList.push(this.pickListSelectedUserId);
         }
-        let res = await window.$gz.api.upsert(url, {
+        const res = await window.$gz.api.upsert("notify/direct-message", {
           users: userIdList,
           message: this.message
         });
-
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          vm.pickListSelectedUserId = null;
-          vm.items = [];
-          vm.toUsers = [];
-          vm.message = null;
+          this.pickListSelectedUserId = null;
+          this.items = [];
+          this.toUsers = [];
+          this.message = null;
           //Only a post, no data returned
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false
           });
-          vm.updateSave();
+          this.updateSave();
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       } finally {
-        vm.loading = false;
+        this.loading = false;
       }
     }
   }
@@ -248,7 +218,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -268,15 +238,13 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCommentAlt",
     title: "DirectNotification",
     helpUrl: "home-notify-direct",
-
     menuItems: []
   };
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
@@ -286,7 +254,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -319,7 +286,6 @@ async function fetchTranslatedText(vm) {
 //
 async function preFillSelection(vm) {
   var idParam = vm.$route.params.userIdList;
-
   let l = [];
   if (typeof idParam == "string" && idParam.includes(",")) {
     //just a random list of user ids seperated by commas
@@ -328,13 +294,11 @@ async function preFillSelection(vm) {
     //single value
     l.push(parseInt(idParam, 10));
   }
-
-  let res = await window.$gz.api.post("pick-list/list", {
+  const res = await window.$gz.api.post("pick-list/list", {
     ayaType: window.$gz.type.User,
     inactive: false,
     preselectedIds: l
   });
-
   if (res.data && res.data.length > 0) {
     res.data.forEach(x => {
       vm.toUsers.push(x);
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 86ae1de0..32176329 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -5,7 +5,6 @@
         <v-form ref="form">
           <v-row>
             <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-            <!-- {{ obj }} -->
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-select
                 v-model="obj.eventType"
@@ -51,7 +50,6 @@
                         >$ayiCheckCircle</v-icon
                       ></v-list-item-title
                     >
-
                     <v-list-item-subtitle>
                       {{ data.item.notes }}</v-list-item-subtitle
                     >
@@ -194,51 +192,18 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "notify-subscription";
 const API_BASE_URL = "notify-subscription/";
-
 export default {
   async created() {
-    //created is called when the route is updated to show a new record even though we don't need to re-init again
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.NotifySubscription);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
-      // //id 0 means create or duplicate to new
-      // if (vm.$route.params.recordid != 0) {
-      //   //is there already an obj from a prior operation?
-      //   if (this.$route.params.obj) {
-      //     //yes, no need to fetch it
-      //     this.obj = this.$route.params.obj;
-      //     vm.formState.loading = false; //here we handle it immediately
-      //   } else {
-      //     await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
-      //   }
-      // } else {
-      //   //default to their configured email address on new record
-      //   this.obj.deliveryAddress = this.$store.state.userOptions.emailAddress;
-      //   vm.formState.loading = false; //here we handle it immediately
-      // }
-      // //set initial form status
-      // window.$gz.form.setFormState({
-      //   vm: vm,
-      //   dirty: false,
-      //   valid: true
-      // });
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -246,7 +211,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -260,14 +225,12 @@ export default {
           this.obj.deliveryAddress = this.$store.state.userOptions.emailAddress;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -297,22 +260,6 @@ export default {
         deliveryMethods: [],
         coreAyaTypes: []
       },
-      /*   public long Id { get; set; }
-        public uint Concurrency { get; set; }
-
-        [Required]
-        public long UserId { get; set; }
-        public AyaType? AyaType { get; set; }
-        [Required]
-        public NotifyEventType EventType { get; set; }
-        public TimeSpan? AdvanceNotice { get; set; }   //Note: I've been doing nullable wrong sort of: https://stackoverflow.com/a/29149207/8939 
-        public long? IdValue { get; set; }
-        public decimal? DecValue { get; set; }
-        [Required]
-        public NotifyDeliveryMethod DeliveryMethod { get; set; }
-        public string DeliveryAddress { get; set; }
-        public long? LinkReportId { get; set; }
-        public List<string> tags { get; set; }*/
       obj: {
         id: 0,
         concurrency: 0,
@@ -327,7 +274,6 @@ export default {
         linkReportId: 0,
         tags: []
       },
-
       formState: {
         ready: false,
         dirty: false,
@@ -342,22 +288,17 @@ export default {
       ayaType: window.$gz.type.NotifySubscription
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -402,7 +343,6 @@ export default {
       //UnitMeterReadingMultipleExceeded=26,
       return this.obj.eventType == 26;
     },
-
     showAyaType() {
       switch (this.obj.eventType) {
         case 1:
@@ -486,7 +426,6 @@ export default {
         !this.formState.loading &&
         !this.formState.readOnly
       ) {
-        //"fieldValueChanged('eventType')"
         //if it's a general notification make sure delivery is set to email
         if (ref == "eventType" && this.obj.eventType == 27) {
           this.obj.deliveryMethod = 2;
@@ -495,19 +434,15 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -516,11 +451,7 @@ export default {
           vm.formState.loading = false;
         } else {
           vm.obj = res.data;
-
-          //modify the menu as necessary
           generateMenu(vm);
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -535,48 +466,37 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
 
       try {
         vm.formState.loading = true;
-        let url = API_BASE_URL;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
         //don't send the deliveryaddress if it's an in-app notification
         if (vm.obj.deliveryMethod == 1) {
           vm.obj.deliveryAddress = null;
         }
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "home-notify-subscription",
               params: {
                 recordid: res.data.id,
-                obj: res.data //Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -590,34 +510,26 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
@@ -628,7 +540,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "home-notify-subscription",
         params: {
@@ -647,7 +558,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -665,20 +576,6 @@ async function clickHandler(menuItem) {
       case "duplicate":
         m.vm.duplicate();
         break;
-      // case "report":
-      //   let res = await m.vm.$refs.reportSelector.open(
-      //     {
-      //       AType: window.$gz.type.NotifySubscription,
-      //       selectedRowIds: [m.vm.obj.id]
-      //     },
-      //     m.id
-      //   );
-      //   if (res == null) {
-      //     return;
-      //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -692,7 +589,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiBullhorn",
@@ -753,7 +650,6 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  //   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
   await populateSelectionLists(vm);
 }
 
@@ -787,7 +683,6 @@ async function populateSelectionLists(vm) {
   if (window.$gz.store.getters.isCustomerUser) {
     vm.selectLists.eventTypes = tempEventTypes.filter(z => {
       //return true if it's a type allowed by customer *and* they have customerRights to it
-
       switch (z.id) {
         case 6:
           return window.$gz.store.state.customerRights.notifyCSRAccepted;
@@ -808,15 +703,12 @@ async function populateSelectionLists(vm) {
       z => z.id != 6 && z.id != 7 && z.id != 21 && z.id != 31
     );
   }
-
   await window.$gz.enums.fetchEnumList("NotifyDeliveryMethod");
   vm.selectLists.deliveryMethods = window.$gz.enums.getSelectionList(
     "NotifyDeliveryMethod"
   );
-
   await window.$gz.enums.fetchEnumList("coreview");
   vm.selectLists.coreAyaTypes = window.$gz.enums.getSelectionList("coreview");
-
   const res = await window.$gz.api.get("work-order-status/list");
   if (res.error) {
     vm.formState.serverError = res.error;
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 28afa94c..03069578 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -16,12 +16,11 @@
     </v-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "notify-subscriptions";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       vm.formState.readOnly = false;
@@ -60,12 +59,11 @@ export default {
       });
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get("notify-subscription/list");
+        const res = await window.$gz.api.get("notify-subscription/list");
 
         if (res.error) {
           if (res.error.code == "2010") {
@@ -75,21 +73,18 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           if (res.data) {
-            let ret = [];
-            //const timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
+            const ret = [];
             const languageName = window.$gz.locale.getResolvedLanguage();
-            //const hour12 = window.$gz.store.state.userOptions.hour12;
             const currencyName = window.$gz.locale.getCurrencyName();
-
             for (let i = 0; i < res.data.length; i++) {
-              let o = res.data[i];
+              const o = res.data[i];
               let info = "";
               if (o.status != "") {
                 info += o.status;
               }
               if (o.decValue && o.decValue != 0) {
                 //currently is only currency for "The Andy" so format as currency
-                let t = window.$gz.locale.currencyLocalized(
+                const t = window.$gz.locale.currencyLocalized(
                   o.decValue,
                   languageName,
                   currencyName
@@ -99,12 +94,11 @@ export default {
                 }
               }
               if (o.ageValue) {
-                let t = window.$gz.locale.durationLocalized(o.ageValue);
+                const t = window.$gz.locale.durationLocalized(o.ageValue);
                 if (info != "" && t != "") {
                   info += ` - ${t}`;
                 }
               }
-
               let eventDisplay = window.$gz.enums.get(
                 "NotifyEventType",
                 o.eventType
@@ -112,7 +106,6 @@ export default {
               if (info && info != "") {
                 eventDisplay += ` - ${info}`;
               }
-
               ret.push({
                 id: o.id,
                 eventType: eventDisplay,
@@ -125,12 +118,10 @@ export default {
                 tags: window.$gz.util.formatTags(o.tags)
               });
             }
-
             vm.obj = ret;
           } else {
             vm.obj = [];
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -157,7 +148,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -180,7 +171,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBullhorn",
     title: "NotifySubscriptionList",
@@ -209,7 +200,7 @@ function generateMenu(vm) {
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  await cacheEnums(vm);
+  await cacheEnums();
   await createTableHeaders(vm);
 }
 
@@ -231,8 +222,7 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-async function cacheEnums(vm) {
-  //ensure the enum values required are pre-fetched
+async function cacheEnums() {
   await window.$gz.enums.fetchEnumList("NotifyEventType");
   await window.$gz.enums.fetchEnumList("NotifyDeliveryMethod");
   await window.$gz.enums.fetchEnumList("coreview");
@@ -245,7 +235,6 @@ async function createTableHeaders(vm) {
   vm.headers = [
     { text: vm.$ay.t("ID"), value: "id" },
     { text: vm.$ay.t("NotifyEventType"), value: "eventType" },
-    // { value: "info" },
     { text: vm.$ay.t("AyaType"), value: "ayaType" },
     { text: vm.$ay.t("NotifyDeliveryMethod"), value: "deliveryMethod" },
     { text: vm.$ay.t("NotifyDeliveryAddress"), value: "deliveryAddress" },
diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue
index 615584c4..7d9a8a5c 100644
--- a/ayanova/src/views/home-password.vue
+++ b/ayanova/src/views/home-password.vue
@@ -4,7 +4,6 @@
       <v-form ref="form">
         <v-row>
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
           <v-col cols="12">
             <v-text-field
               name="username"
@@ -83,18 +82,12 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "home-password";
 const API_BASE_URL = "auth/change-password";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -165,17 +158,13 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -203,32 +192,25 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
-      if (vm.canSave) {
-        vm.formState.loading = true;
-
-        //always submit from this form for the current logged in user id
-        let url = API_BASE_URL;
-
-        //clear any errors vm might be around from previous submit
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
+      if (this.canSave) {
+        this.formState.loading = true;
+        window.$gz.form.deleteAllErrorBoxErrors(this);
         try {
-          let res = await window.$gz.api.upsert(url, vm.obj);
-
+          const res = await window.$gz.api.upsert(API_BASE_URL, this.obj);
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
             //Only a post, no data returned
             window.$gz.form.setFormState({
-              vm: vm,
+              vm: this,
               dirty: false
             });
           }
         } catch (error) {
-          window.$gz.errorHandler.handleFormError(error, vm);
+          window.$gz.errorHandler.handleFormError(error, this);
         } finally {
-          vm.loading = false;
+          this.loading = false;
         }
       }
     }
@@ -242,13 +224,12 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
         m.vm.submit();
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -262,7 +243,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiKey",
     title: "SetLoginPassword",
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index 2f65512c..3b98ceb9 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -129,65 +129,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "reminder-edit";
 const API_BASE_URL = "reminder/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Reminder"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Reminder";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Reminder);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
-      // //id 0 means create or duplicate to new
-      // if (vm.$route.params.recordid != 0) {
-      //   //is there already an obj from a prior operation?
-      //   if (this.$route.params.obj) {
-      //     //yes, no need to fetch it
-      //     this.obj = this.$route.params.obj;
-      //     window.$gz.form.setFormState({
-      //       vm: vm,
-      //       loading: false
-      //     });
-      //   } else {
-      //     await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
-      //   }
-      // } else {
-      //   //----------------------------------------------------------
-      //   //NEW OBJECT DEFAULTS
-      //   let defaultDates = window.$gz.locale.defaultStartDateTime(
-      //     window.$gz.type.Reminder
-      //   );
-      //   vm.obj.startDate = defaultDates.start;
-      //   vm.obj.stopDate = defaultDates.end;
-      //   //----------------------------------------------------------
-
-      //   window.$gz.form.setFormState({
-      //     vm: vm,
-      //     loading: false
-      //   });
-      // }
-      // window.$gz.form.setFormState({
-      //   vm: vm,
-      //   dirty: false,
-      //   valid: true
-      // });
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -195,7 +149,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -216,7 +170,7 @@ export default {
           } else {
             //----------------------------------------------------------
             //NEW OBJECT DEFAULTS
-            let defaultDates = window.$gz.locale.defaultStartDateTime(
+            const defaultDates = window.$gz.locale.defaultStartDateTime(
               window.$gz.type.Reminder
             );
             vm.obj.startDate = defaultDates.start;
@@ -230,7 +184,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -257,26 +211,20 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          startDate: null,
-          stopDate: null,
-          userId: window.$gz.store.state.userId,
-          color: "#EBEBEBFF" //very light gray or it will be invisible in white schedule control
-        },
-      //mStartDate = new SmartDate(DBUtil.CurrentWorkingDateTime);//case 1967 set starting date so can't save with no date
-      //mStopDate = new SmartDate(DBUtil.CurrentWorkingDateTime.AddHours(1));//case 1967 starting default
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        startDate: null,
+        stopDate: null,
+        userId: window.$gz.store.state.userId,
+        color: "#EBEBEBFF" //very light gray or it will be invisible in white schedule control
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -291,23 +239,17 @@ export default {
       ayaType: window.$gz.type.Reminder
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -348,150 +290,120 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
       window.$gz.form.setFormState({
-        vm: vm,
+        vm: this,
         loading: true
       });
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        window.$gz.form.deleteAllErrorBoxErrors(this);
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
-            window.$gz.form.handleObjectNotFound(vm);
+            window.$gz.form.handleObjectNotFound(this);
           }
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          vm.obj = res.data;
-          //modify the menu as necessary
-          generateMenu(vm);
-          //Update the form status
+          this.obj = res.data;
+          generateMenu(this);
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false,
             valid: true,
             loading: false
           });
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
       }
     },
     async submit() {
-      let vm = this;
-      if (vm.canSave == false) {
+      if (this.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        window.$gz.form.deleteAllErrorBoxErrors(this);
+        const res = await window.$gz.api.upsert(API_BASE_URL, this.obj);
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
-            vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
+            //POST
+            this.obj = res.data;
             this.$router.replace({
               name: "reminder-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
-            vm.obj.concurrency = res.data.concurrency;
+            //PUT
+            this.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false,
             valid: true
           });
         }
       } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
+        window.$gz.errorHandler.handleFormError(ex, this);
       } finally {
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
       }
     },
     async remove() {
-      let vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
-        if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
+        if (this.$route.params.recordid == 0) {
           JUST_DELETED = true;
-          // navigate backwards
-          vm.$router.go(-1);
+          this.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
-          window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          window.$gz.form.deleteAllErrorBoxErrors(this);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + this.$route.params.recordid
+          );
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
-            vm.$router.go(-1);
+            this.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "reminder-edit",
         params: {
@@ -500,8 +412,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -512,7 +422,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -531,7 +441,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Reminder,
             selectedRowIds: [m.vm.obj.id]
@@ -558,7 +468,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiStickyNote",
@@ -592,8 +502,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -601,8 +509,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -642,7 +549,7 @@ let JUST_DELETED = false;
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
@@ -650,7 +557,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "Reminder",
     "ReminderName",
diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue
index 10381871..874185a6 100644
--- a/ayanova/src/views/home-reminders.vue
+++ b/ayanova/src/views/home-reminders.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "reminder-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Reminder)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Reminder
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiStickyNote",
     title: "ReminderList",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/home-reset.vue b/ayanova/src/views/home-reset.vue
index 29c81980..2df55490 100644
--- a/ayanova/src/views/home-reset.vue
+++ b/ayanova/src/views/home-reset.vue
@@ -62,10 +62,9 @@
 </template>
 
 <script>
-/*  Xeslint-disable */
 export default {
   async created() {
-    let searchParams = new URLSearchParams(window.location.search);
+    const searchParams = new URLSearchParams(window.location.search);
     //home-reset?rc={ResetCode}&tr={EffectiveTranslationId}&lg={loginName}
     this.obj.passwordResetCode = searchParams.get("rc");
     this.obj.loginName = searchParams.get("lg");
@@ -114,14 +113,11 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
-
-        let url = "auth/reset-password";
-
         try {
-          let res = await window.$gz.api.upsert(url, {
+          const res = await window.$gz.api.upsert("auth/reset-password", {
             PasswordResetCode: vm.obj.passwordResetCode,
             Password: vm.obj.confirmPassword
           });
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 95b6ea0e..68122e45 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -165,31 +165,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "review-edit";
 const API_BASE_URL = "review/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Review"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "Review";
 
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Review);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -197,7 +186,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -218,19 +207,17 @@ export default {
           vm.obj.aType = window.$gz.util.stringToIntOrNull(
             vm.$route.params.aType
           );
-
           if (!vm.obj.objectId || !vm.obj.aType) {
             throw "AType and ObjectId are required to create a review";
           }
           vm.name = vm.$route.params.name;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -257,29 +244,23 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        //{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v8-migrate"],
-        //"reviewDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"aType":31,"overDue":false}}
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          reviewDate: null,
-          completedDate: null,
-          completionNotes: null,
-          userId: window.$gz.store.state.userId,
-          assignedByUserId: window.$gz.store.state.userId,
-          objectId: null,
-          aType: null,
-          overDue: false
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        reviewDate: null,
+        completedDate: null,
+        completionNotes: null,
+        userId: window.$gz.store.state.userId,
+        assignedByUserId: window.$gz.store.state.userId,
+        objectId: null,
+        aType: null,
+        overDue: false
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -302,23 +283,17 @@ export default {
       name: null
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -345,14 +320,6 @@ export default {
       return window.$gz.util.iconForType(this.obj.aType);
     },
     hasSupervisorRole: function() {
-      //mirrored from ReviewBiz.cs validation rule at server
-      /*
-  CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdmin) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.Service) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.Inventory) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.Sales) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.Accounting);
-*/
       return window.$gz.role.hasRole([
         window.$gz.role.AUTHORIZATION_ROLES.BizAdmin,
         window.$gz.role.AUTHORIZATION_ROLES.Service,
@@ -391,7 +358,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -399,14 +366,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -414,9 +377,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -434,47 +395,36 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "review-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data, // Pass data object to new form,
+                obj: res.data, //??THERE MIGHT HAVE BEEN ANOTHER PARAMETER HERE before cleanup???
                 name: this.name
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -491,42 +441,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -535,7 +476,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "review-edit",
         params: {
@@ -544,8 +484,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -556,7 +494,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -576,12 +514,11 @@ async function clickHandler(menuItem) {
           }
         });
         break;
-
       case "duplicate":
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Review,
             selectedRowIds: [m.vm.obj.id]
@@ -608,7 +545,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCalendarCheck",
@@ -644,8 +581,6 @@ function generateMenu(vm) {
     }
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -653,8 +588,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -684,9 +618,7 @@ function generateMenu(vm) {
       });
     }
   }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/home-reviews.vue b/ayanova/src/views/home-reviews.vue
index 24400ca9..9bc47eb3 100644
--- a/ayanova/src/views/home-reviews.vue
+++ b/ayanova/src/views/home-reviews.vue
@@ -22,23 +22,19 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "review-list";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     vm.rights = window.$gz.role.getRights(window.$gz.type.Review);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-
     vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId);
     vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType);
-
     //OPTIONAL FILTER
     if (vm.objectId && vm.objectId != 0 && vm.aType) {
       //OBJECTID,AYATYPE
       vm.clientCriteria = `${vm.objectId},${vm.aType}`;
-
       vm.preFilterMode = {
         icon: window.$gz.util.iconForType(vm.aType),
         id: vm.objectId,
@@ -47,7 +43,6 @@ export default {
         clearable: true
       };
     }
-
     generateMenu(vm);
   },
   beforeDestroy() {
@@ -65,18 +60,7 @@ export default {
       name: null
     };
   },
-  //   computed: {
-  //     iconForType() {
-  //       return window.$gz.util.iconForType(this.aType);
-  //     }
-  //   },
   methods: {
-    // navToTarget: function() {
-    //   window.$gz.eventBus.$emit("openobject", {
-    //     type: this.aType,
-    //     id: this.objectId
-    //   });
-    // },
     handleSelected(selected) {
       this.selectedItems = selected;
     },
@@ -85,9 +69,6 @@ export default {
       this.preFilterMode = null;
       this.reload = !this.reload;
     }
-    // iconForType() {
-    //   return window.$gz.util.iconForType(this.aType, 10);
-    // }
   }
 };
 
@@ -98,7 +79,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -113,7 +94,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Review)
         );
         if (res && res.refresh == true) {
@@ -122,7 +103,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Review),
             m.id
           );
@@ -130,7 +111,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -146,7 +127,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCalendarCheck",
     title: "ReviewList",
@@ -169,8 +150,6 @@ function generateMenu(vm) {
     }
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -178,8 +157,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index c4c93689..813cc3a4 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -1,7 +1,6 @@
 <template>
   <div v-if="formState.ready" v-resize="onResize" class="my-n8">
     <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
     <v-sheet height="64">
       <v-toolbar flat class="ml-n3">
         <v-btn outlined class="xxmr-4" color="grey darken-2" @click="setToday">
@@ -402,14 +401,12 @@
     </template>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "home-schedule";
 const CLICK_DETECT_TIMEOUT = 200; //100 is a bit too fast to recognize a click
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -468,7 +465,7 @@ export default {
       });
     },
     newItem(atype) {
-      let newEvent = this.events[this.events.length - 1];
+      const newEvent = this.events[this.events.length - 1];
       const addStart = window.$gz.locale.localScheduleFormatToUTC8601String(
         newEvent.start,
         this.timeZoneName
@@ -508,7 +505,6 @@ export default {
           });
           break;
       }
-
       //remove faux item, server will provide it back once it's created anyway
       this.events.splice(this.events.length - 1);
       this.newItemDialog = false;
@@ -549,7 +545,7 @@ export default {
         }
         //MODIFY existing event, drag or extend
         if (this.dragEvent || this.extendEvent) {
-          let param = { type: null, id: null, start: null, end: null };
+          const param = { type: null, id: null, start: null, end: null };
 
           if (this.dragEvent) {
             param.type = this.dragEvent.type;
@@ -574,12 +570,9 @@ export default {
               this.timeZoneName
             );
           }
-
           try {
             window.$gz.form.deleteAllErrorBoxErrors(this);
-
-            let res = await window.$gz.api.post("schedule/adjust", param);
-
+            const res = await window.$gz.api.post("schedule/adjust", param);
             if (res.error) {
               this.formState.serverError = res.error;
               window.$gz.form.setErrorBoxErrors(this);
@@ -677,11 +670,9 @@ export default {
       this.dragEvent.start = mouseDate;
       this.dragEvent.end = this.dragEvent.end + moveDelta;
     },
-
     startTime(tms) {
       //This is called on the start of dragging an existing schedule item or drag extending a NEW schedule item
       const mouse = this.toTime(tms);
-
       if (this.dragEvent && this.dragTime === null) {
         //# DAY VIEW *DRAG* EXISTING START EVENT (not extend)
         //(also called on simple click to view schedule more info)
@@ -710,7 +701,6 @@ export default {
     roundTime(time, down = true) {
       const roundTo = 15; // minutes
       const roundDownTime = roundTo * 60 * 1000;
-
       return down
         ? time - (time % roundDownTime)
         : time + (roundDownTime - (time % roundDownTime));
@@ -731,7 +721,6 @@ export default {
           JSON.stringify({
             start: this.$refs.calendar.start,
             end: this.$refs.calendar.end,
-
             focus: this.focus,
             firstInterval: this.$refs.calendar.firstInterval
           })
@@ -790,7 +779,6 @@ export default {
       }
       let route = null;
       this.evInfo = {};
-
       switch (event.type) {
         case window.$gz.type.WorkOrderItemScheduledUser:
           route = `workorder/items/scheduled-users/sched-info/${event.id}`;
@@ -803,12 +791,11 @@ export default {
           break;
       }
       if (route) {
-        let res = await window.$gz.api.get(route);
+        const res = await window.$gz.api.get(route);
         if (!res.error) {
           this.evInfo = res.data;
         }
       }
-
       const open = () => {
         this.selectedEvent = event;
         this.selectedElement = nativeEvent.target;
@@ -816,20 +803,18 @@ export default {
           requestAnimationFrame(() => (this.moreInfoDialog = true))
         );
       };
-
       if (this.moreInfoDialog) {
         this.moreInfoDialog = false;
         requestAnimationFrame(() => requestAnimationFrame(() => open()));
       } else {
         open();
       }
-
       nativeEvent.stopPropagation();
     },
     async fetchEvents({ start, end }) {
       try {
         window.$gz.form.deleteAllErrorBoxErrors(this);
-        let res = await window.$gz.api.post("schedule/personal", {
+        const res = await window.$gz.api.post("schedule/personal", {
           view: window.$gz.util.calendarViewToAyaNovaEnum(this.viewType),
           dark: this.$store.state.darkMode,
           start: window.$gz.locale.localTimeDateStringToUTC8601String(
@@ -845,7 +830,6 @@ export default {
           reviews: this.formUserOptions.reviews,
           reminders: this.formUserOptions.reminders
         });
-
         if (res.error) {
           this.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(this);
@@ -888,11 +872,11 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       // case "report":
-      //   let res = await m.vm.$refs.reportSelector.open(
+      //   const res = await m.vm.$refs.reportSelector.open(
       //     {
       //       AType: window.$gz.type.Project,
       //       selectedRowIds: [m.vm.obj.id]
@@ -951,7 +935,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCalendarDay",
@@ -960,8 +944,7 @@ function generateMenu(vm) {
     menuItems: []
   };
 
-  // //REPORTS
-  // //Report not Print, print is a further option
+  //  //
   // menuOptions.menuItems.push({
   //   title: "Report",
   //   icon: "$ayiFileAlt",
@@ -969,8 +952,8 @@ function generateMenu(vm) {
   //   vm: vm
   // });
 
-  // //get last report selected
-  // let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  //
+  // const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   // if (lastReport != null) {
   //   menuOptions.menuItems.push({
   //     title: lastReport.name,
@@ -1010,7 +993,6 @@ function generateMenu(vm) {
       key: FORM_KEY + ":WorkOrderItemLaborList",
       vm: vm
     });
-    //--- /show all ---
   }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
@@ -1040,7 +1022,7 @@ function getFormSettings(vm) {
 }
 
 function saveFormSettings(vm) {
-  let formSettings = window.$gz.form.getFormSettings(FORM_KEY);
+  const formSettings = window.$gz.form.getFormSettings(FORM_KEY);
   formSettings.temp = { viewType: vm.viewType, focus: vm.focus };
 
   window.$gz.form.setFormSettings(FORM_KEY, formSettings);
@@ -1049,7 +1031,7 @@ function saveFormSettings(vm) {
 ////////////////////
 //
 async function getFormUserOptions(vm) {
-  let res = await window.$gz.api.get(`form-user-options/${FORM_KEY}`);
+  const res = await window.$gz.api.get(`form-user-options/${FORM_KEY}`);
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
@@ -1088,15 +1070,13 @@ async function saveFormUserOptions(vm) {
   //translate tempFirstTime to local time
   if (vm.tempFirstTime) {
     //convert picker's utc time to local hour:MM
-    let localTime = window.$gz.DateTime.fromISO(vm.tempFirstTime).toLocal();
+    const localTime = window.$gz.DateTime.fromISO(vm.tempFirstTime).toLocal();
     vm.formUserOptions.firstTime = `${localTime.hour}:${localTime.minute}`;
   }
-
-  let res = await window.$gz.api.post("form-user-options", {
+  const res = await window.$gz.api.post("form-user-options", {
     formKey: FORM_KEY,
     options: JSON.stringify(vm.formUserOptions)
   });
-
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index 6094b9d6..52a102b7 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -29,7 +29,6 @@
               <v-icon data-cy="btnsearch">$ayiSearch</v-icon>
             </v-btn>
           </v-col>
-
           <v-col cols="12">
             <p v-if="!items.length">{{ $ay.t("NoResults") }}</p>
             <v-card v-if="items.length" max-width="900">
@@ -75,12 +74,7 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "search";
 const API_BASE_URL = "search/";
 const FORM_CUSTOM_TEMPLATE_KEY = "home-search";
@@ -88,7 +82,7 @@ const MAX_RESULTS = 200;
 
 export default {
   beforeRouteLeave(to, from, next) {
-    let vm = this;
+    const vm = this;
     //save last search in session cache
     window.$gz.form.setFormSettings(FORM_KEY, {
       temp: {
@@ -98,11 +92,10 @@ export default {
         maxResultsReturned: vm.maxResultsReturned
       }
     });
-
     next();
   },
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -168,7 +161,7 @@ export default {
       });
     },
     async getExcerpt(item) {
-      let vm = this;
+      const vm = this;
       //Search/Info/2/1?phrase=we
       if (item.info || item.id == 0) {
         return;
@@ -212,10 +205,10 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           let showInfo = res.data;
-          let searchTerms = vm.searchPhrase.replace(/[*]/gi, "").split(" ");
+          const searchTerms = vm.searchPhrase.replace(/[*]/gi, "").split(" ");
           for (let i = 0; i < searchTerms.length; i++) {
-            let regEx = new RegExp(searchTerms[i], "ig");
-            let replaceMask =
+            const regEx = new RegExp(searchTerms[i], "ig");
+            const replaceMask =
               "<span class='v-list-item__mask'>" + searchTerms[i] + "</span>";
             showInfo = showInfo.replace(regEx, replaceMask);
           }
@@ -227,23 +220,14 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       if (!vm.searchPhrase || vm.formState.loading) {
         return;
       }
       vm.formState.loading = true;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      /**
- * {
-  "phrase": "e*",
-  "nameOnly": false,
-  "typeOnly": 0,
-  "maxResults": 100
-}
- * 
- */
       try {
-        let res = await window.$gz.api.upsert(API_BASE_URL, {
+        const res = await window.$gz.api.upsert(API_BASE_URL, {
           phrase: vm.searchPhrase,
           nameOnly: false,
           typeOnly: !!vm.searchAType ? vm.searchAType : 0,
@@ -254,19 +238,17 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.maxResultsReturned = res.data.searchResults.length == MAX_RESULTS;
-          let newResults = [];
+          const newResults = [];
           let nDex = 0;
           let lastType = -1;
           for (let i = 0; i < res.data.searchResults.length; i++) {
-            let item = res.data.searchResults[i];
+            const item = res.data.searchResults[i];
             item.name = await window.$gz.translation.translateStringWithMultipleKeysAsync(
               item.name
             );
             if (item.type != lastType) {
               //change of type, set subheader props
-              //Note: was going to show the type name translated but coded it to get the name from the list which doesn't have the translated names due to a change
-              //so opted to just show the icon instead due to TTM concerns
-              let tsub = vm.selectLists.objectTypes.find(
+              const tsub = vm.selectLists.objectTypes.find(
                 z => z.id == item.type
               );
 
@@ -275,7 +257,6 @@ export default {
               } else {
                 item.subheader = "TYPE " + item.type;
               }
-              // item.subheader = item.type;
               item.icon = window.$gz.util.iconForType(item.type);
               lastType = item.type;
             }
@@ -288,7 +269,6 @@ export default {
       } catch (error) {
         window.$gz.errorHandler.handleFormError(error, vm);
       } finally {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -305,7 +285,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       default:
@@ -321,7 +301,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiSearch",
     title: "Search",
@@ -361,7 +341,7 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get("enum-list/list/alltranslated");
+  const res = await window.$gz.api.get("enum-list/list/alltranslated");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/home-security.vue b/ayanova/src/views/home-security.vue
index 4806c466..d4ab9cd5 100644
--- a/ayanova/src/views/home-security.vue
+++ b/ayanova/src/views/home-security.vue
@@ -49,7 +49,6 @@
                 </v-card-text>
                 <v-card-actions>
                   <v-spacer></v-spacer>
-
                   <v-btn color="primary" text @click="authenticate()">{{
                     $ay.t("AuthVerifyCode")
                   }}</v-btn>
@@ -62,21 +61,14 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "security";
-const API_BASE_URL = "auth/";
 
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.fullRightsObject();
       generateMenu(vm);
       vm.formState.ready = true;
@@ -88,17 +80,15 @@ export default {
         readOnly: false
       });
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //fetch tfa secret and display here if tfa not enabled currently
       if (!this.tfaEnabled) {
-        let res = await window.$gz.api.get("auth/totp");
+        const res = await window.$gz.api.get("auth/totp");
         if (res.error) {
           throw new Error(res.error);
         } else {
           this.obj = res.data;
         }
       }
-
       //------------------
     } catch (err) {
       vm.formState.ready = true;
@@ -130,38 +120,12 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
-  //WATCHERS
-  //   watch: {
-  //     formState: {
-  //       handler: function(val) {
-  //         //,oldval is available here too if necessary
-  //         if (this.formState.loading) {
-  //           return;
-  //         }
-
-  //         //enable / disable save button
-  //         let canSave = val.dirty && val.valid && !val.readOnly;
-  //         if (canSave) {
-  //           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
-  //         } else {
-  //           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
-  //         }
-  //       },
-  //       deep: true
-  //     }
-  //   },
   computed: {
-    // canSave: function() {
-    //   return this.formState.valid && this.formState.dirty;
-    // },
     qCode: function() {
       return `data:image/png;base64,${this.obj.qr}`;
     }
   },
   methods: {
-    // translation() {
-    //   return window.$gz.translation;
-    // },
     form() {
       return window.$gz.form;
     },
@@ -171,17 +135,13 @@ export default {
       }
     },
     async disable() {
-      let vm = this;
-
+      const vm = this;
       vm.formState.loading = true;
-
-      //clear any errors vm might be around from previous submit
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.post(
+        const res = await window.$gz.api.post(
           `auth/totp-disable/${vm.$store.state.userId}`
         );
-
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -191,8 +151,6 @@ export default {
             "AuthTwoFactorDisabled"
           );
           vm.$router.push("/home-user-settings");
-
-          //Only a post, no data returned
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false
@@ -205,20 +163,15 @@ export default {
       }
     },
     async authenticate() {
-      let vm = this;
-
-      vm.formState.loading = true;
-
-      //clear any errors vm might be around from previous submit
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
+      this.formState.loading = true;
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       try {
-        let res = await window.$gz.api.post("auth/totp-validate", {
-          pin: vm.pin
+        const res = await window.$gz.api.post("auth/totp-validate", {
+          pin: this.pin
         });
-
         if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
           if (res.data.ok == true) {
             window.$gz.store.commit("setTfaEnabled", true);
@@ -226,24 +179,22 @@ export default {
             await window.$gz.dialog.displayLTModalNotificationMessage(
               "AuthConnectCompleted"
             );
-            vm.$router.push("/home-user-settings");
+            this.$router.push("/home-user-settings");
           } else {
             window.$gz.eventBus.$emit(
               "notify-warning",
               this.$ay.t("AuthPinInvalid")
             );
           }
-
-          //Only a post, no data returned
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false
           });
         }
       } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       } finally {
-        vm.loading = false;
+        this.loading = false;
       }
     }
   }
@@ -256,13 +207,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      //   case "save":
-      //     m.vm.submit();
-      //     break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -276,7 +223,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiLock",
     title: "AuthTwoFactor",
@@ -286,7 +233,6 @@ function generateMenu(vm) {
     },
     menuItems: []
   };
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 55c6681c..01e6f2cf 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -182,24 +182,17 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-import EmailControl from "../components/email-control.vue";
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "user-settings";
 const API_BASE_URL = "user-option/";
-const FORM_CUSTOM_TEMPLATE_KEY = "UserOptions"; //<- Should always be CoreBizObject AyaType name here
-
+const FORM_CUSTOM_TEMPLATE_KEY = "UserOptions";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
 
-      vm.rights = window.$gz.role.fullRightsObject(); //getRights(window.$gz.type.UserOptions);
+      vm.rights = window.$gz.role.fullRightsObject();
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //UserOptions never creates a new one so this code is a little different than other forms
@@ -208,7 +201,6 @@ export default {
       //OF THESE SAME FIELDS FOR THAT PURPOSE
       //SO ALWAYS USER CURRENT LOGGED IN USER ID FOR THIS
       //id 0 means create or duplicate to new but thats not applicable here
-
       await vm.getDataFromApi();
     } catch (err) {
       vm.formState.ready = true;
@@ -239,15 +231,6 @@ export default {
       activeTranslationId: null,
       darkMode: this.$store.state.darkMode,
       obj: {
-        /*concurrency": 7490431,
-    "translationId": 1,
-    "emailAddress": null,
-    "uiColor": "#000000",
-    "languageOverride": null,
-    "timeZoneOverride": null,
-    "currencyName": "USD",
-    "hour12": true,
-    "userId": 1 */
         id: 0,
         concurrency: 0,
         emailAddress: null,
@@ -275,17 +258,13 @@ export default {
       rights: window.$gz.role.defaultRightsObject()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -317,7 +296,7 @@ export default {
       return window.$gz.form;
     },
     darkModeChanged() {
-      let vm = this;
+      const vm = this;
       vm.darkMode = !vm.darkMode;
       vm.$store.commit("setDarkMode", vm.darkMode);
       vm.$vuetify.theme.dark = vm.darkMode;
@@ -337,93 +316,78 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
-      vm.formState.loading = true;
-      //always fetch on this form for the current logged in user id
-      let url = API_BASE_URL + vm.$store.state.userId;
-      window.$gz.form.deleteAllErrorBoxErrors(vm);
+      this.formState.loading = true;
+      window.$gz.form.deleteAllErrorBoxErrors(this);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(
+          API_BASE_URL + this.$store.state.userId
+        );
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
-            window.$gz.form.handleObjectNotFound(vm);
+            window.$gz.form.handleObjectNotFound(this);
           }
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
+          this.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(this);
         } else {
-          vm.obj = res.data;
-          vm.activeTranslationId = res.data.translationId;
-
-          //Update the form status
+          this.obj = res.data;
+          this.activeTranslationId = res.data.translationId;
           window.$gz.form.setFormState({
-            vm: vm,
+            vm: this,
             dirty: false,
             valid: true,
             loading: false
           });
-          //modify the menu as necessary
-          generateMenu(vm);
+          generateMenu(this);
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
-          vm: vm,
+          vm: this,
           loading: false
         });
-        window.$gz.errorHandler.handleFormError(error, vm);
+        window.$gz.errorHandler.handleFormError(error, this);
       }
     },
     async submit() {
-      let vm = this;
-      if (vm.canSave) {
-        vm.formState.loading = true;
-
-        //always submit from this form for the current logged in user id
-        let url = API_BASE_URL + vm.$store.state.userId;
-
-        //clear any errors vm might be around from previous submit
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
+      if (this.canSave) {
+        this.formState.loading = true;
+        window.$gz.form.deleteAllErrorBoxErrors(this);
         try {
-          let res = await window.$gz.api.upsert(url, vm.obj);
-
-          vm.formState.loading = false;
+          const res = await window.$gz.api.upsert(
+            API_BASE_URL + this.$store.state.userId,
+            this.obj
+          );
+          this.formState.loading = false;
           if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
           } else {
-            //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
-
-            //Handle "put" of an existing record (UPDATE)
-            vm.obj.concurrency = res.data.concurrency;
+            this.obj.concurrency = res.data.concurrency;
             window.$gz.form.setFormState({
-              vm: vm,
+              vm: this,
               dirty: false
             });
-
             //Set values in store so they are updated immediately for user
-            let l = vm.$store.state.userOptions;
-            l.languageOverride = vm.obj.languageOverride;
-            l.timeZoneOverride = vm.obj.timeZoneOverride;
-            l.currencyName = vm.obj.currencyName;
-            l.hour12 = vm.obj.hour12;
-            l.uiColor = vm.obj.uiColor;
-            l.emailAddress = vm.obj.emailAddress;
-            l.mapUrlTemplate = vm.obj.mapUrlTemplate;
+            const l = this.$store.state.userOptions;
+            l.languageOverride = this.obj.languageOverride;
+            l.timeZoneOverride = this.obj.timeZoneOverride;
+            l.currencyName = this.obj.currencyName;
+            l.hour12 = this.obj.hour12;
+            l.uiColor = this.obj.uiColor;
+            l.emailAddress = this.obj.emailAddress;
+            l.mapUrlTemplate = this.obj.mapUrlTemplate;
             window.$gz.store.commit("setUserOptions", l);
 
             if (
-              vm.activeTranslationId &&
-              vm.activeTranslationId != vm.obj.translationId
+              this.activeTranslationId &&
+              this.activeTranslationId != this.obj.translationId
             ) {
               await window.$gz.translation.updateCache();
-              vm.activeTranslationId = vm.obj.translationId;
+              this.activeTranslationId = this.obj.translationId;
             }
           }
         } catch (error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
+          this.formState.loading = false;
+          window.$gz.errorHandler.handleFormError(error, this);
         }
       }
     }
@@ -437,7 +401,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -460,7 +424,7 @@ function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUserCog",
     title: "UserSettings",
@@ -543,15 +507,12 @@ async function fetchTranslatedText(vm) {
 //
 async function populateSelectionLists(vm) {
   //http://localhost:7575/api/v8/translation/list
-  let res = await window.$gz.api.get("translation/list");
+  const res = await window.$gz.api.get("translation/list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
-    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.translations = res.data;
   }
 }
 </script>
-
-<style></style>
diff --git a/ayanova/src/views/inv-part-adjustment.vue b/ayanova/src/views/inv-part-adjustment.vue
index 3cb540d1..8710099e 100644
--- a/ayanova/src/views/inv-part-adjustment.vue
+++ b/ayanova/src/views/inv-part-adjustment.vue
@@ -69,32 +69,23 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //THIS FORM IS CREATE ONLY
 //no delete, no duplicate, no fetch, just create or leave
 //
 const FORM_KEY = "inv-part-adjustment";
 const API_BASE_URL = "part-inventory/";
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.obj.partId = window.$gz.util.stringToIntOrNull(
         vm.$route.params.partId
       );
       vm.obj.partWarehouseId = window.$gz.util.stringToIntOrNull(
         vm.$route.params.partWarehouseId
       );
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.PartInventory);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -105,7 +96,6 @@ export default {
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -151,23 +141,19 @@ export default {
       ayaType: window.$gz.type.PartInventory
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -208,7 +194,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -218,17 +204,12 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.post(url, vm.obj);
-
+        const res = await window.$gz.api.post(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //success, no need to be here anymore this is not an update form so navigate backwards since we don't know which list we came from
           window.$gz.form.setFormState({
             vm: vm,
             loading: false,
@@ -246,7 +227,6 @@ export default {
         });
       }
     }
-    //end methods
   }
 };
 
@@ -257,7 +237,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -277,7 +257,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiPeopleCarry",
@@ -286,7 +266,6 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.PartInventory,
       recordId: vm.$route.params.recordid,
-      // formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       recordName: vm.obj.name
     },
     menuItems: []
@@ -301,9 +280,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/inv-part-assemblies.vue b/ayanova/src/views/inv-part-assemblies.vue
index ca1a99cd..f00f6497 100644
--- a/ayanova/src/views/inv-part-assemblies.vue
+++ b/ayanova/src/views/inv-part-assemblies.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "partassembly-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PartAssembly
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartAssembly
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +99,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiObjectGroup",
     title: "PartAssemblyList",
@@ -121,8 +120,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +127,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index 6580f5ae..49126311 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -263,31 +263,19 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "part-assembly-edit";
 const API_BASE_URL = "part-assembly/";
-const FORM_CUSTOM_TEMPLATE_KEY = "PartAssembly"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "PartAssembly";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.PartAssembly);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -295,7 +283,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -315,7 +303,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -370,23 +358,17 @@ export default {
       editItemIndex: 0
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -404,7 +386,6 @@ export default {
       deep: true
     }
   },
-
   methods: {
     addItem: function() {
       this.editItemIndex =
@@ -413,7 +394,6 @@ export default {
           partAssemblyId: this.obj.id,
           partId: null
         }) - 1;
-
       this.editItemDialog = true;
       this.formState.dirty = true;
     },
@@ -434,20 +414,13 @@ export default {
       });
     },
     quantityChanged: function(item) {
-      let vm = this;
+      const vm = this;
       if (item.quantity == null || item.quantity < 1) {
-        // item.quantity = 1;
-
-        let index = vm.obj.items.findIndex(z => z.partId == item.partId);
+        const index = vm.obj.items.findIndex(z => z.partId == item.partId);
         if (index == -1) {
           return;
         }
         item.quantity = 1;
-
-        //vm.obj.name = vm.obj.name + "X";
-
-        //vm.$set(vm.obj.items, index, item);
-        //vm.obj.items.splice(index, 1, item);
       }
       vm.formState.dirty = true;
     },
@@ -476,7 +449,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -484,14 +457,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -499,9 +468,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -519,46 +486,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "part-assembly-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -575,42 +531,32 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
+          const url = API_BASE_URL + vm.$route.params.recordid;
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(url);
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -619,7 +565,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "part-assembly-edit",
         params: {
@@ -628,8 +573,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -640,7 +583,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -659,7 +602,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.PartAssembly,
             selectedRowIds: [m.vm.obj.id]
@@ -686,7 +629,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiObjectGroup",
@@ -721,8 +664,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -730,8 +671,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue
index fcf18866..41f4fcb3 100644
--- a/ayanova/src/views/inv-part-inventory-transactions.vue
+++ b/ayanova/src/views/inv-part-inventory-transactions.vue
@@ -22,15 +22,13 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "part-inventory-transaction-list";
 export default {
   created() {
-    let vm = this;
+    const vm = this;
     vm.rights = window.$gz.role.getRights(window.$gz.type.PartInventory);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-
     //Generate client criteria to send if filtered by part, whs or both
     //ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
     //OPTIONAL FILTER
@@ -44,7 +42,6 @@ export default {
         viz: vm.$route.params.filter.viz,
         clearable: true
       };
-
       vm.clientCriteria = `${
         vm.$route.params.filter.PartPartNumber
           ? vm.$route.params.filter.PartPartNumber
@@ -55,7 +52,6 @@ export default {
           : ""
       }`;
     }
-
     generateMenu(vm);
   },
   beforeDestroy() {
@@ -91,13 +87,12 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
         let partId = null;
         let partWarehouseId = null;
-
         if (m.vm.preFilterMode) {
           if (m.vm.preFilterMode.ayatype == window.$gz.type.Part) {
             partId = m.vm.preFilterMode.id;
@@ -111,7 +106,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PartInventory
           )
@@ -122,7 +117,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventory
             ),
@@ -132,7 +127,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -148,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPeopleCarry",
     title: "PartInventoryTransactionList",
@@ -168,9 +163,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -178,8 +170,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue
index 67261b65..7b3599ca 100644
--- a/ayanova/src/views/inv-part-inventory.vue
+++ b/ayanova/src/views/inv-part-inventory.vue
@@ -22,15 +22,13 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "part-inventory-list";
 export default {
   created() {
-    let vm = this;
+    const vm = this;
     vm.rights = window.$gz.role.getRights(window.$gz.type.PartInventory);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-
     //Generate client criteria to send if filtered by part, whs or both
     //ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
     //OPTIONAL FILTER
@@ -44,7 +42,6 @@ export default {
         viz: vm.$route.params.filter.viz,
         clearable: true
       };
-
       vm.clientCriteria = `${
         vm.$route.params.filter.PartPartNumber
           ? vm.$route.params.filter.PartPartNumber
@@ -55,7 +52,6 @@ export default {
           : ""
       }`;
     }
-
     generateMenu(vm);
   },
   beforeDestroy() {
@@ -90,17 +86,16 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
           name: "inv-part-adjustment"
-          // , params: { recordid: 0 }
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PartInventoryDataList
           )
@@ -111,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventoryDataList
             ),
@@ -121,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -137,7 +132,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPallet",
     title: "PartInventoryList",
@@ -158,8 +153,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -167,8 +160,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue
index 8f1a1ddc..77cb662a 100644
--- a/ayanova/src/views/inv-part-requests.vue
+++ b/ayanova/src/views/inv-part-requests.vue
@@ -22,17 +22,15 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "part-inventory-request-list";
 export default {
   created() {
-    let vm = this;
+    const vm = this;
     vm.rights = window.$gz.role.getRights(
       window.$gz.type.PartInventoryRequestDataList
     );
     window.$gz.eventBus.$on("menu-click", clickHandler);
-
     //Generate client criteria to send if filtered by part, whs or both
     //ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
     //OPTIONAL FILTER
@@ -46,7 +44,6 @@ export default {
         viz: vm.$route.params.filter.viz,
         clearable: true
       };
-
       vm.clientCriteria = `${
         vm.$route.params.filter.PartPartNumber
           ? vm.$route.params.filter.PartPartNumber
@@ -57,7 +54,6 @@ export default {
           : ""
       }`;
     }
-
     generateMenu(vm);
   },
   beforeDestroy() {
@@ -92,11 +88,11 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PartInventoryRequestDataList
           )
@@ -107,7 +103,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventoryRequestDataList
             ),
@@ -117,7 +113,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -133,7 +129,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiParachuteBox",
     title: "WorkOrderItemPartRequestList",
@@ -144,8 +140,6 @@ function generateMenu(vm) {
     }
   };
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -153,8 +147,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part-serials.vue b/ayanova/src/views/inv-part-serials.vue
index 9c7c8130..fe81b3c9 100644
--- a/ayanova/src/views/inv-part-serials.vue
+++ b/ayanova/src/views/inv-part-serials.vue
@@ -62,42 +62,28 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "inv-part-serials";
-//const API_BASE_URL = "part/";
-const FORM_CUSTOM_TEMPLATE_KEY = "inv-part-serials"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "inv-part-serials";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Part);
-
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid == 0) {
         throw "Invalid partid";
       } else {
-        await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        await vm.getDataFromApi(vm.$route.params.recordid);
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -142,15 +128,12 @@ export default {
       newSerial: null
     };
   },
-
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
         if (this.formState.loading) {
           return;
         }
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -165,7 +148,6 @@ export default {
       if (this.obj == null || this.obj.length == 0) {
         return [];
       }
-
       return this.obj.slice().sort();
     },
     removeItem: function(index) {
@@ -182,7 +164,7 @@ export default {
       //add to list, may be in various formats so handle that
       let splitted = this.newSerial.split(/[\s,]+/).filter(Boolean); //filter Boolean is equivalent to array.filter(item => Boolean(item)) and it's to filter out nulls concisely from badly formatted strings
       splitted = [...splitted, ...this.obj];
-      let uniqueItems = [...new Set(splitted)]; //remove any dupes with Set
+      const uniqueItems = [...new Set(splitted)]; //remove any dupes with Set
       uniqueItems.sort();
       this.obj = uniqueItems;
       this.formState.dirty = true;
@@ -194,17 +176,8 @@ export default {
     form() {
       return window.$gz.form;
     },
-    // fieldValueChanged(ref) {
-    //   if (
-    //     this.formState.ready &&
-    //     !this.formState.loading &&
-    //     !this.formState.readOnly
-    //   ) {
-    //     window.$gz.form.fieldValueChanged(this, ref);
-    //   }
-    // },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -212,14 +185,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = `part/serials/${recordId}`;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(`part/serials/${recordId}`);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -227,9 +196,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -247,7 +214,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -257,39 +224,16 @@ export default {
           vm: vm,
           loading: true
         });
-        // let url = `part/serials/${vm.$route.params.recordid}`;
-        let url = `part/serials/${vm.$route.params.recordid}`;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.put(url, vm.obj);
-
+        const res = await window.$gz.api.put(
+          `part/serials/${vm.$route.params.recordid}`,
+          vm.obj
+        );
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data; //updated list of serials from server
-          //PRETTY SURE DON"T NEED ANY OF THIS
-          //   //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
-          //   if (res.data.id) {
-          //     //POST - whole new object returned
-          //     vm.obj = res.data;
-          //     //Change URL to new record
-          //     //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
-          //     this.$router.push({
-          //       name: "project-edit",
-          //       params: {
-          //         recordid: res.data.id,
-          //         obj: res.data // Pass data object to new form
-          //       }
-          //     });
-          //   } else {
-          //     //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-          //     //Handle "put" of an existing record (UPDATE)
-          //     vm.obj.concurrency = res.data.concurrency;
-          //   }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -305,7 +249,6 @@ export default {
         });
       }
     }
-    //end methods
   }
 };
 
@@ -316,13 +259,12 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
         m.vm.submit();
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -336,18 +278,12 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: null,
     title: "PartSerialNumbersAvailable",
     helpUrl: "inv-part-serials",
-    formData: {
-      // ayaType: window.$gz.type.Par,
-      // recordId: vm.$route.params.recordid,
-      //  formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      // recordName: vm.obj.name
-    },
     menuItems: []
   };
 
@@ -371,7 +307,6 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/inv-part-stock-levels.vue b/ayanova/src/views/inv-part-stock-levels.vue
index b36fd175..dc72e818 100644
--- a/ayanova/src/views/inv-part-stock-levels.vue
+++ b/ayanova/src/views/inv-part-stock-levels.vue
@@ -92,41 +92,27 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "inv-part-stock-levels";
-//const API_BASE_URL = "part/";
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Part);
-
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid == 0) {
         throw "Invalid partid";
       } else {
-        await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        await vm.getDataFromApi(vm.$route.params.recordid);
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -168,15 +154,12 @@ export default {
       minimumQuantity: 1
     };
   },
-
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
         if (this.formState.loading) {
           return;
         }
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -196,33 +179,29 @@ export default {
       return this.obj.slice().sort(compare);
     },
     addItem: function() {
-      let vm = this;
-
-      let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
-      //vm.selectedPartWarehouseId = null;
+      const vm = this;
+      const selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
       if (selectedPartWarehouse == null || selectedPartWarehouse.id == null) {
         return;
       }
-      let index = vm.obj.findIndex(
+      const index = vm.obj.findIndex(
         z => z.partWarehouseId == selectedPartWarehouse.id
       );
       if (index != -1) {
         //already in the list
         return;
       }
-
       vm.obj.push({
         partId: vm.$route.params.recordid,
         partWarehouseId: selectedPartWarehouse.id,
         partWarehouseDisplay: selectedPartWarehouse.name,
         minimumQuantity: 1
       });
-
       vm.formState.dirty = true;
     },
     removeItem: function(item) {
-      let vm = this;
-      let index = vm.obj.findIndex(
+      const vm = this;
+      const index = vm.obj.findIndex(
         z => z.partWarehouseId == item.partWarehouseId
       );
       if (index == -1) {
@@ -238,9 +217,9 @@ export default {
       });
     },
     quantityChanged: function(item) {
-      let vm = this;
+      const vm = this;
       if (item.minimumQuantity == null || item.minimumQuantity < 1) {
-        let index = vm.obj.findIndex(
+        const index = vm.obj.findIndex(
           z => z.partWarehouseId == item.partWarehouseId
         );
         if (index == -1) {
@@ -260,7 +239,7 @@ export default {
       return window.$gz.form;
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -268,14 +247,12 @@ export default {
       if (!vm.$route.params.recordid) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = `part/stock-levels/${vm.$route.params.recordid}`;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(
+          `part/stock-levels/${vm.$route.params.recordid}`
+        );
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -283,9 +260,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -303,29 +278,25 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = `part/stock-levels/${vm.$route.params.recordid}`;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.put(url, vm.obj);
-
+        const res = await window.$gz.api.put(
+          `part/stock-levels/${vm.$route.params.recordid}`,
+          vm.obj
+        );
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          vm.obj = res.data; //updated list of stock levels from server
-
-          //Update the form status
+          vm.obj = res.data;
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -341,7 +312,6 @@ export default {
         });
       }
     }
-    //end methods
   }
 };
 
@@ -352,7 +322,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -372,7 +342,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: null,
diff --git a/ayanova/src/views/inv-part-warehouse.vue b/ayanova/src/views/inv-part-warehouse.vue
index 97277f5d..94f70231 100644
--- a/ayanova/src/views/inv-part-warehouse.vue
+++ b/ayanova/src/views/inv-part-warehouse.vue
@@ -94,31 +94,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "inv-part-warehouse-edit";
 const API_BASE_URL = "part-warehouse/";
-const FORM_CUSTOM_TEMPLATE_KEY = "PartWarehouse"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "PartWarehouse";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.PartWarehouse);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -126,7 +114,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -145,7 +133,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -172,20 +160,16 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: []
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: []
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -200,23 +184,17 @@ export default {
       ayaType: window.$gz.type.PartWarehouse
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -257,7 +235,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -265,14 +243,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -280,9 +254,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -300,7 +272,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -310,36 +282,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.push({
               name: "inv-part-warehouse",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -356,42 +318,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -400,8 +353,7 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
-      //(this code written in the great heatwave of June 2021 36c 46% humidity in office no AC)
+      //(this code written in the great heatwave of late June 2021 36c 46% humidity in office no AC)
       this.$router.push({
         name: "inv-part-warehouse",
         params: {
@@ -410,8 +362,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -422,7 +372,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -441,7 +391,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.PartWarehouse,
             selectedRowIds: [m.vm.obj.id]
@@ -495,7 +445,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiWarehouse",
@@ -535,8 +485,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -544,8 +492,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -573,9 +520,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   if (
     vm.obj.id != null &&
     vm.obj.id != 0 &&
diff --git a/ayanova/src/views/inv-part-warehouses.vue b/ayanova/src/views/inv-part-warehouses.vue
index 2834be7c..2cd28863 100644
--- a/ayanova/src/views/inv-part-warehouses.vue
+++ b/ayanova/src/views/inv-part-warehouses.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "inv-part-warehouse-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PartWarehouse
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartWarehouse
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +99,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiWarehouse",
     title: "PartWarehouseList",
@@ -121,8 +120,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +127,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-part.vue b/ayanova/src/views/inv-part.vue
index a8226200..fe72b610 100644
--- a/ayanova/src/views/inv-part.vue
+++ b/ayanova/src/views/inv-part.vue
@@ -68,24 +68,6 @@
             ></gz-currency>
           </v-col>
 
-          <!-- <v-col
-            v-if="form().showMe(this, 'UnitOfMeasure')"
-            cols="12"
-            sm="6"
-            lg="4"
-            xl="3"
-          >
-            <v-text-field
-              v-model="obj.unitOfMeasure"
-              :readonly="formState.readOnly"
-              :label="$ay.t('UnitOfMeasure')"
-              ref="unitOfMeasure"
-              data-cy="unitOfMeasure"
-              :error-messages="form().serverErrors(this, 'unitOfMeasure')"
-              @input="fieldValueChanged('unitOfMeasure')"
-            ></v-text-field>
-          </v-col> -->
-
           <v-col
             v-if="form().showMe(this, 'UnitOfMeasure')"
             cols="12"
@@ -317,31 +299,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "inv-part-edit";
 const API_BASE_URL = "part/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Part"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Part";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
 
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Part);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -349,7 +320,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -363,14 +334,12 @@ export default {
           setDirty = true;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -395,31 +364,27 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          partNumber: null,
-          manufacturerId: null,
-          manufacturerNumber: null,
-          wholeSalerId: null,
-          wholeSalerNumber: null,
-          alternativeWholeSalerId: null,
-          alternativeWholeSalerNumber: null,
-          cost: 0,
-          retail: 0,
-          unitOfMeasure: null,
-          upc: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        partNumber: null,
+        manufacturerId: null,
+        manufacturerNumber: null,
+        wholeSalerId: null,
+        wholeSalerNumber: null,
+        alternativeWholeSalerId: null,
+        alternativeWholeSalerNumber: null,
+        cost: 0,
+        retail: 0,
+        unitOfMeasure: null,
+        upc: null
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -437,23 +402,17 @@ export default {
       }
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -494,7 +453,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -502,14 +461,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -517,9 +472,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -537,7 +490,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -547,36 +500,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.push({
               name: "inv-part",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -593,42 +536,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -637,7 +571,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "inv-part",
         params: {
@@ -646,8 +579,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -658,7 +589,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -677,7 +608,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Part,
             selectedRowIds: [m.vm.obj.id]
@@ -777,7 +708,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiBoxes",
@@ -812,8 +743,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -821,8 +750,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -889,9 +817,6 @@ function generateMenu(vm) {
     });
   }
 
-  //---- SHOW ALL ---
-  //menuOptions.menuItems.push({ divider: true, inset: true });
-  //menuOptions.menuItems.push({ header: vm.$ay.t("ShowAll") });
   menuOptions.menuItems.push({
     title: "WorkOrderList", //note: technically it opens teh woitemunitlist not workorders but it's confusing in the UI otherwise and this is how people would think about it
     icon: "$ayiTools",
@@ -899,8 +824,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //MIGRATE_OUTSTANDING show all: workorderlist, unitlist, quotelist, pmlist
-
   menuOptions.menuItems.push({
     title: "QuoteList",
     icon: "$ayiPencilAlt",
@@ -935,7 +858,7 @@ async function initForm(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  let res = await window.$gz.api.get("part/prior-unit-of-measure-list");
+  const res = await window.$gz.api.get("part/prior-unit-of-measure-list");
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
diff --git a/ayanova/src/views/inv-parts.vue b/ayanova/src/views/inv-parts.vue
index 0215f079..d8e3916d 100644
--- a/ayanova/src/views/inv-parts.vue
+++ b/ayanova/src/views/inv-parts.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "inv-part-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Part)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Part),
             m.id
           );
@@ -80,7 +79,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBoxes",
     title: "PartList",
@@ -117,8 +116,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -126,8 +123,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 5caadc54..94369136 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- {{ obj.items }} -->
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
@@ -856,31 +855,20 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "inv-purchase-order-edit";
 const API_BASE_URL = "purchase-order/";
-const FORM_CUSTOM_TEMPLATE_KEY = "PurchaseOrder"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "PurchaseOrder";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.PurchaseOrder);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //---------------------------------
       let setDirty = false;
-      let setValid = true;
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -888,7 +876,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -897,7 +885,6 @@ export default {
           this.obj.concurrency = undefined;
           this.obj.id = 0;
           this.obj.serial = 0;
-
           vm.obj.status = 1; // OpenNotYetOrdered = 1,
           vm.obj.items.forEach(z => {
             z.id = 0;
@@ -909,7 +896,6 @@ export default {
             z.workOrderItemPartRequestId = null;
             z.partRequestedById = null;
           });
-
           setDirty = true;
         }
       }
@@ -917,7 +903,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       //----------------------------
       generateMenu(vm);
@@ -956,31 +942,26 @@ export default {
         status: []
       },
       headers: [],
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          serial: 0,
-          notes: null,
-          wiki: null,
-          customFields: null,
-          tags: [],
-          vendorMemo: null,
-          dropShipToCustomerId: null,
-          referenceNumber: null,
-          vendorId: null,
-          orderedDate: window.$gz.locale.nowUTC8601String(),
-          expectedReceiveDate: null,
-          status: 1,
-          projectId: null,
-          text1: null,
-          text2: null,
-          items: []
-        },
-
+      obj: {
+        id: 0,
+        concurrency: 0,
+        serial: 0,
+        notes: null,
+        wiki: null,
+        customFields: null,
+        tags: [],
+        vendorMemo: null,
+        dropShipToCustomerId: null,
+        referenceNumber: null,
+        vendorId: null,
+        orderedDate: window.$gz.locale.nowUTC8601String(),
+        expectedReceiveDate: null,
+        status: 1,
+        projectId: null,
+        text1: null,
+        text2: null,
+        items: []
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -1002,23 +983,17 @@ export default {
       hour12: window.$gz.locale.getHour12()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -1038,57 +1013,52 @@ export default {
   },
   computed: {
     headerList: function() {
-      /*
-  If the column is a text, left-align it
-  If the column is a number or number + unit, (or date) right-align it (like excel)
-  */
-      let headers = [];
-      let vm = this;
+      const headers = [];
       headers.push({
-        text: vm.$ay.t("Part"),
+        text: this.$ay.t("Part"),
         align: "left",
         value: "partViz"
       });
 
-      if (vm.form().showMe(vm, "Items.PartName")) {
+      if (this.form().showMe(this, "Items.PartName")) {
         headers.push({
-          text: vm.$ay.t("PartName"),
+          text: this.$ay.t("PartName"),
           align: "left",
           value: "partNameViz"
         });
       }
 
-      if (vm.obj.hasSelectableWarehouses) {
+      if (this.obj.hasSelectableWarehouses) {
         headers.push({
-          text: vm.$ay.t("PartWarehouse"),
+          text: this.$ay.t("PartWarehouse"),
           align: "left",
           value: "warehouseViz"
         });
       }
 
-      if (vm.form().showMe(vm, "Items.PartUnitOfMeasureViz")) {
+      if (this.form().showMe(this, "Items.PartUnitOfMeasureViz")) {
         headers.push({
-          text: vm.$ay.t("UnitOfMeasure"),
+          text: this.$ay.t("UnitOfMeasure"),
           align: "left",
           value: "partUnitOfMeasureViz"
         });
       }
 
       headers.push({
-        text: vm.$ay.t("PurchaseOrderItemQuantityOrdered"),
+        text: this.$ay.t("PurchaseOrderItemQuantityOrdered"),
         align: "right",
         value: "quantityOrdered"
       });
 
-      if (vm.obj.hasReceipt) {
+      if (this.obj.hasReceipt) {
         headers.push({
-          text: vm.$ay.t("PurchaseOrderItemQuantityReceived"),
+          text: this.$ay.t("PurchaseOrderItemQuantityReceived"),
           align: "right",
           value: "quantityReceived"
         });
-        if (vm.form().showMe(vm, "Items.ReceivedDate")) {
+        if (this.form().showMe(this, "Items.ReceivedDate")) {
           headers.push({
-            text: vm.$ay.t("PurchaseOrderReceiptReceivedDate"),
+            text: this.$ay.t("PurchaseOrderReceiptReceivedDate"),
             align: "right",
             value: "receivedDate"
           });
@@ -1096,115 +1066,120 @@ export default {
       }
 
       headers.push({
-        text: vm.$ay.t("PurchaseOrderItemPurchaseOrderCost"),
+        text: this.$ay.t("PurchaseOrderItemPurchaseOrderCost"),
         align: "right",
         value: "purchaseOrderCost"
       });
 
-      if (vm.obj.hasReceipt) {
+      if (this.obj.hasReceipt) {
         headers.push({
-          text: vm.$ay.t("PurchaseOrderReceiptItemReceiptCost"),
+          text: this.$ay.t("PurchaseOrderReceiptItemReceiptCost"),
           align: "right",
           value: "receivedCost"
         });
       }
 
-      if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
+      if (
+        this.obj.hasTaxes &&
+        this.form().showMe(this, "Items.PurchaseTaxCodeId")
+      ) {
         headers.push({
-          text: vm.$ay.t("TaxCode"),
+          text: this.$ay.t("TaxCode"),
           align: "left",
           value: "purchaseTaxCodeViz"
         });
       }
 
       headers.push({
-        text: vm.$ay.t("PurchaseOrderItemNetTotal"),
+        text: this.$ay.t("PurchaseOrderItemNetTotal"),
         align: "right",
         value: "netTotalViz"
       });
 
-      if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
+      if (
+        this.obj.hasTaxes &&
+        this.form().showMe(this, "Items.PurchaseTaxCodeId")
+      ) {
         headers.push({
-          text: vm.$ay.t("TaxCodeTaxA"),
+          text: this.$ay.t("TaxCodeTaxA"),
           align: "right",
           value: "taxAViz"
         });
 
         headers.push({
-          text: vm.$ay.t("TaxCodeTaxB"),
+          text: this.$ay.t("TaxCodeTaxB"),
           align: "right",
           value: "taxBViz"
         });
       }
 
       headers.push({
-        text: vm.$ay.t("PurchaseOrderItemLineTotal"),
+        text: this.$ay.t("PurchaseOrderItemLineTotal"),
         align: "right",
         value: "lineTotalViz"
       });
 
       if (
-        vm.obj.hasVendorNumber &&
-        vm.form().showMe(vm, "Items.VendorPartNumber")
+        this.obj.hasVendorNumber &&
+        this.form().showMe(this, "Items.VendorPartNumber")
       ) {
         headers.push({
-          text: vm.$ay.t("PurchaseOrderItemVendorPartNumber"),
+          text: this.$ay.t("PurchaseOrderItemVendorPartNumber"),
           align: "left",
           value: "vendorPartNumber"
         });
       }
 
-      if (vm.obj.hasPartRequest) {
-        if (vm.form().showMe(vm, "Items.PartRequestedById")) {
+      if (this.obj.hasPartRequest) {
+        if (this.form().showMe(this, "Items.PartRequestedById")) {
           headers.push({
-            text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
+            text: this.$ay.t("PurchaseOrderItemPartRequestedByID"),
             align: "left",
             value: "partRequestedByViz"
           });
         }
-        if (vm.form().showMe(vm, "Items.WorkOrderItemPartRequestId")) {
+        if (this.form().showMe(this, "Items.WorkOrderItemPartRequestId")) {
           headers.push({
-            text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
+            text: this.$ay.t("PurchaseOrderItemWorkOrderNumber"),
             align: "left",
             value: "workOrderItemPartRequestViz"
           });
         }
       }
 
-      if (!vm.formState.readOnly) {
+      if (!this.formState.readOnly) {
         headers.push({ text: "", value: "actions" });
       }
       return headers;
     },
     itemList: function() {
-      let vm = this;
-      return vm.obj.items.map((x, i) => {
+      return this.obj.items.map((x, i) => {
         return {
           index: i,
           id: x.id,
           quantityOrdered: window.$gz.locale.decimalLocalized(
             x.quantityOrdered,
-            vm.languageName
+            this.languageName
           ),
           quantityReceived: window.$gz.locale.decimalLocalized(
             x.quantityReceived,
-            vm.languageName
+            this.languageName
           ),
           purchaseOrderCost: window.$gz.locale.currencyLocalized(
             x.purchaseOrderCost,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           ),
           receivedCost: window.$gz.locale.currencyLocalized(
             x.receivedCost,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           ),
           receivedDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
             x.receivedDate,
-            vm.timeZoneName,
-            vm.languageName,
-            vm.hour12
+            this.timeZoneName,
+            this.languageName,
+            this.hour12
           ),
           vendorPartNumber: x.vendorPartNumber,
           partViz: x.partViz,
@@ -1217,64 +1192,63 @@ export default {
           purchaseTaxCodeViz: x.purchaseTaxCodeViz,
           netTotalViz: window.$gz.locale.currencyLocalized(
             x.netTotalViz,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           ),
           taxAViz: window.$gz.locale.currencyLocalized(
             x.taxAViz,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           ),
           taxBViz: window.$gz.locale.currencyLocalized(
             x.taxBViz,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           ),
           lineTotalViz: window.$gz.locale.currencyLocalized(
             x.lineTotalViz,
-            vm.languageName,
-            vm.currencyName
+            this.languageName,
+            this.currencyName
           )
         };
       });
     },
     restockHeaderList: function() {
-      let headers = [];
-      let vm = this;
+      const headers = [];
       headers.push({
-        text: vm.$ay.t("Part"),
+        text: this.$ay.t("Part"),
         align: "left",
         value: "partNumber"
       });
 
-      if (vm.obj.hasSelectableWarehouses) {
+      if (this.obj.hasSelectableWarehouses) {
         headers.push({
-          text: vm.$ay.t("PartWarehouse"),
+          text: this.$ay.t("PartWarehouse"),
           align: "left",
           value: "warehouseViz"
         });
       }
 
       headers.push({
-        text: vm.$ay.t("PartByWarehouseInventoryMinStockLevel"),
+        text: this.$ay.t("PartByWarehouseInventoryMinStockLevel"),
         align: "right",
         value: "minimumQuantity"
       });
 
       headers.push({
-        text: vm.$ay.t("PartInventoryBalance"),
+        text: this.$ay.t("PartInventoryBalance"),
         align: "right",
         value: "balance"
       });
 
       headers.push({
-        text: vm.$ay.t("PartByWarehouseInventoryQuantityOnOrder"),
+        text: this.$ay.t("PartByWarehouseInventoryQuantityOnOrder"),
         align: "right",
         value: "onOrderQuantity"
       });
 
       headers.push({
-        text: vm.$ay.t("PartByWarehouseInventoryReorderQuantity"),
+        text: this.$ay.t("PartByWarehouseInventoryReorderQuantity"),
         align: "right",
         value: "requiredQuantity"
       });
@@ -1282,14 +1256,7 @@ export default {
       return headers;
     },
     restockItemList: function() {
-      /**
-       *
-       * {"data":[{"partId":2,"partWarehouseId":1,"partNumber":"249986","warehouseViz":"Default","manufacturerId":2,
-       * "displayManufacturer":"Ryan - Legros","wholesalerId":6,"displayWholesaler":"Emmerich and Sons","alternativeWholesalerId":9,
-       * "displayAlternativeWholesaler":"O'Connell - MacGyver","minimumQuantity":6.0000,"balance":4.0000,"onOrderQuantity":0.0,"requiredQuantity":2.0000}]}
-       */
-      let vm = this;
-      return vm.restockItems.map((x, i) => {
+      return this.restockItems.map((x, i) => {
         return {
           index: i,
           partId: x.partId,
@@ -1299,66 +1266,65 @@ export default {
 
           minimumQuantity: window.$gz.locale.decimalLocalized(
             x.minimumQuantity,
-            vm.languageName
+            this.languageName
           ),
           balance: window.$gz.locale.decimalLocalized(
             x.balance,
-            vm.languageName
+            this.languageName
           ),
           onOrderQuantity: window.$gz.locale.decimalLocalized(
             x.onOrderQuantity,
-            vm.languageName
+            this.languageName
           ),
           requiredQuantity: window.$gz.locale.decimalLocalized(
             x.requiredQuantity,
-            vm.languageName
+            this.languageName
           )
         };
       });
     },
     requestHeaderList: function() {
-      let headers = [];
-      let vm = this;
+      const headers = [];
       headers.push({
-        text: vm.$ay.t("Part"),
+        text: this.$ay.t("Part"),
         align: "left",
         value: "partNumber"
       });
 
-      if (vm.obj.hasSelectableWarehouses) {
+      if (this.obj.hasSelectableWarehouses) {
         headers.push({
-          text: vm.$ay.t("PartWarehouse"),
+          text: this.$ay.t("PartWarehouse"),
           align: "left",
           value: "partWarehouseName"
         });
       }
 
       headers.push({
-        text: vm.$ay.t("WorkOrderItemPartRequestQuantity"),
+        text: this.$ay.t("WorkOrderItemPartRequestQuantity"),
         align: "right",
         value: "quantity"
       });
 
       headers.push({
-        text: vm.$ay.t("WorkOrder"),
+        text: this.$ay.t("WorkOrder"),
         align: "right",
         value: "serial"
       });
 
       headers.push({
-        text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
+        text: this.$ay.t("PurchaseOrderItemPartRequestedByID"),
         align: "left",
         value: "requestedByUserName"
       });
 
       headers.push({
-        text: vm.$ay.t("PartWholesalerID"),
+        text: this.$ay.t("PartWholesalerID"),
         align: "left",
         value: "wholesalerName"
       });
 
       headers.push({
-        text: vm.$ay.t("PartAlternativeWholesalerID"),
+        text: this.$ay.t("PartAlternativeWholesalerID"),
         align: "left",
         value: "altWholesalerName"
       });
@@ -1366,26 +1332,7 @@ export default {
       return headers;
     },
     requestItemList: function() {
-      /**
-      {
-	"0": {
-		"requestId": 2,
-		"partId": 7,
-		"partWarehouseId": 1,
-		"quantity": 498,
-		"serial": 74,
-		"partNumber": "CAB1064",
-		"partName": "KYBD EXT-DIN5M DIN5F 6FT",
-		"partWarehouseName": "Default",
-		"wholesalerId": 19,
-		"wholesalerName": "Merisale",
-		"altWholesalerId": 13,
-		"altWholesalerName": "Ingrim"
-	}
-}
-       */
-      let vm = this;
-      return vm.requestItems.map((x, i) => {
+      return this.requestItems.map((x, i) => {
         return {
           index: i,
           requestId: x.requestId,
@@ -1400,7 +1347,7 @@ export default {
           altWholesalerName: x.altWholesalerName,
           quantity: window.$gz.locale.decimalLocalized(
             x.quantity,
-            vm.languageName
+            this.languageName
           )
         };
       });
@@ -1453,13 +1400,11 @@ export default {
     },
 
     async showRestockSelectDialog() {
-      let vm = this;
-
-      let url = API_BASE_URL + "restock-by-vendor/" + vm.obj.vendorId;
+      const vm = this;
+      const url = API_BASE_URL + "restock-by-vendor/" + vm.obj.vendorId;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(url);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -1481,13 +1426,11 @@ export default {
       }
     },
     async showRequestSelectDialog() {
-      let vm = this;
-
-      let url = API_BASE_URL + "requests-by-vendor/" + vm.obj.vendorId;
+      const vm = this;
+      const url = API_BASE_URL + "requests-by-vendor/" + vm.obj.vendorId;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(url);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -1552,7 +1495,7 @@ export default {
       this.editPoItemDialog = false;
     },
     receiveAll: function() {
-      let vm = this;
+      const vm = this;
       this.obj.items.forEach(item => receiveItem(item, vm));
       //set status to all received fwiw
       this.obj.status = 5;
@@ -1596,15 +1539,15 @@ export default {
       return null;
     },
     async updatePartCost(item) {
-      let vm = this;
-      let dialogResult = await window.$gz.dialog.confirmGeneric(
+      const vm = this;
+      const dialogResult = await window.$gz.dialog.confirmGeneric(
         "ConfirmUpdatePartCost"
       );
       if (dialogResult == false) {
         return;
       }
       //send request
-      let res = await window.$gz.api.put(
+      const res = await window.$gz.api.put(
         `part/part-cost/${item.partId}`,
         item.receivedCost
       );
@@ -1637,7 +1580,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -1645,14 +1588,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -1660,10 +1599,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1681,7 +1617,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -1691,17 +1627,13 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //POST or PUT - whole new object returned which is a little different than other objects
+          //POST or PUT which is a little different than other objects
           //so if it's new then need to navigate to it to update url with id
           if (vm.$route.params.recordid != 0) {
             //update of existing record
@@ -1711,12 +1643,10 @@ export default {
               name: "inv-purchase-order",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form will prevent fetch
+                obj: res.data
               }
             });
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1733,42 +1663,34 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -1777,7 +1699,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "inv-purchase-order",
         params: {
@@ -1808,7 +1729,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1827,7 +1748,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.PurchaseOrder,
             selectedRowIds: [m.vm.obj.id]
@@ -1853,7 +1774,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiTruckLoading",
@@ -1888,8 +1809,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1897,8 +1816,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1947,7 +1865,6 @@ async function initForm(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  //ensure the pick lists required are pre-fetched
   await window.$gz.enums.fetchEnumList("purchaseorderstatus");
   vm.selectLists.status = window.$gz.enums.getSelectionList(
     "purchaseorderstatus"
@@ -2028,88 +1945,4 @@ async function fetchTranslatedText(vm) {
     "PurchaseOrderCustom16"
   ]);
 }
-/* {
-        data: {
-          id: 4,
-          concurrency: 7343586,
-          serial: 4,
-          notes: "Eius tenetur magnam nostrum qui doloribus velit.",
-          wiki: null,
-          customFields: null,
-          tags: ["black", "green", "zebra", "zone0"],
-          vendorMemo: "Et quis eaque repellat.",
-          dropShipToCustomerId: null,
-          referenceNumber: "578929",
-          vendorId: 2,
-          orderedDate: "2020-05-03T07:57:42.014786Z",
-          expectedReceiveDate: "2020-05-08T07:57:42.014786Z",
-          status: 2,
-          projectId: null,
-          text1: "Natus pariatur.",
-          text2: "Provident repudiandae nobis et.",
-          items: [
-            {
-              id: 15,
-              concurrency: 7343586,
-              purchaseOrderId: 4,
-              partId: 13,
-              partWarehouseId: 2,
-              quantityOrdered: 65.0,
-              quantityReceived: 0.0,
-              purchaseOrderCost: 15.6812,
-              receivedCost: 0.0,
-              receivedDate: null,
-              partRequestedById: null,
-              workOrderItemPartRequestId: null,
-              purchaseTaxCodeId: 3,
-              vendorPartNumber: "man-695831",
-              partViz: "695831",
-              warehouseViz: "WHS- Lera Brook",
-              partRequestedByViz: null,
-              workOrderItemPartRequestViz: null,
-              purchaseTaxCodeViz: "Sales & Goods",
-              netTotalViz: 1019.278,
-              TaxAViz: 71.34946,
-              TaxBViz: 71.34946,
-              lineTotalViz: 1161.97692
-            }
-          ],
-          hasSelectableWarehouses: true,
-          hasPartRequest: false,
-          hasTaxes: true,
-          hasReceipt: false,
-          hasVendorNumber: true,
-          hasUnreceived: true
-        }
-      };
-      
-      
-      
-      //RESTOCK REQUIRED
-  if (
-    useInventory &&
-    window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest)
-  ) {
-    sub.push({
-      title: "PurchaseOrderUIRestockList",
-      icon: "$ayiClipboardList",
-      route: "/inv-part-restocks",
-      key: key++
-    });
-  }
-
-  //PART REQUESTS
-  if (
-    useInventory &&
-    window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest)
-  ) {
-    sub.push({
-      title: "WorkOrderItemPartRequestList",
-      icon: "$ayiParachuteBox",
-      route: "/inv-part-requests",
-      key: key++
-    });
-  }
-
-      */
 </script>
diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue
index ba16f3cf..8abb8f27 100644
--- a/ayanova/src/views/inv-purchase-orders.vue
+++ b/ayanova/src/views/inv-purchase-orders.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "inv-purchaseorder-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PurchaseOrder
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PurchaseOrder
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -100,7 +99,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTruckLoading",
     title: "InventoryPurchaseOrders",
@@ -121,8 +120,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -130,8 +127,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 9ffb3e90..1f6710bb 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -35,39 +35,6 @@
     <v-row align="center" justify="center" class="mx-auto mt-sm-12 mb-16">
       <v-col cols="12" offset-md="4">
         <form>
-          <!-- <div>
-            <v-icon class="fa-spin">$ayiWrench</v-icon>
-            <v-icon class="fa-pulse">$ayiWrench</v-icon>
-            <v-icon>$ayiBusinessTime</v-icon>
-            <v-icon class="fa-fw">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-border">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-li">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-inverse">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-flip-horizontal">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-flip-vertical">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-flip-both">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-xs">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-6x">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-rotate-90">$ayiBusinessTime</v-icon>
-            <v-icon class="fa-swap-opacity">$ayiBusinessTime</v-icon>
-            <font-awesome-layers class="fa-2x">
-              <font-awesome-icon icon="filter" />
-              <font-awesome-icon
-                style="color: gray;"
-                transform="grow-3 down-2"
-                icon="ban"
-              />
-            </font-awesome-layers>
-
-            <font-awesome-layers full-width class="fa-4x">
-              <font-awesome-icon icon="bell" />
-              <font-awesome-layers-text
-                class="gray8"
-                transform="down-2 shrink-8"
-                value="Q"
-              />
-            </font-awesome-layers>
-          </div> -->
           <v-row>
             <!-- Customer logo -->
             <v-col v-if="showCustomSmallLogo()" cols="12">
@@ -218,13 +185,9 @@
     </v-footer>
   </div>
 </template>
-
 <script>
-/*  xeslint-disable */
-
 import { processLogin, processLogout } from "../api/authutil";
 import ayaNovaVersion from "../api/ayanova-version";
-
 export default {
   data() {
     return {
@@ -370,25 +333,21 @@ export default {
     };
   },
   async created() {
-    let vm = this;
-
+    const vm = this;
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
       icon: "",
       title: null
     });
-
     //reset password redirects here with preset creds
     //this will help the user identify it and hopefully remember it
     if (vm.$route.params.presetLogin) {
       vm.input.username = vm.$route.params.presetLogin;
       vm.input.password = vm.$route.params.presetPassword;
     }
-
     vm.smallLogoUrl = window.$gz.api.logoUrl("small");
     vm.mediumLogoUrl = window.$gz.api.logoUrl("medium");
     vm.largeLogoUrl = window.$gz.api.logoUrl("large");
-
     try {
       let res = await window.$gz.api.get("notify/hello");
       if (res.data != null) {
@@ -413,12 +372,12 @@ export default {
     async tfaVerify() {
       //
       //send 2fa code to server if ok, then proceed as normal
-      let vm = this;
+      const vm = this;
       if (vm.pin && vm.pin != "") {
         vm.pinError = null;
 
         try {
-          let res = await window.$gz.api.upsert(
+          const res = await window.$gz.api.upsert(
             "auth/tfa-authenticate",
             {
               pin: vm.pin,
@@ -432,11 +391,9 @@ export default {
             // throw new Error(res.error);
             throw new Error(window.$gz.errorHandler.errorToString(res, vm));
           }
-
           await this.step2(res);
         } catch (error) {
           //bad PIN?
-
           if (
             error.message &&
             error.message.includes("ErrorUserNotAuthenticated")
@@ -471,8 +428,7 @@ export default {
       }
     },
     cancelTfaVerify() {
-      //todo: maybe redirect to login page instead??
-      let vm = this;
+      const vm = this;
       vm.tt = null;
       vm.pin = null;
       vm.errorBadCreds = false;
@@ -507,7 +463,6 @@ export default {
       return true;
     },
     showCustomSmallLogo() {
-      //https://vuetifyjs.com/en/features/breakpoints/#breakpoint-service
       return this.hasMediumLogo && this.$vuetify.breakpoint.smAndDown;
     },
     showCustomMediumLogo() {
@@ -532,7 +487,7 @@ export default {
       document.getElementsByName("password")[0].focus();
     },
     async login() {
-      let vm = this;
+      const vm = this;
 
       if (vm.input.username != "" && vm.input.password != "") {
         vm.errorBadCreds = false;
@@ -540,7 +495,7 @@ export default {
           vm.input.username == "superuser" && vm.input.password == "l3tm3in";
 
         try {
-          let res = await window.$gz.api.upsert(
+          const res = await window.$gz.api.upsert(
             "auth",
             {
               login: vm.input.username,
@@ -548,13 +503,10 @@ export default {
             },
             true
           );
-
           if (res.error) {
             //don't expect this to ever get called but just in case
-            // throw new Error(res.error);
             throw new Error(window.$gz.errorHandler.errorToString(res, vm));
           }
-
           //check for 2fa enabled, if so then need to do one more step before process login can be called
           if (res.data.tfa) {
             this.authTwoFactor = res.data.authTwoFactor;
@@ -606,9 +558,8 @@ export default {
       }
     },
     async step2(res) {
-      let vm = this;
+      const vm = this;
       await processLogin(res.data, vm.loggedInWithKnownPassword);
-
       //check if support and updates has expired and is paid for license and show warning if so
       if (
         vm.$store.state.globalSettings.maintenanceExpired &&
@@ -625,16 +576,16 @@ export default {
         })();
       }
 
-      let toPath = vm.$route.params.topath; //set in app.vue::mounted
+      const toPath = vm.$route.params.topath; //set in app.vue::mounted
       if (toPath != undefined) {
         //check if it's an open report link and if so
         //trigger that to open in a new window and continue on to normal home page
         if (toPath.startsWith("/viewreport")) {
           (async function() {
             //open report links have a query string /viewreport?oid=[objectid]&rid=[reportid]
-            let searchParams = new URLSearchParams(vm.$route.params.search);
-            let objectId = parseInt(searchParams.get("oid"));
-            let reportId = parseInt(searchParams.get("rid"));
+            const searchParams = new URLSearchParams(vm.$route.params.search);
+            const objectId = parseInt(searchParams.get("oid"));
+            const reportId = parseInt(searchParams.get("rid"));
             await window.$gz.api.renderReport(objectId, reportId); //objectid,reportid
           })();
           vm.$router.push(vm.$store.state.homePage);
@@ -651,7 +602,6 @@ export default {
     //very important as this in conjunction with the menu options means
     //navigation guards work properly by just sending people here
     next(() => {
-      // auth.logout();
       processLogout();
       next();
     });
diff --git a/ayanova/src/views/notfound.vue b/ayanova/src/views/notfound.vue
index bbef7cc6..2a0668af 100644
--- a/ayanova/src/views/notfound.vue
+++ b/ayanova/src/views/notfound.vue
@@ -10,7 +10,6 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
 export default {
   data() {
@@ -19,7 +18,7 @@ export default {
     };
   },
   created() {
-    let badPath = this.$router.history.current.path;
+    const badPath = this.$router.history.current.path;
     //If this happens too early then it might not have all the setup stuff available which would trigger an infinite loop
     if (
       !window ||
@@ -30,7 +29,7 @@ export default {
     ) {
       this.msg = '404 - NOT FOUND: "' + badPath + '"';
     } else {
-      let notFoundTranslated = this.$ay.t("ErrorAPI2010");
+      const notFoundTranslated = this.$ay.t("ErrorAPI2010");
       //format the message
       this.msg = "404 - " + notFoundTranslated + ': "' + badPath + '"';
       //log it in case we need to see it in tech support
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index 1ea67478..88b01116 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -97,20 +97,13 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-backup";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Backup);
       vm.formState.readOnly = !vm.rights.change;
       vm.formState.ready = true;
@@ -173,7 +166,7 @@ export default {
         if (this.formState.loading) {
           return;
         }
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -204,18 +197,15 @@ export default {
       }
     },
     async deleteItem(item) {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.remove(`backup/${item.name}`);
+        const res = await window.$gz.api.remove(`backup/${item.name}`);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -230,13 +220,10 @@ export default {
       }
     },
     async getBackupStatus() {
-      let vm = this;
-      //  vm.formState.loading = true;
-      let url = "backup/status";
+      const vm = this;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("backup/status");
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -247,9 +234,9 @@ export default {
           //process add url dl token and id
           if (res.data) {
             vm.backupAvailableSpace = res.data.availableFreeSpace;
-            let ret = [];
+            const ret = [];
             for (let i = 0; i < res.data.backupFiles.length; i++) {
-              let o = res.data.backupFiles[i];
+              const o = res.data.backupFiles[i];
               ret.push({
                 id: i,
                 created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
@@ -279,13 +266,11 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "global-ops-backup-setting";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("global-ops-backup-setting");
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -311,14 +296,15 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       try {
         if (vm.canSave) {
           vm.formState.loading = true;
-          let url = "global-ops-backup-setting";
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.upsert(url, vm.obj);
-
+          const res = await window.$gz.api.upsert(
+            "global-ops-backup-setting",
+            vm.obj
+          );
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
@@ -337,12 +323,11 @@ export default {
       }
     },
     async backupNow() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "backup/backup-now";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.upsert(url, {});
+        const res = await window.$gz.api.upsert("backup/backup-now", {});
         vm.formState.loading = false;
         if (res.error) {
           vm.formState.serverError = res.error;
@@ -363,7 +348,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -392,7 +377,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFileArchive",
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index 45674728..ef384cca 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -27,20 +27,13 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-jobs";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.ServerJob);
       vm.formState.readOnly = !vm.rights.change;
       vm.formState.ready = true;
@@ -64,7 +57,6 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      //cache display format stuff
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       languageName: window.$gz.locale.getResolvedLanguage(),
       hour12: window.$gz.locale.getHour12()
@@ -89,13 +81,11 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "job-operations/logs/all-jobs";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("job-operations/logs/all-jobs");
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -105,9 +95,9 @@ export default {
         } else {
           if (res.data) {
             vm.rawObj = res.data;
-            let ret = [];
+            const ret = [];
             for (let i = 0; i < res.data.length; i++) {
-              let o = res.data[i];
+              const o = res.data[i];
               ret.push({
                 id: i,
                 created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
@@ -130,7 +120,6 @@ export default {
             vm.rawObj = [];
             vm.obj = [];
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -148,12 +137,11 @@ export default {
       }
     },
     async testJob() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "job-operations/test-job";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.upsert(url, {});
+        const res = await window.$gz.api.upsert("job-operations/test-job", {});
         vm.formState.loading = false;
         if (res.error) {
           vm.formState.serverError = res.error;
@@ -171,7 +159,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiRobot",
@@ -211,7 +199,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "copylog":
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index 02997ae8..4e594867 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -15,7 +15,6 @@
       >
       </v-select>
     </v-col>
-
     <v-col cols="12">
       <v-card elevation="4">
         <v-card
@@ -29,20 +28,13 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-logs";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       generateMenu(vm);
@@ -77,12 +69,6 @@ export default {
     onResize() {
       this.logCardHeight = window.innerHeight * 0.7;
     },
-    // translation() {
-    //   return window.$gz.translation;
-    // },
-    // locale() {
-    //   return window.$gz.locale;
-    // },
     form() {
       return window.$gz.form;
     },
@@ -95,16 +81,14 @@ export default {
       this.getDataFromApi();
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       if (!vm.selectedLog) {
         return;
       }
       vm.formState.loading = true;
-      let url = "log-file/" + vm.selectedLog;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("log-file/" + vm.selectedLog);
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -117,14 +101,12 @@ export default {
           } else {
             vm.log = vm.$ay.t("NoData");
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-          // generateMenu(vm);
         }
       } catch (error) {
         window.$gz.form.setFormState({
@@ -141,7 +123,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiHistory",
     title: "ServerLog",
@@ -159,7 +141,6 @@ function generateMenu(vm) {
       }
     ]
   };
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -170,7 +151,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "copylog":
@@ -210,7 +191,6 @@ async function populateSelectionLists(vm) {
   if (res.error) {
     vm.formState.serverError = res.error;
     window.$gz.form.setErrorBoxErrors(vm);
-    //window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.serverLogs = res.data;
   }
diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index e0f4abb0..12ad604d 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -79,20 +79,15 @@
     </v-tabs>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //https://blog.hubspot.com/marketing/types-of-graphs-for-data-visualization
 //https://medium.com/javascript-in-plain-english/exploring-chart-js-e3ba70b07aa4
 import relativeDatefilterCalculator from "../api/relative-date-filter-calculator.js";
 import Palette from "../api/palette";
 const FORM_KEY = "ops-metrics";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -118,8 +113,6 @@ export default {
           xAxes: [
             {
               type: "time",
-
-              // distribution: "linear",
               gridLines: {
                 drawOnChartArea: false
               }
@@ -176,21 +169,19 @@ export default {
       this.getDataFromApi();
     },
     tabChanged: function(tab) {
-      let vm = this;
+      const vm = this;
       if (vm[tabIndexToRoute(vm.tab)].isnew) {
         vm.getDataFromApi();
       }
     },
-
     async getDataFromApi(breakPoint) {
-      let vm = this;
+      const vm = this;
       if (vm.formState.loading) {
         return;
       }
-      let filterDates = relativeDatefilterCalculator.tokenToDates(
+      const filterDates = relativeDatefilterCalculator.tokenToDates(
         vm.selectedTimePeriod
       );
-
       vm.formState.loading = true;
       if (breakPoint == null) {
         breakPoint = vm.$vuetify.breakpoint.name;
@@ -203,7 +194,6 @@ export default {
       //Note: used geometric progression of 1.5 for this
       //40*1.5=60, 60*1.5=90 etc etc etc
       //wanted it to fit between 40 at lowest end and 200 at highest end
-
       switch (breakPoint) {
         case "xs":
           max = 40;
@@ -223,8 +213,7 @@ export default {
         default:
           max = 200;
       }
-
-      let url =
+      const url =
         "server-metric/" +
         tabIndexToRoute(vm.tab) +
         "?maxRecords=" +
@@ -233,11 +222,9 @@ export default {
         filterDates.after +
         "&tsEnd=" +
         filterDates.before;
-
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(url);
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -253,7 +240,6 @@ export default {
             valid: true,
             loading: false
           });
-
           vm.formState.ready = true;
         }
       } catch (error) {
@@ -297,21 +283,15 @@ export default {
       };
     },
     dbTopTablesChartData() {
-      // debugger;
       if (!this.db.topTables) {
         return { labels: [], datasets: [] };
       }
       return {
         //  These labels appear in the legend and in the tooltips when hovering different arcs
-        //_.map(users, 'user');
-        //de-lodash
-        // labels: window.$gz. _.map(this.db.topTables, "name"),
         labels: this.db.topTables.map(z => z.name),
         datasets: [
           {
             label: this.$ay.t("MetricTopTablesSize"),
-            //de-lodash
-            // data: window.$gz. _.map(this.db.topTables, "value"),
             data: this.db.topTables.map(z => z.value),
             backgroundColor: Palette.getSoftPaletteArray(
               this.db.topTables ? this.db.topTables.length : 3
@@ -336,12 +316,9 @@ export default {
           {
             label: this.$ay.t("MetricWorkingSet"),
             borderColor: Palette.color.soft_green,
-            //borderWidth:4,
-            // pointStyle: "rectRot",
             radius: 0,
             hoverRadius: 10,
             hitRadius: 4,
-            // borderDash: [20, 3, 3, 3, 3, 3, 3, 3],
             fill: false,
             data: this.memcpu.workingSet
           },
@@ -427,7 +404,7 @@ function tabIndexToRoute(tabIndex) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFileMedicalAlt",
     title: "ServerMetrics",
@@ -435,17 +412,8 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.ServerMetrics
     },
-    menuItems: [
-      // {
-      //   title: "DEV_TEST_COLLECT",
-      //   icon: "fa - bolt",
-      //   surface: true,
-      //   key: FORM_KEY + ":collect",
-      //   vm: vm
-      // }
-    ]
+    menuItems: []
   };
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -456,13 +424,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      // case "collect":
-      //   //trigger garbage collection
-      //   window.$gz.api.get("server-metric/collect");
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -477,7 +441,7 @@ function clickHandler(menuItem) {
 //
 async function initForm(vm) {
   await fetchTranslatedText(vm);
-  await populateSelectionLists(vm);
+  populateSelectionLists(vm);
 }
 
 /////////////////////////////////
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index 639973c2..2800586d 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -155,20 +155,13 @@
     </v-row>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-notification-settings";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(
         window.$gz.type.OpsNotificationSettings
       );
@@ -234,7 +227,7 @@ export default {
         if (this.formState.loading) {
           return;
         }
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -265,13 +258,11 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "global-ops-notification-setting";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("global-ops-notification-setting");
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -297,14 +288,15 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       try {
         if (vm.canSave) {
           vm.formState.loading = true;
-          let url = "global-ops-notification-setting";
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.upsert(url, vm.obj);
-
+          const res = await window.$gz.api.upsert(
+            "global-ops-notification-setting",
+            vm.obj
+          );
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
@@ -323,13 +315,15 @@ export default {
       }
     },
     async testConfiguration() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
       vm.testDialog = false;
-      let url = `global-ops-notification-setting/test-smtp-settings/${vm.testAddress}`;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.upsert(url, {});
+        const res = await window.$gz.api.upsert(
+          `global-ops-notification-setting/test-smtp-settings/${vm.testAddress}`,
+          {}
+        );
         vm.formState.loading = false;
         if (res.error) {
           vm.formState.serverError = res.error;
@@ -352,7 +346,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -374,7 +368,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiBullhorn",
@@ -447,8 +441,7 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  await window.$gz.enums.fetchEnumList("NotifyMailSecurity"); //prefetch
-  //populate
+  await window.$gz.enums.fetchEnumList("NotifyMailSecurity");
   vm.selectLists.NotifyMailSecurity = window.$gz.enums.getSelectionList(
     "NotifyMailSecurity"
   );
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 5f092270..119445c3 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -5,7 +5,6 @@
       <v-btn @click="getDataFromApi" class="mb-6">
         <v-icon>$ayiSync</v-icon>
       </v-btn>
-
       <v-data-table
         :headers="headers"
         :items="obj"
@@ -26,20 +25,13 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-notify-queue";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(
         window.$gz.type.OpsNotificationSettings
       );
@@ -66,8 +58,6 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-
-      //cache display format stuff
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       languageName: window.$gz.locale.getResolvedLanguage(),
       hour12: window.$gz.locale.getHour12()
@@ -78,23 +68,21 @@ export default {
   },
   methods: {
     async deleteItem(item) {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         vm.formState.loading = true;
-
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.remove(`notify/notify-event/${item.id}`);
+        const res = await window.$gz.api.remove(
+          `notify/notify-event/${item.id}`
+        );
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //refresh
           await vm.getDataFromApi();
         }
       } catch (ex) {
@@ -104,13 +92,11 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "notify/queue";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get("notify/queue");
         if (res.error) {
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
@@ -120,12 +106,9 @@ export default {
         } else {
           if (res.data) {
             vm.rawObj = res.data;
-
-            /*{"data":[{"id":6,"created":"2020-07-24T17:52:05.777883Z","eventDate":"2020-07-24T17:52:05.777886Z","deliverAfter":"2021-07-24T17:52:05.777886Z",
-"userId":1,"eventType":10,"ayaType":2,"name":"Small Frozen Chicken 117-1"}]} */
-            let ret = [];
+            const ret = [];
             for (let i = 0; i < res.data.length; i++) {
-              let o = res.data[i];
+              const o = res.data[i];
               ret.push({
                 id: o.id,
                 created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
@@ -153,13 +136,11 @@ export default {
                 user: o.user
               });
             }
-
             vm.obj = ret;
           } else {
             vm.rawObj = [];
             vm.obj = [];
           }
-
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -183,7 +164,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiBullhorn",
@@ -192,27 +173,9 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.ServerJob
     },
-    menuItems: [
-      //   {
-      //     title: "Copy",
-      //     icon: "$ayiCopy",
-      //     surface: false,
-      //     key: FORM_KEY + ":copylog",
-      //     vm: vm
-      //   }
-    ]
+    menuItems: []
   };
 
-  //   if (vm.rights.change) {
-  //     menuOptions.menuItems.push({
-  //       title: "OpsTestJob",
-  //       icon: "$ayiRobot",
-  //       surface: false,
-  //       key: FORM_KEY + ":TEST_JOB",
-  //       vm: vm
-  //     });
-  //   }
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
@@ -223,18 +186,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      //   case "copylog":
-      //     //put the log info on the clipboard:
-      //     window.$gz.util.copyToClipboard(
-      //       "SERVER JOBS LOG\n" + JSON.stringify(m.vm.rawObj, null, 1)
-      //     );
-      //     break;
-      //   case "TEST_JOB":
-      //     m.vm.testJob();
-      //     break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -272,8 +226,7 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-async function cacheEnums(vm) {
-  //ensure the enum values required are pre-fetched
+async function cacheEnums() {
   await window.$gz.enums.fetchEnumList("NotifyEventType");
   await window.$gz.enums.fetchEnumList("coreall");
 }
diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue
index aac92176..3d371d97 100644
--- a/ayanova/src/views/ops-profile.vue
+++ b/ayanova/src/views/ops-profile.vue
@@ -19,22 +19,15 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-profile";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
       window.$gz.eventBus.$on("menu-click", clickHandler);
       generateMenu(vm);
-      // vm.getDataFromApi();
       this.formState.ready = true;
     } catch (err) {
       vm.formState.ready = true;
@@ -47,7 +40,6 @@ export default {
   data() {
     return {
       cardHeight: 300,
-
       formState: {
         ready: false,
         loading: false,
@@ -62,9 +54,7 @@ export default {
     onResize() {
       this.cardHeight = window.innerHeight * 0.85;
     },
-
     profileUrl() {
-      // "http://localhost:7575/profiler/results-index?t=l47NWWuZo89MU1GuHV/tYY0d2xwsFrY/K5MZb1zTTvY";
       return (
         window.$gz.api.ServerBaseUrl() +
         "profiler/results-index?t=" +
@@ -73,7 +63,7 @@ export default {
     },
 
     refreshProfile() {
-      let ifr = document.getElementById("profileFrame");
+      const ifr = document.getElementById("profileFrame");
       ifr.src = ifr.src;
     }
   }
@@ -83,7 +73,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBinoculars",
     title: "ServerProfiler",
@@ -91,15 +81,7 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.ServerMetrics
     },
-    menuItems: [
-      //   {
-      //     title: "Copy"),
-      //     icon: "$ayiCopy",
-      //     surface: false,
-      //     key: FORM_KEY + ":copylog",
-      //     vm: vm
-      //   }
-    ]
+    menuItems: []
   };
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);
@@ -112,13 +94,9 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
-      //   case "copylog":
-      //     //put the log info on the clipboard:
-      //     window.$gz.util.copyToClipboard("SERVER LOG\n" + m.vm.log);
-      //     break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue
index 9c85f4e8..1700e171 100644
--- a/ayanova/src/views/ops-server-state.vue
+++ b/ayanova/src/views/ops-server-state.vue
@@ -4,7 +4,6 @@
       <v-form ref="form">
         <v-row>
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-radio-group
               v-model="obj.serverState"
@@ -44,22 +43,15 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-server-state";
 const API_BASE_URL = "server-state/";
-const FORM_CUSTOM_TEMPLATE_KEY = "ServerState"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "ServerState";
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.ServerState);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -93,17 +85,13 @@ export default {
       rights: window.$gz.role.defaultRightsObject()
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
-        let canSave = val.dirty && val.valid && !val.readOnly;
+        const canSave = val.dirty && val.valid && !val.readOnly;
         if (canSave) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
@@ -128,32 +116,26 @@ export default {
       }
     },
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = API_BASE_URL;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL);
         vm.formState.ready = true;
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false
           });
-          //modify the menu as necessary
           generateMenu(vm);
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -162,24 +144,17 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
-        let url = API_BASE_URL;
-
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         try {
-          let res = await window.$gz.api.upsert(url, vm.obj);
-
+          const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
-
-            //Handle "put" of an existing record (UPDATE)
             vm.obj.concurrency = res.data.concurrency;
             window.$gz.form.setFormState({
               vm: vm,
@@ -193,12 +168,11 @@ export default {
       }
     },
     async shutdown() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "server-state/shutdown";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.upsert(url, {});
+        const res = await window.$gz.api.upsert("server-state/shutdown", {});
         vm.formState.loading = false;
         if (res.error) {
           vm.formState.serverError = res.error;
@@ -221,7 +195,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -250,7 +224,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     readOnly: vm.formState.readOnly,
     icon: "$ayiDoorOpen",
@@ -259,9 +233,6 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.ServerState
     },
-    formData: {
-      // ayaType: window.$gz.type.UserOptions
-    },
     menuItems: []
   };
 
@@ -290,14 +261,14 @@ function generateMenu(vm) {
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
 }
 
 //////////////////////////////////////////////////////////
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "ServerStateOpen",
     "ServerStateOps",
diff --git a/ayanova/src/views/ops-view-configuration.vue b/ayanova/src/views/ops-view-configuration.vue
index e61daf31..5b3c704c 100644
--- a/ayanova/src/views/ops-view-configuration.vue
+++ b/ayanova/src/views/ops-view-configuration.vue
@@ -123,17 +123,11 @@
     </v-col>
   </v-row>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "ops-view-configuration";
-
 export default {
   async created() {
-    let vm = this;
+    const vm = this;
     try {
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -162,19 +156,18 @@ export default {
   },
   methods: {
     async getDataFromApi() {
-      let vm = this;
+      const vm = this;
       vm.formState.loading = true;
-      let url = "server-state/active-configuration";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       try {
-        let res = await window.$gz.api.get(url);
+        const res = await window.$gz.api.get(
+          "server-state/active-configuration"
+        );
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.config = res.data;
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -198,7 +191,7 @@ export default {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiInfoCircle",
     title: "ViewServerConfiguration",
@@ -216,7 +209,7 @@ function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       default:
@@ -227,31 +220,4 @@ function clickHandler(menuItem) {
     }
   }
 }
-
-/////////////////////////////////
-//
-//
-async function initForm(vm) {
-  //await fetchTranslatedText(vm);
-}
-
-// //////////////////////////////////////////////////////////
-// //
-// // Ensures UI translated text is available
-// //
-// async function fetchTranslatedText(vm) {
-//   await window.$gz.translation.cacheTranslations(["ViewServerConfiguration"]);
-// }
-
-/*
-AYANOVA_DEFAULT_TRANSLATION = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION,
-                    AYANOVA_USE_URLS = ServerBootConfig.AYANOVA_USE_URLS,
-                    AYANOVA_DB_CONNECTION = ServerBootConfig.AYANOVA_DB_CONNECTION,
-                    AYANOVA_FOLDER_USER_FILES = ServerBootConfig.AYANOVA_FOLDER_USER_FILES,
-                    AYANOVA_FOLDER_BACKUP_FILES = ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES,
-                    AYANOVA_BACKUP_PG_DUMP_PATH = ServerBootConfig.AYANOVA_BACKUP_PG_DUMP_PATH,
-                    AYANOVA_LOG_PATH = ServerBootConfig.AYANOVA_LOG_PATH,
-                    AYANOVA_LOG_LEVEL = ServerBootConfig.AYANOVA_LOG_LEVEL,
-                    AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG = ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG
-*/
 </script>
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index eb34c5ae..cba5db40 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -1306,31 +1306,19 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "contract-edit";
 const API_BASE_URL = "contract/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Contract"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Contract";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Contract);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -1338,7 +1326,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -1354,18 +1342,15 @@ export default {
           this.obj.contractPartOverrideItems.forEach(z => (z.id = 0));
           this.obj.contractServiceRateOverrideItems.forEach(z => (z.id = 0));
           this.obj.contractTravelRateOverrideItems.forEach(z => (z.id = 0));
-
           setDirty = true;
         }
       }
-
       window.$gz.form.setFormState({
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -1390,35 +1375,31 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          responseTime: "00:00:00",
-          contractServiceRatesOnly: false,
-          contractTravelRatesOnly: false,
-          partsOverridePct: 0,
-          partsOverrideType: 1,
-          serviceRatesOverridePct: 0,
-          serviceRatesOverrideType: 1,
-          travelRatesOverridePct: 0,
-          travelRatesOverrideType: 1,
-          alertNotes: null,
-          serviceRateItems: [],
-          travelRateItems: [],
-          contractPartOverrideItems: [],
-          contractTravelRateOverrideItems: [],
-          contractServiceRateOverrideItems: []
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        responseTime: "00:00:00",
+        contractServiceRatesOnly: false,
+        contractTravelRatesOnly: false,
+        partsOverridePct: 0,
+        partsOverrideType: 1,
+        serviceRatesOverridePct: 0,
+        serviceRatesOverrideType: 1,
+        travelRatesOverridePct: 0,
+        travelRatesOverrideType: 1,
+        alertNotes: null,
+        serviceRateItems: [],
+        travelRateItems: [],
+        contractPartOverrideItems: [],
+        contractTravelRateOverrideItems: [],
+        contractServiceRateOverrideItems: []
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -1446,23 +1427,17 @@ export default {
       editTravelRateItemIndex: 0
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -1612,7 +1587,6 @@ export default {
       this.editTravelRateItemIndex = -1;
       this.formState.dirty = true;
     },
-
     canSave: function() {
       return this.formState.valid && this.formState.dirty;
     },
@@ -1638,7 +1612,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -1646,14 +1620,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -1661,9 +1631,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1681,47 +1649,39 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
         vm.editTravelRateItemIndex = -1;
         vm.editServiceRateItemIndex = -1;
         vm.editContractPartOverrideItemIndex = -1;
         vm.editContractTravelRateOverrideItemIndex = -1;
         vm.editContractServiceRateOverrideItemIndex = -1;
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //POST or PUT - whole new object returned which is a little different than other objects
+          //POST or PUT which is a little different than other objects
           //so if it's new then need to navigate to it to update url with id
           if (vm.$route.params.recordid != 0) {
-            //update of existing record
             vm.obj = res.data;
           } else {
             this.$router.replace({
               name: "contract-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form will prevent fetch
+                obj: res.data
               }
             });
           }
-
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1738,42 +1698,35 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -1783,7 +1736,6 @@ export default {
     },
 
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "contract-edit",
         params: {
@@ -1792,8 +1744,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -1804,7 +1754,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1823,7 +1773,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Contract,
             selectedRowIds: [m.vm.obj.id]
@@ -1849,7 +1799,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFileContract",
@@ -1884,8 +1834,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1893,8 +1841,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1927,7 +1874,6 @@ function generateMenu(vm) {
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
 let JUST_DELETED = false;
 
 /////////////////////////////////
@@ -1985,7 +1931,6 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  //ensure the pick lists required are pre-fetched
   await window.$gz.enums.fetchEnumList("contractoverridetype");
   vm.selectLists.overrideTypes = window.$gz.enums.getSelectionList(
     "contractoverridetype"
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index 042f2972..d4ef0822 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "contract-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Contract)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Contract
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFileContract",
     title: "ContractList",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 54b9132b..62e63154 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -227,30 +227,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "csr-edit";
 const API_BASE_URL = "csr/";
-const FORM_CUSTOM_TEMPLATE_KEY = "CustomerServiceRequest"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "CustomerServiceRequest";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(
         window.$gz.type.CustomerServiceRequest
       );
       vm.formState.readOnly = !vm.rights.change || vm.obj.status != 0;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -262,7 +252,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -306,50 +296,24 @@ export default {
         status: [],
         priorities: []
       },
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        /*{
-	"data": {
-		"id": 1,
-		"concurrency": 3058764,
-		"name": "We need to quantify the optical SQL circuit!",
-		"notes": "Ab impedit unde voluptate ipsam doloremque deserunt est eos ut.",
-		"wiki": null,
-		"customFields": null,
-		"tags": [
-			"green",
-			"violet"
-		],
-		"dateRequested": "2020-01-10T18:20:31.294229Z",
-		"customerId": 28,
-		"unitId": null,
-		"workOrderItemId": null,
-		"requestedByUserId": 48,
-		"customerReferenceNumber": "65560804",
-		"status": 0,
-		"priority": 2
-	}
-} */
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          dateRequested: window.$gz.locale.nowUTC8601String(),
-          customerId: null,
-          unitId: null,
-          workOrderItemId: null,
-          requestedByUserId: null, //window.$gz.store.state.userId, for outside version of this form
-          customerReferenceNumber: null,
-          status: 0,
-          priority: 0
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        dateRequested: window.$gz.locale.nowUTC8601String(),
+        customerId: null,
+        unitId: null,
+        workOrderItemId: null,
+        requestedByUserId: null,
+        customerReferenceNumber: null,
+        status: 0,
+        priority: 0
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -364,30 +328,23 @@ export default {
       ayaType: window.$gz.type.CustomerServiceRequest
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
             FORM_KEY + ":duplicate"
           );
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
-
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":reject");
         } else {
           window.$gz.eventBus.$emit(
@@ -395,7 +352,6 @@ export default {
             FORM_KEY + ":duplicate"
           );
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
-
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":reject");
         }
         if (!val.dirty && val.valid) {
@@ -452,7 +408,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -460,14 +416,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -475,9 +427,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -496,46 +446,36 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "csr-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -552,42 +492,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -596,16 +527,14 @@ export default {
       }
     },
     async reject() {
-      let vm = this;
+      const vm = this;
       if (vm.obj.status != 0 || vm.$route.params.recordid == 0) {
         return;
       }
       //change status to rejected and save
       vm.obj.status = 2; //declined=2, accepted=1
-
       try {
         await this.submit();
-        // navigate backwards
         vm.$router.go(-1);
       } catch (ex) {
         window.$gz.errorHandler.handleFormError(ex, vm);
@@ -619,16 +548,14 @@ export default {
     async accept() {
       //generate work order from this csr
       //flag this csr as accepted
-      let vm = this;
+      const vm = this;
       if (vm.$route.params.recordid == 0) {
         return;
       }
-
       //create new workorder for this csr
       //navigate to the new workorder so it can be edited and or saved
       //workorder is responsible for flagging as fromcsr so that server can update the csr when it sees the wo is new and the fromcsrid is set
-
-      let w = {
+      const w = {
         id: 0,
         concurrency: 0,
         serial: 0,
@@ -672,8 +599,7 @@ export default {
         isLockedAtServer: false,
         alertViz: null
       };
-
-      let wi = {
+      const wi = {
         id: 0,
         concurrency: 0,
         fromCSRId: this.obj.id,
@@ -701,7 +627,6 @@ export default {
         units: [],
         outsideServices: []
       };
-
       if (this.obj.unitId != null) {
         wi.units.push({
           id: 0,
@@ -717,10 +642,7 @@ export default {
           warrantyViz: null
         });
       }
-
       w.items.push(wi);
-
-      //Navigate to new record
       this.$router.push({
         name: "workorder-edit",
         params: {
@@ -729,7 +651,6 @@ export default {
         }
       });
     }
-    //end methods
   }
 };
 
@@ -740,7 +661,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -749,7 +670,6 @@ async function clickHandler(menuItem) {
       case "delete":
         m.vm.remove();
         break;
-
       case "reject":
         m.vm.reject();
         break;
@@ -757,7 +677,7 @@ async function clickHandler(menuItem) {
         m.vm.accept();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.CustomerServiceRequest,
             selectedRowIds: [m.vm.obj.id]
@@ -783,7 +703,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly || vm.obj.status != 0,
     icon: "$ayiConciergeBell",
@@ -822,8 +742,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -831,8 +749,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -863,12 +780,10 @@ function generateMenu(vm) {
         vm: vm
       });
     }
-
     menuOptions.menuItems.push({ divider: true, inset: false });
   }
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
 let JUST_DELETED = false;
 
 /////////////////////////////////
@@ -922,12 +837,10 @@ async function fetchTranslatedText() {
 //
 //
 async function populateSelectionLists(vm) {
-  //ensure the pick lists required are pre-fetched
   await window.$gz.enums.fetchEnumList("CustomerServiceRequestStatus");
   vm.selectLists.status = window.$gz.enums.getSelectionList(
     "CustomerServiceRequestStatus"
   );
-
   await window.$gz.enums.fetchEnumList("CustomerServiceRequestPriority");
   vm.selectLists.priorities = window.$gz.enums.getSelectionList(
     "CustomerServiceRequestPriority"
diff --git a/ayanova/src/views/svc-csrs.vue b/ayanova/src/views/svc-csrs.vue
index 6f6a7857..318d086b 100644
--- a/ayanova/src/views/svc-csrs.vue
+++ b/ayanova/src/views/svc-csrs.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "csr-list";
 export default {
@@ -55,7 +54,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -65,7 +64,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.CustomerServiceRequest
           )
@@ -76,7 +75,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.CustomerServiceRequest
             ),
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -102,7 +101,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiConciergeBell",
     title: "CustomerServiceRequestList",
@@ -123,8 +122,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -132,8 +129,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index ddfb6f32..37fb3009 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -417,31 +417,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "loan-unit-edit";
 const API_BASE_URL = "loan-unit/";
-const FORM_CUSTOM_TEMPLATE_KEY = "LoanUnit"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "LoanUnit";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.LoanUnit);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -449,7 +437,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -468,7 +456,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -498,37 +486,32 @@ export default {
       selectLists: {
         loanunitrateunit: []
       },
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          serial: null,
-          workOrderItemLoanId: null,
-          rateHour: 0,
-          rateHalfDay: 0,
-          rateDay: 0,
-          rateWeek: 0,
-          rateMonth: 0,
-          rateYear: 0,
-          rateHourCost: 0,
-          rateHalfDayCost: 0,
-          rateDayCost: 0,
-          rateWeekCost: 0,
-          rateMonthCost: 0,
-          rateYearCost: 0,
-          defaultRate: 1,
-          unitId: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        serial: null,
+        workOrderItemLoanId: null,
+        rateHour: 0,
+        rateHalfDay: 0,
+        rateDay: 0,
+        rateWeek: 0,
+        rateMonth: 0,
+        rateYear: 0,
+        rateHourCost: 0,
+        rateHalfDayCost: 0,
+        rateDayCost: 0,
+        rateWeekCost: 0,
+        rateMonthCost: 0,
+        rateYearCost: 0,
+        defaultRate: 1,
+        unitId: null
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -543,23 +526,17 @@ export default {
       ayaType: window.$gz.type.LoanUnit
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -600,7 +577,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -608,14 +585,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -623,9 +596,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -643,46 +614,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "loan-unit-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -699,42 +659,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -743,7 +694,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "loan-unit-edit",
         params: {
@@ -752,8 +702,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -764,7 +712,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -783,7 +731,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.LoanUnit,
             selectedRowIds: [m.vm.obj.id]
@@ -839,7 +787,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiPlug",
@@ -874,8 +822,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -883,8 +829,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -915,9 +860,6 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  //---- SHOW ALL ---
-  //MIGRATE_OUTSTANDING show all: workorderlist, quotelist, pmlist
-
   menuOptions.menuItems.push({
     title: "WorkOrderList",
     icon: "$ayiTools",
@@ -938,7 +880,6 @@ function generateMenu(vm) {
     key: FORM_KEY + ":PMList",
     vm: vm
   });
-  //--- /show all ---
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
@@ -1004,7 +945,6 @@ async function fetchTranslatedText(vm) {
 //
 //
 async function populateSelectionLists(vm) {
-  //ensure the pick lists required are pre-fetched
   await window.$gz.enums.fetchEnumList("loanunitrateunit");
   vm.selectLists.loanunitrateunit = window.$gz.enums.getSelectionList(
     "loanunitrateunit"
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index df22aea7..64600e8b 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "loanunit-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.LoanUnit)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.LoanUnit
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPlug",
     title: "LoanUnitList",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-meter-reading.vue b/ayanova/src/views/svc-meter-reading.vue
index 774c353d..0679b99e 100644
--- a/ayanova/src/views/svc-meter-reading.vue
+++ b/ayanova/src/views/svc-meter-reading.vue
@@ -1,12 +1,9 @@
 <template>
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <!-- {{ formState }} -->
-
     <v-form ref="form" v-if="formState.ready">
       <v-row>
         <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
         <v-col cols="12">
           <gz-pick-list
             readonly
@@ -63,23 +60,14 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "meter-reading";
 const API_BASE_URL = "unit/meter-reading/";
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Unit);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -95,7 +83,7 @@ export default {
             readOnly: true
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         vm.obj.unitId = this.$route.params.unitid;
@@ -134,18 +122,7 @@ export default {
   },
   data() {
     return {
-      /*
-      
-        public string Description { get; set; }
-        public long Meter { get; set; }
-        public DateTime MeterDate { get; set; }
-        public long UnitId { get; set; }
-        public long? WorkOrderItemUnitId { get; set; }
-        */
       obj: {
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
         id: 0,
         concurrency: 0,
         notes: null,
@@ -168,23 +145,17 @@ export default {
       ayaType: window.$gz.type.UnitMeterReading
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
         } else {
@@ -217,7 +188,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -225,14 +196,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -240,16 +207,13 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
             valid: true,
             loading: false,
-            readOnly: true //always read only if fetched as this is a write only object
+            readOnly: true
           });
         }
       } catch (error) {
@@ -262,47 +226,36 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "meter-reading",
               params: {
                 recordid: res.data.id,
                 unitid: res.data.unitId,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -328,13 +281,12 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
         m.vm.submit();
         break;
-
       case "new":
         m.vm.$router.push({
           name: "meter-reading",
@@ -342,7 +294,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.UnitMeterReading,
             selectedRowIds: [m.vm.obj.id]
@@ -368,7 +320,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiWeight",
@@ -391,8 +343,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -400,8 +350,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -432,14 +381,14 @@ let JUST_DELETED = false;
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
 }
 
 //////////////////////////////////////////////////////////
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "UnitMeterReading",
     "UnitMeterReadingDescription",
@@ -448,24 +397,4 @@ async function fetchTranslatedText(vm) {
     "UnitMeterReadingWorkOrderItemID"
   ]);
 }
-
-///////////////////////////////////////////////////////////
-//
-//
-async function fetchCustomerName(vm) {
-  //If customer name is missing then fetch it here to display
-  //this will happen when this form is directly opened from a search
-  //or record history etc
-
-  let res = await window.$gz.api.get(
-    `name/${window.$gz.type.Customer}/${vm.obj.unitId}`
-  );
-
-  //We never expect there to be no data here
-  if (!res.hasOwnProperty("data")) {
-    return Promise.reject(res);
-  } else {
-    vm.customername = res.data;
-  }
-}
 </script>
diff --git a/ayanova/src/views/svc-meter-readings.vue b/ayanova/src/views/svc-meter-readings.vue
index 7737b7b5..8f8d3b4a 100644
--- a/ayanova/src/views/svc-meter-readings.vue
+++ b/ayanova/src/views/svc-meter-readings.vue
@@ -15,13 +15,7 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const FORM_KEY = "meter-reading-list";
 export default {
   created() {
@@ -47,7 +41,6 @@ export default {
     return {
       unitId: undefined,
       workOrderItemUnitId: undefined,
-      // unitname: undefined,
       clientCriteria: undefined,
       preFilterMode: null,
       rights: window.$gz.role.defaultRightsObject(),
@@ -69,7 +62,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -84,7 +77,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.UnitMeterReading
             ),
@@ -94,7 +87,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -110,7 +103,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: !vm.rights.change,
     icon: "$ayiWeight",
@@ -132,8 +125,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +132,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -152,7 +142,6 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 </script>
diff --git a/ayanova/src/views/svc-pm-item-expenses.vue b/ayanova/src/views/svc-pm-item-expenses.vue
index e3ea8c33..b454aa4a 100644
--- a/ayanova/src/views/svc-pm-item-expenses.vue
+++ b/ayanova/src/views/svc-pm-item-expenses.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-expense-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemExpense
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemExpense
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiMoneyBillWave",
     title: "WorkOrderItemExpenseList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-labors.vue b/ayanova/src/views/svc-pm-item-labors.vue
index b7e5ffd5..ea3405af 100644
--- a/ayanova/src/views/svc-pm-item-labors.vue
+++ b/ayanova/src/views/svc-pm-item-labors.vue
@@ -86,7 +86,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +96,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemLabor
           )
@@ -107,7 +107,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemLabor
             ),
@@ -117,7 +117,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -144,7 +144,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiHammer",
     title: "WorkOrderItemLaborList",
@@ -165,8 +165,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +172,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-loans.vue b/ayanova/src/views/svc-pm-item-loans.vue
index 9646c6a1..5b8552d4 100644
--- a/ayanova/src/views/svc-pm-item-loans.vue
+++ b/ayanova/src/views/svc-pm-item-loans.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-loan-list";
 export default {
@@ -35,11 +34,9 @@ export default {
       this.$route.params.objectId
     );
     this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
     if (this.objectId && this.objectId != 0 && this.aForType) {
       //OBJECTID,AYATYPE
       this.clientCriteria = `${this.objectId},${this.aForType}`;
-
       this.preFilterMode = {
         icon: window.$gz.util.iconForType(this.aForType),
         id: this.objectId,
@@ -86,7 +83,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +93,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemLoan
           )
@@ -107,7 +104,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemLoan
             ),
@@ -117,7 +114,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -130,7 +127,6 @@ async function clickHandler(menuItem) {
           name: "svc-pm-items"
         });
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -144,7 +140,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPlug",
     title: "WorkOrderItemLoanList",
@@ -165,8 +161,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +168,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-outside-services.vue b/ayanova/src/views/svc-pm-item-outside-services.vue
index a1b0c6d4..18854421 100644
--- a/ayanova/src/views/svc-pm-item-outside-services.vue
+++ b/ayanova/src/views/svc-pm-item-outside-services.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-outside-service-list";
 export default {
@@ -45,7 +44,6 @@ export default {
     }
   }
 };
-
 /////////////////////////////
 //
 //
@@ -53,7 +51,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +61,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemOutsideService
           )
@@ -74,7 +72,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemOutsideService
             ),
@@ -84,7 +82,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -97,7 +95,6 @@ async function clickHandler(menuItem) {
           name: "svc-pm-items"
         });
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -111,7 +108,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiLuggageCart",
     title: "WorkOrderItemOutsideServiceList",
@@ -132,8 +129,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +136,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-parts.vue b/ayanova/src/views/svc-pm-item-parts.vue
index 50bd1382..61f8c67a 100644
--- a/ayanova/src/views/svc-pm-item-parts.vue
+++ b/ayanova/src/views/svc-pm-item-parts.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-part-list";
 export default {
@@ -39,7 +38,6 @@ export default {
     if (this.objectId && this.objectId != 0 && this.aForType) {
       //OBJECTID,AYATYPE
       this.clientCriteria = `${this.objectId},${this.aForType}`;
-
       this.preFilterMode = {
         icon: window.$gz.util.iconForType(this.aForType),
         id: this.objectId,
@@ -86,7 +84,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +94,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemPart
           )
@@ -107,7 +105,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemPart
             ),
@@ -117,7 +115,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -144,7 +142,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBoxes",
     title: "WorkOrderItemPartList",
@@ -165,8 +163,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +170,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-scheduled-users.vue b/ayanova/src/views/svc-pm-item-scheduled-users.vue
index f2568a1a..0dcf0bef 100644
--- a/ayanova/src/views/svc-pm-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-pm-item-scheduled-users.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-scheduled-user-list";
 export default {
@@ -35,11 +34,9 @@ export default {
       this.$route.params.objectId
     );
     this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
     if (this.objectId && this.objectId != 0 && this.aForType) {
       //OBJECTID,AYATYPE
       this.clientCriteria = `${this.objectId},${this.aForType}`;
-
       this.preFilterMode = {
         icon: window.$gz.util.iconForType(this.aForType),
         id: this.objectId,
@@ -86,7 +83,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +93,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemScheduledUser
           )
@@ -107,7 +104,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemScheduledUser
             ),
@@ -117,7 +114,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -144,7 +141,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUserClock",
     title: "WorkOrderItemScheduledUserList",
@@ -165,8 +162,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +169,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-tasks.vue b/ayanova/src/views/svc-pm-item-tasks.vue
index 09cf3b25..195f7b06 100644
--- a/ayanova/src/views/svc-pm-item-tasks.vue
+++ b/ayanova/src/views/svc-pm-item-tasks.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-task-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemTask
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemTask
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTasks",
     title: "WorkOrderItemTasks",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-travels.vue b/ayanova/src/views/svc-pm-item-travels.vue
index d6bf6c19..514191e2 100644
--- a/ayanova/src/views/svc-pm-item-travels.vue
+++ b/ayanova/src/views/svc-pm-item-travels.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-travel-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemTravel
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemTravel
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTruckMonster",
     title: "WorkOrderItemTravelList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-item-units.vue b/ayanova/src/views/svc-pm-item-units.vue
index eb55f217..ae22cc65 100644
--- a/ayanova/src/views/svc-pm-item-units.vue
+++ b/ayanova/src/views/svc-pm-item-units.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-item-unit-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.PMItemUnit
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemUnit
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFan",
     title: "WorkOrderItemUnitList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm-items.vue b/ayanova/src/views/svc-pm-items.vue
index 06e20c0f..8dc5ebb2 100644
--- a/ayanova/src/views/svc-pm-items.vue
+++ b/ayanova/src/views/svc-pm-items.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem),
             m.id
           );
@@ -80,7 +79,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "PMList":
@@ -152,7 +151,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiWrench",
     title: "WorkOrderItemList",
@@ -173,8 +172,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -182,8 +179,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index 6f112258..bcdf32e5 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -15,7 +15,6 @@
           data-cy="woHeader"
           @change="setDirty()"
         />
-
         <GzPMItems
           v-model="obj"
           :form-key="formCustomTemplateKey"
@@ -66,20 +65,12 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-
 import GzPMHeader from "../components/pm-header.vue";
 import GzPMItems from "../components/pm-items.vue";
-
 const FORM_KEY = "pm-edit";
 const API_BASE_URL = "pm/";
-const FORM_CUSTOM_TEMPLATE_KEY = "PM"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "PM";
 
 export default {
   components: {
@@ -92,11 +83,9 @@ export default {
     try {
       await initForm(vm);
 
-      //set base rights
       vm.rights = window.$gz.role.getRights(window.$gz.type.PM);
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
 
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
@@ -111,7 +100,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
           //check for copy wo item on route params
           let wi = this.$route.params.copyItem;
           if (wi) {
@@ -152,7 +141,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       //update which areas are available to user and force generate menu
@@ -272,23 +261,19 @@ export default {
       genCopyAttachments: false
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -353,7 +338,6 @@ export default {
         const res = await window.$gz.api.get(url);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -410,12 +394,10 @@ export default {
           vm.lastGetContractId = vm.obj.contractId; //preserve for triggering full update if something changes it later
           vm.lastGetCustomerId = vm.obj.customerId; //preserve for triggering full update if something changes it later
 
-          //modify the menu as necessary
           generateMenu(vm);
           //update which areas are available to user
           updateRights(vm);
 
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -444,7 +426,6 @@ export default {
           loading: true
         });
 
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
 
         //#######################################################
@@ -542,23 +523,21 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
         let dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
           let url = API_BASE_URL + vm.$route.params.recordid;
@@ -570,14 +549,13 @@ export default {
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
             //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
+
             JUST_DELETED = true;
-            // navigate backwards
+
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -610,7 +588,7 @@ export default {
       if (!this.genCopyWiki) {
         cp.wiki = null; //already copied, need to remove it instead
       }
-      //Navigate to new record
+
       this.$router.push({
         name: "pm-edit",
         params: {
@@ -649,7 +627,6 @@ export default {
       cp.techSignatureName = null;
       cp.techSignatureCaptured = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "workorder-edit",
         params: {
@@ -684,7 +661,6 @@ export default {
       cp.submitted = null;
       cp.approved = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "quote-edit",
         params: {
@@ -768,8 +744,6 @@ export default {
         });
       }
     }
-
-    //end methods
   }
 };
 
@@ -1010,7 +984,7 @@ async function saveUnits(vm, woItemIndex) {
         //Server will update fields on put or post for most  graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
         res.data.warrantyViz = null; //Add local key so it's reactive in vue
-        vm.obj.items[woItemIndex].units.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].units.splice(i, 1, res.data);
       }
     }
   }
@@ -1052,7 +1026,7 @@ async function saveScheduledUsers(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most  graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data);
       }
     }
   }
@@ -1120,7 +1094,7 @@ async function saveTasks(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data);
       }
     }
   }
@@ -1226,7 +1200,7 @@ async function saveParts(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data);
       }
     }
   }
@@ -1262,7 +1236,7 @@ async function saveLabors(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data);
       }
     }
   }
@@ -1329,7 +1303,7 @@ async function saveTravels(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data);
       }
     }
   }
@@ -1425,7 +1399,7 @@ async function saveExpenses(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data);
       }
     }
   }
@@ -1489,7 +1463,7 @@ async function saveLoans(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data);
       }
     }
   }
@@ -1560,7 +1534,7 @@ async function saveOutsideServices(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most pm graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data);
       }
     }
   }
@@ -1674,7 +1648,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1705,7 +1679,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicateDlg = true;
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.PM,
             selectedRowIds: [m.vm.obj.id]
@@ -1764,7 +1738,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     hideCoreBizStandardOptions: vm.obj.userIsRestrictedType,
@@ -1805,8 +1779,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1814,8 +1786,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-pms.vue b/ayanova/src/views/svc-pms.vue
index 6ffce19c..bb8df03e 100644
--- a/ayanova/src/views/svc-pms.vue
+++ b/ayanova/src/views/svc-pms.vue
@@ -60,7 +60,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "pm-list";
 export default {
@@ -68,7 +67,6 @@ export default {
     this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     await fetchTranslatedText();
-
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
     this.objectId = window.$gz.util.stringToIntOrNull(
@@ -119,13 +117,12 @@ export default {
       this.preFilterMode = null;
       this.reload = !this.reload;
     },
-
     async openPM() {
       if (!this.openPMNumber) {
         return;
       }
       //get id from number then push open
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         "pm/id-from-number/" + this.openPMNumber
       );
       if (res.error) {
@@ -134,7 +131,6 @@ export default {
           window.$gz.errorHandler.errorToString(res, this)
         );
         return;
-        // throw new Error(window.$gz.errorHandler.errorToString(res, this));
       }
 
       this.$router.push({
@@ -152,7 +148,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -162,7 +158,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PM)
         );
         if (res && res.refresh == true) {
@@ -171,7 +167,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PM),
             m.id
           );
@@ -179,7 +175,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderItemList":
@@ -203,7 +199,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBusinessTime",
     title: "PMList",
@@ -224,8 +220,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -233,8 +227,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index a927eab2..a4fcf6d5 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -170,30 +170,20 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "project-edit";
 const API_BASE_URL = "project/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Project"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Project";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Project);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //---------------------------------
       let setDirty = false;
-      let setValid = true;
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -201,7 +191,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -219,7 +209,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
       //----------------------------
       generateMenu(vm);
@@ -229,7 +219,7 @@ export default {
       vm.formState.ready = true;
     }
   },
-  async beforeRouteLeave(to, from, next) {
+  async beforeRouteLeave(next) {
     if (!this.formState.dirty || JUST_DELETED) {
       next();
       return;
@@ -246,24 +236,20 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          dateStarted: window.$gz.locale.nowUTC8601String(),
-          dateCompleted: null,
-          projectOverseerId: null,
-          accountNumber: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        dateStarted: window.$gz.locale.nowUTC8601String(),
+        dateCompleted: null,
+        projectOverseerId: null,
+        accountNumber: null
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -278,23 +264,19 @@ export default {
       ayaType: window.$gz.type.Project
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -335,7 +317,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -343,14 +325,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -358,9 +336,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -378,46 +354,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "project-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -434,42 +399,35 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -478,7 +436,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "project-edit",
         params: {
@@ -487,8 +444,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -499,7 +454,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -518,7 +473,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Project,
             selectedRowIds: [m.vm.obj.id]
@@ -574,7 +529,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiProjectDiagram",
@@ -609,8 +564,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -618,8 +571,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -640,7 +592,6 @@ function generateMenu(vm) {
   }
 
   if (vm.rights.change && vm.$route.params.recordid != 0) {
-    //dupe do this
     menuOptions.menuItems.push({
       title: "Duplicate",
       icon: "$ayiClone",
@@ -651,7 +602,6 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  //---- SHOW ALL ---
   menuOptions.menuItems.push({
     title: "WorkOrderList",
     icon: "$ayiTools",
@@ -659,7 +609,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //MIGRATE_OUTSTANDING show all: workorderlist, quotelist, pmlist
   menuOptions.menuItems.push({
     title: "QuoteList",
     icon: "$ayiPencilAlt",
@@ -673,10 +622,8 @@ function generateMenu(vm) {
     key: FORM_KEY + ":PMList",
     vm: vm
   });
-  //--- /show all ---
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/svc-projects.vue b/ayanova/src/views/svc-projects.vue
index 353c8aef..0205df01 100644
--- a/ayanova/src/views/svc-projects.vue
+++ b/ayanova/src/views/svc-projects.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "project-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Project)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Project
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiProjectDiagram",
     title: "ProjectList",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-expenses.vue b/ayanova/src/views/svc-quote-item-expenses.vue
index 16d761af..89e14d69 100644
--- a/ayanova/src/views/svc-quote-item-expenses.vue
+++ b/ayanova/src/views/svc-quote-item-expenses.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-expense-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemExpense
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemExpense
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiMoneyBillWave",
     title: "WorkOrderItemExpenseList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -177,7 +173,6 @@ function generateMenu(vm) {
   });
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 </script>
diff --git a/ayanova/src/views/svc-quote-item-labors.vue b/ayanova/src/views/svc-quote-item-labors.vue
index f99981f7..de5b9687 100644
--- a/ayanova/src/views/svc-quote-item-labors.vue
+++ b/ayanova/src/views/svc-quote-item-labors.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-labor-list";
 export default {
@@ -35,11 +34,9 @@ export default {
       this.$route.params.objectId
     );
     this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
     if (this.objectId && this.objectId != 0 && this.aForType) {
       //OBJECTID,AYATYPE
       this.clientCriteria = `${this.objectId},${this.aForType}`;
-
       this.preFilterMode = {
         icon: window.$gz.util.iconForType(this.aForType),
         id: this.objectId,
@@ -86,7 +83,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +93,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemLabor
           )
@@ -107,7 +104,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemLabor
             ),
@@ -117,7 +114,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -144,7 +141,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiHammer",
     title: "WorkOrderItemLaborList",
@@ -165,8 +162,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +169,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-loans.vue b/ayanova/src/views/svc-quote-item-loans.vue
index 9835aae0..a7cafa79 100644
--- a/ayanova/src/views/svc-quote-item-loans.vue
+++ b/ayanova/src/views/svc-quote-item-loans.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-loan-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemLoan
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemLoan
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPlug",
     title: "WorkOrderItemLoanList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-outside-services.vue b/ayanova/src/views/svc-quote-item-outside-services.vue
index 735802ee..a2bfe575 100644
--- a/ayanova/src/views/svc-quote-item-outside-services.vue
+++ b/ayanova/src/views/svc-quote-item-outside-services.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-outside-service-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemOutsideService
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemOutsideService
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiLuggageCart",
     title: "WorkOrderItemOutsideServiceList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-parts.vue b/ayanova/src/views/svc-quote-item-parts.vue
index 1dda46fb..c19777d4 100644
--- a/ayanova/src/views/svc-quote-item-parts.vue
+++ b/ayanova/src/views/svc-quote-item-parts.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-part-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemPart
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemPart
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBoxes",
     title: "WorkOrderItemPartList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -210,7 +206,6 @@ function generateMenu(vm) {
   });
 
   menuOptions.menuItems.push({ divider: true, inset: false });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 </script>
diff --git a/ayanova/src/views/svc-quote-item-scheduled-users.vue b/ayanova/src/views/svc-quote-item-scheduled-users.vue
index 76cf3c0d..95080d9c 100644
--- a/ayanova/src/views/svc-quote-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-quote-item-scheduled-users.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-scheduled-user-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemScheduledUser
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemScheduledUser
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUserClock",
     title: "WorkOrderItemScheduledUserList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-tasks.vue b/ayanova/src/views/svc-quote-item-tasks.vue
index 663e6f17..5ea2a17b 100644
--- a/ayanova/src/views/svc-quote-item-tasks.vue
+++ b/ayanova/src/views/svc-quote-item-tasks.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-task-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemTask
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemTask
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTasks",
     title: "WorkOrderItemTasks",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-travels.vue b/ayanova/src/views/svc-quote-item-travels.vue
index af996bc7..b6e3385a 100644
--- a/ayanova/src/views/svc-quote-item-travels.vue
+++ b/ayanova/src/views/svc-quote-item-travels.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-travel-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemTravel
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemTravel
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTruckMonster",
     title: "WorkOrderItemTravelList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-item-units.vue b/ayanova/src/views/svc-quote-item-units.vue
index f8ebc657..3bb1ddf7 100644
--- a/ayanova/src/views/svc-quote-item-units.vue
+++ b/ayanova/src/views/svc-quote-item-units.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-item-unit-list";
 export default {
@@ -35,11 +34,9 @@ export default {
       this.$route.params.objectId
     );
     this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
     if (this.objectId && this.objectId != 0 && this.aForType) {
       //OBJECTID,AYATYPE
       this.clientCriteria = `${this.objectId},${this.aForType}`;
-
       this.preFilterMode = {
         icon: window.$gz.util.iconForType(this.aForType),
         id: this.objectId,
@@ -86,7 +83,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +93,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteItemUnit
           )
@@ -107,7 +104,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemUnit
             ),
@@ -117,7 +114,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -144,7 +141,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFan",
     title: "WorkOrderItemUnitList",
@@ -165,8 +162,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +169,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-items.vue b/ayanova/src/views/svc-quote-items.vue
index 34131851..369c172a 100644
--- a/ayanova/src/views/svc-quote-items.vue
+++ b/ayanova/src/views/svc-quote-items.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "quote-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.QuoteItem)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItem
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "QuoteList":
@@ -154,7 +153,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiWrench",
     title: "WorkOrderItemList",
@@ -175,8 +174,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -184,8 +181,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-quote-status-edit.vue b/ayanova/src/views/svc-quote-status-edit.vue
index c6608578..2a0fb117 100644
--- a/ayanova/src/views/svc-quote-status-edit.vue
+++ b/ayanova/src/views/svc-quote-status-edit.vue
@@ -114,28 +114,18 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "svc-quote-status-edit";
 const API_BASE_URL = "quote-status/";
-const FORM_CUSTOM_TEMPLATE_KEY = "QuoteStatus"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "QuoteStatus";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.QuoteStatus);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -147,7 +137,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -160,7 +150,6 @@ export default {
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -211,23 +200,17 @@ export default {
       ayaType: window.$gz.type.QuoteStatus
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -252,7 +235,6 @@ export default {
     canDuplicate: function() {
       return this.formState.valid && !this.formState.dirty;
     },
-
     form() {
       return window.$gz.form;
     },
@@ -270,7 +252,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -278,14 +260,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -293,9 +271,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -313,46 +289,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "svc-quote-status-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -369,42 +334,35 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -412,7 +370,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
-    //end methods
   }
 };
 
@@ -423,7 +380,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -450,7 +407,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFlag",
diff --git a/ayanova/src/views/svc-quote-status.vue b/ayanova/src/views/svc-quote-status.vue
index e5d10bca..f0fd4c5b 100644
--- a/ayanova/src/views/svc-quote-status.vue
+++ b/ayanova/src/views/svc-quote-status.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "svc-quote-status";
 export default {
@@ -52,7 +51,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -62,7 +61,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.QuoteStatus
           )
@@ -85,7 +84,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFlag",
     title: "QuoteStatusList",
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index efc6f83a..6d7e5998 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -5,7 +5,6 @@
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <gz-alert :alert-message="obj.alertViz" pop-alert></gz-alert>
       <gz-alert :alert-message="obj.customerTechNotesViz"></gz-alert>
-      <!-- SERVERERROR:{{ formState.serverError }} -->
       <v-form ref="form">
         <GzQuoteHeader
           v-model="obj"
@@ -66,20 +65,13 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-
 import GzQuoteHeader from "../components/quote-header.vue";
 import GzQuoteItems from "../components/quote-items.vue";
 
 const FORM_KEY = "quote-edit";
 const API_BASE_URL = "quote/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Quote"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "Quote";
 
 export default {
   components: {
@@ -92,12 +84,9 @@ export default {
     try {
       await initForm(vm);
 
-      //set base rights
       vm.rights = window.$gz.role.getRights(window.$gz.type.Quote);
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //open existing path
@@ -105,13 +94,12 @@ export default {
         if (this.$route.params.obj) {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
-
           window.$gz.form.setFormState({
             vm: vm,
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
           //check for copy wo item on route params
           let wi = this.$route.params.copyItem;
           if (wi) {
@@ -152,7 +140,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       //update which areas are available to user and force generate menu
@@ -163,8 +151,7 @@ export default {
       vm.formState.ready = true;
       //navigate somewhere??
       if (this.$route.params.gotype != null) {
-        //console.log("wo-go:", this.$route.params);
-        //find out which woitem and then find out which type to set and then set them as the active item somehow
+        //find out which woitem and then find out which type to set and then set them as the active item
         const gotype = Number(this.$route.params.gotype);
         const goid = Number(this.$route.params.goid);
         if (gotype != window.$gz.type.Quote) {
@@ -247,7 +234,6 @@ export default {
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       languageName: window.$gz.locale.getResolvedLanguage(),
       hour12: window.$gz.locale.getHour12(),
-      // resetSelections: false,
       selectLists: {
         quotestatus: [],
         allowedquotestatus: [],
@@ -271,23 +257,19 @@ export default {
       genCopyAttachments: false
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -337,12 +319,7 @@ export default {
   },
   methods: {
     setDirty: function() {
-      //console.log("WO HEADER SET DIRTY!! TRIGGERED");
       this.formState.dirty = true;
-      // window.$gz.form.setFormState({
-      //   vm: this,
-      //   dirty: true
-      // });
     },
     canSave: function() {
       return this.formState.valid && this.formState.dirty;
@@ -377,7 +354,6 @@ export default {
         const res = await window.$gz.api.get(url);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -434,12 +410,10 @@ export default {
           vm.lastGetContractId = vm.obj.contractId; //preserve for triggering full update if something changes it later
           vm.lastGetCustomerId = vm.obj.customerId; //preserve for triggering full update if something changes it later
 
-          //modify the menu as necessary
           generateMenu(vm);
           //update which areas are available to user
           updateRights(vm);
 
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -468,7 +442,6 @@ export default {
           loading: true
         });
 
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
 
         //#######################################################
@@ -582,42 +555,36 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -639,7 +606,7 @@ export default {
       }
     },
     duplicate() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -650,7 +617,7 @@ export default {
       if (!this.genCopyWiki) {
         cp.wiki = null; //already copied, need to remove it instead
       }
-      //Navigate to new record
+
       this.$router.push({
         name: "quote-edit",
         params: {
@@ -660,7 +627,7 @@ export default {
       });
     },
     generateWorkOrder() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -691,7 +658,6 @@ export default {
       cp.techSignatureName = null;
       cp.techSignatureCaptured = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "workorder-edit",
         params: {
@@ -701,7 +667,7 @@ export default {
       });
     },
     generatePM() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -729,7 +695,6 @@ export default {
       cp.generateBeforeInterval = 14;
       cp.generateDate = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "pm-edit",
         params: {
@@ -813,8 +778,6 @@ export default {
         });
       }
     }
-
-    //end methods
   }
 };
 
@@ -840,7 +803,7 @@ async function saveHeader(vm) {
   headerOnly.contractViz = undefined;
   headerOnly.customerViz = undefined;
 
-  let res = await window.$gz.api.upsert(`${API_BASE_URL}`, headerOnly);
+  const res = await window.$gz.api.upsert(`${API_BASE_URL}`, headerOnly);
   if (res.error) {
     handleSaveError(vm, { fatal: true, error: res.error });
   } else {
@@ -872,15 +835,15 @@ async function saveHeader(vm) {
 //
 async function saveState(vm) {
   //CHANGED?
-  let totalItems = vm.obj.states.length;
+  const totalItems = vm.obj.states.length;
   if (totalItems == 0) {
     return;
   }
   for (let i = 0; i < totalItems; i++) {
-    let o = vm.obj.states[i];
+    const o = vm.obj.states[i];
     if (o.concurrency == null) {
       //it's new so save it
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}states`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}states`, o);
       if (res.error) {
         handleSaveError(vm, { error: res.error });
       } else {
@@ -903,7 +866,7 @@ async function deleteItems(vm) {
     if (!d.deleted) {
       continue;
     }
-    let res = await window.$gz.api.remove(`${API_BASE_URL}items/${d.id}`);
+    const res = await window.$gz.api.remove(`${API_BASE_URL}items/${d.id}`);
     if (res.error) {
       handleSaveError(vm, { error: res.error, itemUid: d.uid });
     } else {
@@ -938,7 +901,7 @@ async function saveItems(vm) {
       } = vm.obj.items[i];
 
       const isPost = o.id == 0;
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}items`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}items`, o);
       if (res.error) {
         handleSaveError(vm, { error: res.error, itemUid: o.uid });
         if (isPost) {
@@ -1043,7 +1006,7 @@ async function deleteUnits(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/units/${d.id}`
       );
       if (res.error) {
@@ -1077,7 +1040,7 @@ async function saveUnits(vm, woItemIndex) {
         vm.obj.items[woItemIndex].units[i],
         ["uid", "isDirty"]
       );
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}items/units`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}items/units`, o);
       if (res.error) {
         handleSaveError(vm, {
           error: res.error,
@@ -1089,7 +1052,7 @@ async function saveUnits(vm, woItemIndex) {
         //Server will update fields on put or post for most  graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
         res.data.warrantyViz = null; //Add local key so it's reactive in vue
-        vm.obj.items[woItemIndex].units.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].units.splice(i, 1, res.data);
       }
     }
   }
@@ -1121,7 +1084,6 @@ async function saveScheduledUsers(vm, woItemIndex) {
         o
       );
       if (res.error) {
-        //console.log("ERROR", vm.obj.items[woItemIndex].scheduledUsers[i].uid);
         handleSaveError(vm, {
           error: res.error,
           itemUid: vm.obj.items[woItemIndex].uid,
@@ -1131,11 +1093,11 @@ async function saveScheduledUsers(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most  graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data);
       }
     }
   }
-  return; //made it
+  return;
 }
 
 async function deleteScheduledUsers(vm, woItemIndex) {
@@ -1150,7 +1112,7 @@ async function deleteScheduledUsers(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/scheduled-users/${d.id}`
       );
       if (res.error) {
@@ -1165,8 +1127,6 @@ async function deleteScheduledUsers(vm, woItemIndex) {
     }
     vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1);
   }
-
-  //----
   return;
 }
 
@@ -1199,7 +1159,7 @@ async function saveTasks(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data);
       }
     }
   }
@@ -1215,7 +1175,7 @@ async function deleteTasks(vm, woItemIndex) {
     }
 
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/tasks/${d.id}`
       );
       if (res.error) {
@@ -1230,8 +1190,6 @@ async function deleteTasks(vm, woItemIndex) {
     }
     vm.obj.items[woItemIndex].tasks.splice(i, 1);
   }
-
-  //----
   return;
 }
 
@@ -1246,7 +1204,7 @@ async function deleteParts(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/parts/${d.id}`
       );
       if (res.error) {
@@ -1288,7 +1246,7 @@ async function saveParts(vm, woItemIndex) {
           const balanceError = res.error.details.find(z => z.error == "2040");
           if (balanceError && balanceError.message) {
             //set the amount requestable so it surfaces in the UI and can be requested
-            let balance = window.$gz.util.stringToFloat(balanceError.message);
+            const balance = window.$gz.util.stringToFloat(balanceError.message);
             if (balance != null || balance != 0) {
               vm.obj.items[woItemIndex].parts[i].requestAmountViz =
                 vm.obj.items[woItemIndex].parts[i].quantity - balance;
@@ -1305,7 +1263,7 @@ async function saveParts(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data);
       }
     }
   }
@@ -1341,7 +1299,7 @@ async function saveLabors(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data);
       }
     }
   }
@@ -1356,7 +1314,7 @@ async function deleteLabors(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/labors/${d.id}`
       );
       if (res.error) {
@@ -1408,7 +1366,7 @@ async function saveTravels(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data);
       }
     }
   }
@@ -1423,7 +1381,7 @@ async function deleteTravels(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/travels/${d.id}`
       );
       if (res.error) {
@@ -1455,7 +1413,7 @@ async function deleteExpenses(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/expenses/${d.id}`
       );
       if (res.error) {
@@ -1504,7 +1462,7 @@ async function saveExpenses(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data);
       }
     }
   }
@@ -1522,7 +1480,7 @@ async function deleteLoans(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/loans/${d.id}`
       );
       if (res.error) {
@@ -1568,7 +1526,7 @@ async function saveLoans(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data);
       }
     }
   }
@@ -1590,7 +1548,7 @@ async function deleteOutsideServices(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/outside-services/${d.id}`
       );
       if (res.error) {
@@ -1639,7 +1597,7 @@ async function saveOutsideServices(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most quote graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data);
       }
     }
   }
@@ -1649,8 +1607,6 @@ async function saveOutsideServices(vm, woItemIndex) {
 //######################################### UTILITY METHODS ###########################################
 
 function handleSaveError(vm, e) {
-  //### NOTE: Nothing using FATAL yet, but if necessary here is where it should be determined and set
-
   if (vm.saveResult.errors == null) {
     vm.saveResult.errors = [];
   }
@@ -1664,7 +1620,7 @@ function errorTargetFromSaveResult(vm, r, t) {
     return t;
   }
 
-  let woitemindex = vm.obj.items.findIndex(z => z.uid == r.itemUid);
+  const woitemindex = vm.obj.items.findIndex(z => z.uid == r.itemUid);
   if (woitemindex == -1) {
     return null;
   }
@@ -1673,7 +1629,7 @@ function errorTargetFromSaveResult(vm, r, t) {
     return `Items[${woitemindex}].${t}`;
   }
 
-  let childindex = vm.obj.items[woitemindex][r.childKey].findIndex(
+  const childindex = vm.obj.items[woitemindex][r.childKey].findIndex(
     z => z.uid == r.childUid
   );
   if (childindex == -1) {
@@ -1700,13 +1656,10 @@ function formErrorFromSaveResult(vm) {
     details: [],
     message: "ErrorAPI2200"
   };
-  //console.log("formErrorFromSaveResult - input is:", vm.saveResult.errors);
   vm.saveResult.errors.forEach(z => {
-    //console.log("z", z);
-    //{error:{code:xx,message:xx,target:xx},fatal:true}
     if (z.error.details != null) {
       z.error.details.forEach(x => {
-        let target = errorTargetFromSaveResult(vm, z, x.target);
+        const target = errorTargetFromSaveResult(vm, z, x.target);
         if (target != null) {
           ret.details.push({
             message: x.message,
@@ -1717,13 +1670,9 @@ function formErrorFromSaveResult(vm) {
       });
     } else {
       //only one error so just return it
-      //console.log("single error path:", z.error);
       ret = z.error;
-      //ret.details.push(z.error);
     }
   });
-
-  //console.log("formErrorFromSaveResult Returning ret=:", ret);
   return ret;
 }
 
@@ -1753,7 +1702,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1784,7 +1733,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicateDlg = true;
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Quote,
             selectedRowIds: [m.vm.obj.id]
@@ -1848,7 +1797,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     hideCoreBizStandardOptions: vm.obj.userIsRestrictedType,
@@ -1889,8 +1838,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1898,8 +1845,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1958,8 +1904,6 @@ function generateMenu(vm) {
     });
   }
 
-  //--- /show all ---
-
   if (!vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({ divider: true, inset: false });
     menuOptions.menuItems.push({
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index a6f8ecd7..fa15fdbf 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -68,7 +68,6 @@ export default {
     this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     await fetchTranslatedText();
-
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
     this.objectId = window.$gz.util.stringToIntOrNull(
@@ -125,7 +124,7 @@ export default {
         return;
       }
       //get id from number then push open
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         "quote/id-from-number/" + this.openQuoteNumber
       );
       if (res.error) {
@@ -134,7 +133,6 @@ export default {
           window.$gz.errorHandler.errorToString(res, this)
         );
         return;
-        // throw new Error(window.$gz.errorHandler.errorToString(res, this));
       }
 
       this.$router.push({
@@ -152,7 +150,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -162,7 +160,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Quote)
         );
         if (res && res.refresh == true) {
@@ -171,7 +169,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Quote),
             m.id
           );
@@ -179,7 +177,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderItemList":
@@ -203,7 +201,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPencilAlt",
     title: "QuoteList",
@@ -224,8 +222,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -233,8 +229,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-task-group.vue b/ayanova/src/views/svc-task-group.vue
index aa83d3bb..f3c52f4b 100644
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -210,30 +210,19 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "svc-task-group-edit";
 const API_BASE_URL = "task-group/";
-//const FORM_CUSTOM_TEMPLATE_KEY = "svc-task-group"; //<-- Should always be CoreBizObject AyaType name here where possible
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(
         window.$gz.type.WorkOrderItemStatus
       );
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -245,7 +234,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -282,7 +271,6 @@ export default {
   },
   data() {
     return {
-      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       obj: {
         id: 0,
         concurrency: 0,
@@ -308,23 +296,19 @@ export default {
       editItemIndex: 0
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -344,7 +328,7 @@ export default {
   },
   methods: {
     addItem: function() {
-      let newIndex = this.obj.items.length;
+      const newIndex = this.obj.items.length;
       this.editItemIndex =
         this.obj.items.push({
           id: 0,
@@ -393,7 +377,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -401,14 +385,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -416,9 +396,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -436,7 +414,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -446,36 +424,27 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "svc-task-group",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
+
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -492,42 +461,36 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -535,7 +498,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
-    //end methods
   },
   computed: {
     itemList: function() {
@@ -560,7 +522,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -575,7 +537,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.TaskGroup,
             selectedRowIds: [m.vm.obj.id]
@@ -601,7 +563,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiTasks",
@@ -610,7 +572,6 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.TaskGroup,
       recordId: vm.$route.params.recordid,
-      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       recordName: vm.obj.name
     },
     menuItems: []
@@ -640,8 +601,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -649,8 +608,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -682,7 +640,6 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText();
-  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/svc-task-groups.vue b/ayanova/src/views/svc-task-groups.vue
index 81e2f75f..5fe9f4d4 100644
--- a/ayanova/src/views/svc-task-groups.vue
+++ b/ayanova/src/views/svc-task-groups.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "svc-task-group";
 export default {
@@ -52,7 +51,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -62,7 +61,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderStatus
           )
@@ -85,7 +84,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTasks",
     title: "TaskGroupList",
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index 42c3e125..2d02d7ab 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -254,31 +254,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "unit-model-edit";
 const API_BASE_URL = "unit-model/";
-const FORM_CUSTOM_TEMPLATE_KEY = "UnitModel"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "UnitModel";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.UnitModel);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -286,7 +274,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -305,7 +293,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -332,51 +320,25 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        /*
-        data: {
-          id: 4,
-          concurrency: 1403402,
-          name: "Charger Automotive",
-          active: true,
-          notes:
-            "Corporis adipisci quasi et ipsa molestiae libero non officiis hic.",
-          wiki: null,
-          customFields: null,
-          tags: ["red", "zone2"],
-          number: "025559",
-          vendorId: 5,
-          upc: "3549247309752",
-          lifeTimeWarranty: false,
-          introducedDate: "2020-06-16T00:16:44.717112Z",
-          discontinued: false,
-          discontinuedDate: null,
-          warrantyLength: 1,
-          warrantyTerms: "Parts only"
-        }
-        */
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          number: null,
-          vendorId: null,
-          upc: null,
-          lifeTimeWarranty: false,
-          introducedDate: null,
-          discontinued: false,
-          discontinuedDate: null,
-          warrantyLength: 1,
-          warrantyTerms: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        number: null,
+        vendorId: null,
+        upc: null,
+        lifeTimeWarranty: false,
+        introducedDate: null,
+        discontinued: false,
+        discontinuedDate: null,
+        warrantyLength: 1,
+        warrantyTerms: null
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -391,23 +353,18 @@ export default {
       ayaType: window.$gz.type.UnitModel
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -448,7 +405,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -456,14 +413,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -471,9 +424,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -491,7 +442,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -501,36 +452,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "unit-model-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -547,42 +488,34 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -591,7 +524,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "unit-model-edit",
         params: {
@@ -600,8 +532,6 @@ export default {
         }
       });
     }
-
-    //end methods
   }
 };
 
@@ -612,7 +542,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -631,7 +561,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.UnitModel,
             selectedRowIds: [m.vm.obj.id]
@@ -657,7 +587,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiDiceD20",
@@ -692,8 +622,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -701,8 +629,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -733,8 +660,6 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  //---- SHOW ALL ---
-  //MIGRATE_OUTSTANDING show all: workorderlist, quotelist, pmlist
   menuOptions.menuItems.push({
     title: "WorkOrderList",
     icon: "$ayiTools",
@@ -755,7 +680,6 @@ function generateMenu(vm) {
     key: FORM_KEY + ":PMList",
     vm: vm
   });
-  //--- /show all ---
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index 87842839..143c9863 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "unit-model-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.UnitModel)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.UnitModel
             ),
@@ -82,7 +81,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -98,7 +97,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiDiceD20",
     title: "UnitModels",
@@ -119,8 +118,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -128,8 +125,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 52ea7077..f54d1882 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -3,7 +3,6 @@
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-
       <v-form ref="form">
         <v-tabs mobile-breakpoint="100" v-model="tab">
           <v-tab>{{ $ay.t("Unit") }}</v-tab>
@@ -699,31 +698,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "unit-edit";
 const API_BASE_URL = "unit/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Unit"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Unit";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Unit);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -731,7 +718,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -746,17 +733,17 @@ export default {
         } else {
           //check for generate unit from part info on route params
           //(set by workorder item part when user selects generate unit from part)
-          let gen = this.$route.params.genFromPart;
+          const gen = this.$route.params.genFromPart;
           if (gen) {
             //get the part then set the values accordingly
-            let res = await window.$gz.api.get(`part/${gen.partId}`);
+            const res = await window.$gz.api.get(`part/${gen.partId}`);
             if (res.error) {
               window.$gz.eventBus.$emit(
                 "notify-warning",
                 window.$gz.errorHandler.errorToString(res, this)
               );
             } else {
-              let p = res.data;
+              const p = res.data;
               this.obj.boughtHere = true;
               this.obj.customerId = gen.customerId;
               this.obj.serial = gen.serial;
@@ -792,7 +779,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -819,90 +806,44 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        /*
-       {
-	"data": {
-		"id": 90979,
-		"concurrency": 2880802,
-		"active": true,
-		"notes": "Autem quia quod beatae reprehenderit et voluptatem aut animi.",
-		"wiki": null,
-		"customFields": null,
-		"tags": [
-			"zone3"
-		],
-		"serial": "00008962",
-		"customerId": 19027,
-		"parentUnitId": null,
-		"unitModelId": 40,
-		"unitHasOwnAddress": true,
-		"boughtHere": true,
-		"purchasedFromVendorId": null,
-		"receipt": "376373",
-		"purchasedDate": "2012-04-09T04:26:32.454688Z",
-		"description": "Intelligent Metal Shirt",
-		"replacedByUnitId": null,
-		"overrideModelWarranty": false,
-		"warrantyLength": null,
-		"warrantyTerms": null,
-		"usesBanking": false,
-		"metered": false,
-		"lifeTimeWarranty": false,
-		"text1": null,
-		"text2": null,
-		"text3": null,
-		"text4": null,
-		"address": "453 Isabelle Alley",
-		"city": "Douglasshire",
-		"region": "California",
-		"country": "Saint Lucia",
-		"latitude": -22.1701,
-		"longitude": 167.3475
-	}
-}
-       */
-        {
-          id: 0,
-          concurrency: 0,
-          serial: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          customerId: null,
-          parentUnitId: null,
-          unitModelId: null,
-          unitHasOwnAddress: false,
-          boughtHere: false,
-          purchasedFromVendorId: null,
-          receipt: null,
-          purchasedDate: null,
-          description: null,
-          replacedByUnitId: null,
-          overrideModelWarranty: false,
-          warrantyLength: null,
-          warrantyTerms: null,
-          //usesBanking: false,
-          contractId: null,
-          contractExpires: null,
-          metered: false,
-          lifeTimeWarranty: false,
-          text1: null,
-          text2: null,
-          text3: null,
-          text4: null,
-          address: null,
-          city: null,
-          region: null,
-          country: null,
-          latitude: null,
-          longitude: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        serial: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        customerId: null,
+        parentUnitId: null,
+        unitModelId: null,
+        unitHasOwnAddress: false,
+        boughtHere: false,
+        purchasedFromVendorId: null,
+        receipt: null,
+        purchasedDate: null,
+        description: null,
+        replacedByUnitId: null,
+        overrideModelWarranty: false,
+        warrantyLength: null,
+        warrantyTerms: null,
+        //usesBanking: false,
+        contractId: null,
+        contractExpires: null,
+        metered: false,
+        lifeTimeWarranty: false,
+        text1: null,
+        text2: null,
+        text3: null,
+        text4: null,
+        address: null,
+        city: null,
+        region: null,
+        country: null,
+        latitude: null,
+        longitude: null
+      },
       tab: 0,
       formState: {
         ready: false,
@@ -918,23 +859,19 @@ export default {
       ayaType: window.$gz.type.Unit
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -978,14 +915,6 @@ export default {
           name: "meter-readings",
           params: { unitid: this.obj.id, unitname: this.obj.serial }
         });
-
-        // this.$router.push({
-        //   name: "meter-readings",
-        //   params: {
-        //     aType: window.$gz.type.Unit,
-        //     objectId: this.$route.params.recordid
-        //   }
-        // });
       }
     },
     canSave: function() {
@@ -1010,7 +939,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -1018,14 +947,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -1033,9 +958,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1053,46 +976,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "unit-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -1109,42 +1021,35 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -1153,7 +1058,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "unit-edit",
         params: {
@@ -1164,7 +1068,7 @@ export default {
     },
 
     AddressCopyPhysicalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -1187,10 +1091,10 @@ export default {
       window.$gz.util.copyToClipboard(ret);
     },
     async GeoCapture() {
-      let vm = this;
+      const vm = this;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let loc = await window.$gz.util.getGeoLocation();
+        const loc = await window.$gz.util.getGeoLocation();
         vm.obj.latitude = loc.latitude;
         vm.fieldValueChanged("latitude");
         vm.obj.longitude = loc.longitude;
@@ -1199,8 +1103,6 @@ export default {
         window.$gz.errorHandler.handleFormError(ex, vm);
       }
     }
-
-    //end methods
   }
 };
 
@@ -1211,7 +1113,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1230,7 +1132,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Unit,
             selectedRowIds: [m.vm.obj.id]
@@ -1297,7 +1199,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFan",
@@ -1332,8 +1234,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1341,8 +1241,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -1380,8 +1279,6 @@ function generateMenu(vm) {
     key: "app:nav"
   });
 
-  //---- SHOW ALL ---
-
   menuOptions.menuItems.push({
     title: "WorkOrderList", //note: technically it opens teh woitemunitlist not workorders but it's confusing in the UI otherwise and this is how people would think about it
     icon: "$ayiTools",
@@ -1389,8 +1286,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //MIGRATE_OUTSTANDING show all: workorderlist, unitlist, quotelist, pmlist
-
   menuOptions.menuItems.push({
     title: "QuoteList",
     icon: "$ayiPencilAlt",
@@ -1404,7 +1299,6 @@ function generateMenu(vm) {
     key: FORM_KEY + ":PMList",
     vm: vm
   });
-  //--- /show all ---
 
   menuOptions.menuItems.push({
     title: "GeoView",
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index e538b024..d730ca88 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -22,14 +22,12 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "unit-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.Unit);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
     this.objectId = window.$gz.util.stringToIntOrNull(
@@ -87,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -97,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit)
         );
         if (res && res.refresh == true) {
@@ -106,7 +104,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit),
             m.id
           );
@@ -114,7 +112,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -130,7 +128,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFan",
     title: "UnitList",
@@ -151,8 +149,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -160,8 +156,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-work-order-item-priorities-edit.vue b/ayanova/src/views/svc-work-order-item-priorities-edit.vue
index 32b36a1e..884e03a2 100644
--- a/ayanova/src/views/svc-work-order-item-priorities-edit.vue
+++ b/ayanova/src/views/svc-work-order-item-priorities-edit.vue
@@ -51,30 +51,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "svc-work-order-item-priority-edit";
 const API_BASE_URL = "work-order-item-priority/";
-const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderItemPriority"; //<-- Should always be CoreBizObject AyaType name here where possible
-
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(
         window.$gz.type.WorkOrderItemPriority
       );
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -86,7 +75,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -123,7 +112,6 @@ export default {
   },
   data() {
     return {
-      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       obj: {
         id: 0,
         concurrency: 0,
@@ -150,23 +138,19 @@ export default {
       ayaType: window.$gz.type.WorkOrderItemPriority
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -209,7 +193,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -217,14 +201,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -232,7 +212,6 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
           //Update the form priority
           window.$gz.form.setFormState({
@@ -252,7 +231,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -262,36 +241,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "svc-work-order-item-priority-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form priority
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -308,37 +277,32 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
@@ -351,7 +315,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
-    //end methods
   }
 };
 
@@ -362,7 +325,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -389,7 +352,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFireAlt",
@@ -398,7 +361,6 @@ function generateMenu(vm) {
     formData: {
       ayaType: window.$gz.type.WorkOrderItemPriority,
       recordId: vm.$route.params.recordid,
-      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       recordName: vm.obj.name
     },
     menuItems: []
@@ -447,7 +409,6 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText();
-  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/svc-work-order-item-priorities.vue b/ayanova/src/views/svc-work-order-item-priorities.vue
index 0d2095a3..3816a0d2 100644
--- a/ayanova/src/views/svc-work-order-item-priorities.vue
+++ b/ayanova/src/views/svc-work-order-item-priorities.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "svc-work-order-item-priority";
 export default {
@@ -54,7 +53,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -64,7 +63,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderPriority
           )
@@ -87,7 +86,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFireAlt",
     title: "WorkOrderItemPriorityList",
diff --git a/ayanova/src/views/svc-work-order-item-status-edit.vue b/ayanova/src/views/svc-work-order-item-status-edit.vue
index d561b80f..3691f16d 100644
--- a/ayanova/src/views/svc-work-order-item-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-item-status-edit.vue
@@ -68,21 +68,13 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "svc-work-order-item-status-edit";
 const API_BASE_URL = "work-order-item-status/";
-const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderItemStatus"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderItemStatus";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
 
@@ -91,7 +83,6 @@ export default {
       );
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -103,7 +94,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -163,23 +154,19 @@ export default {
       ayaType: window.$gz.type.WorkOrderItemStatus
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -222,7 +209,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -230,14 +217,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -245,9 +228,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -265,46 +246,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "svc-work-order-status-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -321,42 +291,33 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -364,7 +325,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
-    //end methods
   }
 };
 
@@ -375,7 +335,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -402,7 +362,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiCircle",
diff --git a/ayanova/src/views/svc-work-order-item-status.vue b/ayanova/src/views/svc-work-order-item-status.vue
index e77c9f3d..7200bcfd 100644
--- a/ayanova/src/views/svc-work-order-item-status.vue
+++ b/ayanova/src/views/svc-work-order-item-status.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "svc-work-order-item-status";
 export default {
@@ -54,7 +53,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -64,7 +63,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderStatus
           )
@@ -87,7 +86,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiCircle",
     title: "WorkOrderItemStatusList",
diff --git a/ayanova/src/views/svc-work-order-status-edit.vue b/ayanova/src/views/svc-work-order-status-edit.vue
index 4aa67b5c..e8d9fc76 100644
--- a/ayanova/src/views/svc-work-order-status-edit.vue
+++ b/ayanova/src/views/svc-work-order-status-edit.vue
@@ -114,28 +114,18 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "svc-work-order-status-edit";
 const API_BASE_URL = "work-order-status/";
-const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderStatus"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderStatus";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.WorkOrderStatus);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -147,7 +137,7 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         window.$gz.form.setFormState({
@@ -160,7 +150,6 @@ export default {
         dirty: false,
         valid: true
       });
-
       generateMenu(vm);
     } catch (error) {
       window.$gz.errorHandler.handleFormError(error, vm);
@@ -211,23 +200,17 @@ export default {
       ayaType: window.$gz.type.WorkOrderStatus
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
-
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -252,7 +235,6 @@ export default {
     canDuplicate: function() {
       return this.formState.valid && !this.formState.dirty;
     },
-
     form() {
       return window.$gz.form;
     },
@@ -270,7 +252,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -278,14 +260,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -293,9 +271,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -313,46 +289,35 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
-
       try {
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "svc-work-order-status-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -369,42 +334,34 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -412,7 +369,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     }
-    //end methods
   }
 };
 
@@ -423,7 +379,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -450,7 +406,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiFlag",
diff --git a/ayanova/src/views/svc-work-order-status.vue b/ayanova/src/views/svc-work-order-status.vue
index c11cb570..325536fe 100644
--- a/ayanova/src/views/svc-work-order-status.vue
+++ b/ayanova/src/views/svc-work-order-status.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "svc-work-order-status";
 export default {
@@ -52,7 +51,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -62,7 +61,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderStatus
           )
@@ -85,7 +84,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFlag",
     title: "WorkOrderStatusList",
diff --git a/ayanova/src/views/svc-workorder-item-expenses.vue b/ayanova/src/views/svc-workorder-item-expenses.vue
index 2d109e75..07eb8816 100644
--- a/ayanova/src/views/svc-workorder-item-expenses.vue
+++ b/ayanova/src/views/svc-workorder-item-expenses.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-expense-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemExpense
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemExpense
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiMoneyBillWave",
     title: "WorkOrderItemExpenseList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-labors.vue b/ayanova/src/views/svc-workorder-item-labors.vue
index a0d9aa09..92a8f551 100644
--- a/ayanova/src/views/svc-workorder-item-labors.vue
+++ b/ayanova/src/views/svc-workorder-item-labors.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-labor-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemLabor
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemLabor
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiHammer",
     title: "WorkOrderItemLaborList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-loans.vue b/ayanova/src/views/svc-workorder-item-loans.vue
index cb0ec071..2d87c308 100644
--- a/ayanova/src/views/svc-workorder-item-loans.vue
+++ b/ayanova/src/views/svc-workorder-item-loans.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-loan-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemLoan
           )
@@ -107,7 +106,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -116,23 +114,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemLoan
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -166,7 +159,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiPlug",
     title: "WorkOrderItemLoanList",
@@ -187,8 +180,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -196,8 +187,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-outside-services.vue b/ayanova/src/views/svc-workorder-item-outside-services.vue
index d051be52..c20a832f 100644
--- a/ayanova/src/views/svc-workorder-item-outside-services.vue
+++ b/ayanova/src/views/svc-workorder-item-outside-services.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-outside-service-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemOutsideService
           )
@@ -74,7 +73,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -83,23 +81,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemOutsideService
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -133,7 +126,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiLuggageCart",
     title: "WorkOrderItemOutsideServiceList",
@@ -154,8 +147,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -163,8 +154,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-part-requests.vue b/ayanova/src/views/svc-workorder-item-part-requests.vue
index cd8f8692..55e9a826 100644
--- a/ayanova/src/views/svc-workorder-item-part-requests.vue
+++ b/ayanova/src/views/svc-workorder-item-part-requests.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-part-request-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemPartRequest
           )
@@ -74,7 +73,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -83,23 +81,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemPartRequest
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -133,7 +126,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiParachuteBox",
     title: "WorkOrderItemPartRequestList",
@@ -154,8 +147,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -163,8 +154,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-parts.vue b/ayanova/src/views/svc-workorder-item-parts.vue
index 5da3ce6d..bceccf1f 100644
--- a/ayanova/src/views/svc-workorder-item-parts.vue
+++ b/ayanova/src/views/svc-workorder-item-parts.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-part-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemPart
           )
@@ -107,7 +106,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -116,23 +114,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemPart
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -166,7 +159,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiBoxes",
     title: "WorkOrderItemPartList",
@@ -187,8 +180,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -196,8 +187,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-scheduled-users.vue b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
index 265e2503..7d896a9b 100644
--- a/ayanova/src/views/svc-workorder-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-scheduled-user-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemScheduledUser
           )
@@ -107,7 +106,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -116,23 +114,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemScheduledUser
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -166,7 +159,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiUserClock",
     title: "WorkOrderItemScheduledUserList",
@@ -187,8 +180,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -196,8 +187,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-tasks.vue b/ayanova/src/views/svc-workorder-item-tasks.vue
index f582f54d..8d907958 100644
--- a/ayanova/src/views/svc-workorder-item-tasks.vue
+++ b/ayanova/src/views/svc-workorder-item-tasks.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-task-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemTask
           )
@@ -74,7 +73,6 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -83,23 +81,18 @@ async function clickHandler(menuItem) {
             }
           });
         } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemTask
             )
           );
 
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
+
           window.$gz.form.setLastReport(FORM_KEY, res);
 
-          //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
             params: {
@@ -133,7 +126,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTasks",
     title: "WorkOrderItemTasks",
@@ -154,8 +147,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -163,8 +154,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-travels.vue b/ayanova/src/views/svc-workorder-item-travels.vue
index c3064a6c..f0e496e9 100644
--- a/ayanova/src/views/svc-workorder-item-travels.vue
+++ b/ayanova/src/views/svc-workorder-item-travels.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-travel-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemTravel
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemTravel
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderList":
@@ -111,7 +110,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTruckMonster",
     title: "WorkOrderItemTravelList",
@@ -132,8 +131,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -141,8 +138,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-item-units.vue b/ayanova/src/views/svc-workorder-item-units.vue
index ede5280a..d439d0f8 100644
--- a/ayanova/src/views/svc-workorder-item-units.vue
+++ b/ayanova/src/views/svc-workorder-item-units.vue
@@ -22,7 +22,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-item-unit-list";
 export default {
@@ -86,7 +85,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItemUnit
           )
@@ -107,7 +106,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemUnit
             ),
@@ -117,7 +116,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderList":
@@ -144,7 +143,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiFan",
     title: "WorkOrderItemUnitList",
@@ -165,8 +164,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -174,8 +171,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder-items.vue b/ayanova/src/views/svc-workorder-items.vue
index 35d9ea2c..f4d043b6 100644
--- a/ayanova/src/views/svc-workorder-items.vue
+++ b/ayanova/src/views/svc-workorder-items.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
             window.$gz.type.WorkOrderItem
           )
@@ -74,7 +73,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItem
             ),
@@ -84,7 +83,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderList":
@@ -161,7 +160,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiWrench",
     title: "WorkOrderItemList",
@@ -182,8 +181,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -191,8 +188,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 28d5d7e7..8f3336e6 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -66,20 +66,13 @@
     </template>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-
 import GzWoHeader from "../components/work-order-header.vue";
 import GzWoItems from "../components/work-order-items.vue";
 
 const FORM_KEY = "workorder-edit";
 const API_BASE_URL = "workorder/";
-const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrder"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrder";
 
 export default {
   components: {
@@ -91,13 +84,9 @@ export default {
 
     try {
       await initForm(vm);
-
-      //set base rights
       vm.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
       window.$gz.eventBus.$on("menu-click", clickHandler);
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //open existing path
@@ -111,9 +100,9 @@ export default {
             loading: false
           });
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
           //check for copy wo item on route params
-          let wi = this.$route.params.copyItem;
+          const wi = this.$route.params.copyItem;
           if (wi) {
             this.washWorkOrderItem(wi);
             wi.workOrderId = vm.obj.id;
@@ -221,7 +210,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       //update which areas are available to user and force generate menu
@@ -232,7 +221,6 @@ export default {
       vm.formState.ready = true;
       //navigate somewhere??
       if (this.$route.params.gotype != null) {
-        //console.log("wo-go:", this.$route.params);
         //find out which woitem and then find out which type to set and then set them as the active item somehow
         const gotype = Number(this.$route.params.gotype);
         const goid = Number(this.$route.params.goid);
@@ -322,7 +310,6 @@ export default {
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       languageName: window.$gz.locale.getResolvedLanguage(),
       hour12: window.$gz.locale.getHour12(),
-      // resetSelections: false,
       selectLists: {
         wostatus: [],
         allowedwostatus: [],
@@ -346,23 +333,18 @@ export default {
       genCopyAttachments: false
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
-
-        //enable / disable save button
         if (val.dirty && val.valid) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -412,12 +394,7 @@ export default {
   },
   methods: {
     setDirty: function() {
-      //console.log("WO HEADER SET DIRTY!! TRIGGERED");
       this.formState.dirty = true;
-      // window.$gz.form.setFormState({
-      //   vm: this,
-      //   dirty: true
-      // });
     },
     canSave: function() {
       return this.formState.valid && this.formState.dirty;
@@ -452,7 +429,6 @@ export default {
         const res = await window.$gz.api.get(url);
 
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -512,12 +488,10 @@ export default {
           vm.lastGetContractId = vm.obj.contractId; //preserve for triggering full update if something changes it later
           vm.lastGetCustomerId = vm.obj.customerId; //preserve for triggering full update if something changes it later
 
-          //modify the menu as necessary
           generateMenu(vm);
           //update which areas are available to user
           updateRights(vm);
 
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -546,7 +520,6 @@ export default {
           loading: true
         });
 
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
 
         //#######################################################
@@ -625,12 +598,11 @@ export default {
               name: "workorder-edit",
               params: {
                 recordid: vm.obj.id
-                // ,obj: vm.obj // Do NOT Pass data object to new form as normal because for a workorder, it's not a full and complete record at this end
+                // Do NOT Pass data object to new form as normal because for a workorder, it's not a full and complete record at this end
               }
             });
           } else {
             //check if full refresh is necessary
-
             if (
               vm.obj.contractId != vm.lastGetContractId ||
               vm.obj.customerId != vm.lastGetCustomerId
@@ -660,42 +632,36 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
 
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -703,16 +669,6 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
-    // duplicate() {
-    //   //Navigate to new record
-    //   this.$router.push({
-    //     name: "workorder-edit",
-    //     params: {
-    //       recordid: 0,
-    //       obj: this.obj
-    //     }
-    //   });
-    // },
     duplicateHandler() {
       switch (this.duplicateTo) {
         case "pm":
@@ -727,7 +683,7 @@ export default {
       }
     },
     duplicate() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -738,7 +694,7 @@ export default {
       if (!this.genCopyWiki) {
         cp.wiki = null; //already copied, need to remove it instead
       }
-      //Navigate to new record
+
       this.$router.push({
         name: "workorder-edit",
         params: {
@@ -748,7 +704,7 @@ export default {
       });
     },
     generateQuote() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -774,7 +730,6 @@ export default {
       cp.submitted = null;
       cp.approved = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "quote-edit",
         params: {
@@ -784,7 +739,7 @@ export default {
       });
     },
     generatePM() {
-      let cp = JSON.parse(JSON.stringify(this.obj));
+      const cp = JSON.parse(JSON.stringify(this.obj));
       if (this.genCopyAttachments) {
         //this property set will trigger server to copy attachments
         cp.genCopyAttachmentsFrom = {
@@ -800,7 +755,6 @@ export default {
         x.partRequests = [];
       });
       cp.id = 0;
-
       //PM Defaults copied from PM data object
       cp.stopGeneratingDate = null;
       cp.excludeDaysOfWeek = 96;
@@ -812,7 +766,6 @@ export default {
       cp.generateBeforeInterval = 14;
       cp.generateDate = null;
 
-      //Navigate to new record
       this.$router.push({
         name: "pm-edit",
         params: {
@@ -902,8 +855,6 @@ export default {
         });
       }
     }
-
-    //end methods
   }
 };
 
@@ -929,7 +880,7 @@ async function saveHeader(vm) {
   headerOnly.contractViz = undefined;
   headerOnly.customerViz = undefined;
 
-  let res = await window.$gz.api.upsert(`${API_BASE_URL}`, headerOnly);
+  const res = await window.$gz.api.upsert(`${API_BASE_URL}`, headerOnly);
   if (res.error) {
     handleSaveError(vm, { fatal: true, error: res.error });
   } else {
@@ -961,15 +912,15 @@ async function saveHeader(vm) {
 //
 async function saveState(vm) {
   //CHANGED?
-  let totalItems = vm.obj.states.length;
+  const totalItems = vm.obj.states.length;
   if (totalItems == 0) {
     return;
   }
   for (let i = 0; i < totalItems; i++) {
-    let o = vm.obj.states[i];
+    const o = vm.obj.states[i];
     if (o.concurrency == null) {
       //it's new so save it
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}states`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}states`, o);
       if (res.error) {
         handleSaveError(vm, { error: res.error });
       } else {
@@ -992,7 +943,7 @@ async function deleteItems(vm) {
     if (!d.deleted) {
       continue;
     }
-    let res = await window.$gz.api.remove(`${API_BASE_URL}items/${d.id}`);
+    const res = await window.$gz.api.remove(`${API_BASE_URL}items/${d.id}`);
     if (res.error) {
       handleSaveError(vm, { error: res.error, itemUid: d.uid });
     } else {
@@ -1028,7 +979,7 @@ async function saveItems(vm) {
       } = vm.obj.items[i];
 
       const isPost = o.id == 0;
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}items`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}items`, o);
       if (res.error) {
         handleSaveError(vm, { error: res.error, itemUid: o.uid });
         if (isPost) {
@@ -1139,7 +1090,7 @@ async function deleteUnits(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/units/${d.id}`
       );
       if (res.error) {
@@ -1173,7 +1124,7 @@ async function saveUnits(vm, woItemIndex) {
         vm.obj.items[woItemIndex].units[i],
         ["uid", "isDirty"]
       );
-      let res = await window.$gz.api.upsert(`${API_BASE_URL}items/units`, o);
+      const res = await window.$gz.api.upsert(`${API_BASE_URL}items/units`, o);
       if (res.error) {
         handleSaveError(vm, {
           error: res.error,
@@ -1185,7 +1136,7 @@ async function saveUnits(vm, woItemIndex) {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
         res.data.warrantyViz = null; //Add local key so it's reactive in vue
-        vm.obj.items[woItemIndex].units.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].units.splice(i, 1, res.data);
       }
     }
   }
@@ -1217,7 +1168,6 @@ async function saveScheduledUsers(vm, woItemIndex) {
         o
       );
       if (res.error) {
-        //console.log("ERROR", vm.obj.items[woItemIndex].scheduledUsers[i].uid);
         handleSaveError(vm, {
           error: res.error,
           itemUid: vm.obj.items[woItemIndex].uid,
@@ -1227,7 +1177,7 @@ async function saveScheduledUsers(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].scheduledUsers.splice(i, 1, res.data);
       }
     }
   }
@@ -1246,7 +1196,7 @@ async function deleteScheduledUsers(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/scheduled-users/${d.id}`
       );
       if (res.error) {
@@ -1295,7 +1245,7 @@ async function saveTasks(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].tasks.splice(i, 1, res.data);
       }
     }
   }
@@ -1311,7 +1261,7 @@ async function deleteTasks(vm, woItemIndex) {
     }
 
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/tasks/${d.id}`
       );
       if (res.error) {
@@ -1342,7 +1292,7 @@ async function deleteParts(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/parts/${d.id}`
       );
       if (res.error) {
@@ -1384,7 +1334,7 @@ async function saveParts(vm, woItemIndex) {
           const balanceError = res.error.details.find(z => z.error == "2040");
           if (balanceError && balanceError.message) {
             //set the amount requestable so it surfaces in the UI and can be requested
-            let balance = window.$gz.util.stringToFloat(balanceError.message);
+            const balance = window.$gz.util.stringToFloat(balanceError.message);
             if (balance != null || balance != 0) {
               vm.obj.items[woItemIndex].parts[i].requestAmountViz =
                 vm.obj.items[woItemIndex].parts[i].quantity - balance;
@@ -1401,7 +1351,7 @@ async function saveParts(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].parts.splice(i, 1, res.data);
       }
     }
   }
@@ -1419,7 +1369,7 @@ async function deletePartRequests(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/part-requests/${d.id}`
       );
       if (res.error) {
@@ -1468,7 +1418,7 @@ async function savePartRequests(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].partRequests.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].partRequests.splice(i, 1, res.data);
       }
     }
   }
@@ -1504,7 +1454,7 @@ async function saveLabors(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].labors.splice(i, 1, res.data);
       }
     }
   }
@@ -1519,7 +1469,7 @@ async function deleteLabors(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/labors/${d.id}`
       );
       if (res.error) {
@@ -1571,7 +1521,7 @@ async function saveTravels(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].travels.splice(i, 1, res.data);
       }
     }
   }
@@ -1586,7 +1536,7 @@ async function deleteTravels(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/travels/${d.id}`
       );
       if (res.error) {
@@ -1618,7 +1568,7 @@ async function deleteExpenses(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/expenses/${d.id}`
       );
       if (res.error) {
@@ -1667,7 +1617,7 @@ async function saveExpenses(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].expenses.splice(i, 1, res.data);
       }
     }
   }
@@ -1685,7 +1635,7 @@ async function deleteLoans(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/loans/${d.id}`
       );
       if (res.error) {
@@ -1731,7 +1681,7 @@ async function saveLoans(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].loans.splice(i, 1, res.data);
       }
     }
   }
@@ -1753,7 +1703,7 @@ async function deleteOutsideServices(vm, woItemIndex) {
       continue;
     }
     if (d.id != 0) {
-      let res = await window.$gz.api.remove(
+      const res = await window.$gz.api.remove(
         `${API_BASE_URL}items/outside-services/${d.id}`
       );
       if (res.error) {
@@ -1802,7 +1752,7 @@ async function saveOutsideServices(vm, woItemIndex) {
       } else {
         //Server will update fields on put or post for most workorder graph objecs so need to update entire object here
         res.data.isDirty = false; //prime isDirty to detect future edits
-        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data); //vue needs the splice rather than just setting the value in order to trigger reactivity or else the UI won't update
+        vm.obj.items[woItemIndex].outsideServices.splice(i, 1, res.data);
       }
     }
   }
@@ -1827,7 +1777,7 @@ function errorTargetFromSaveResult(vm, r, t) {
     return t;
   }
 
-  let woitemindex = vm.obj.items.findIndex(z => z.uid == r.itemUid);
+  const woitemindex = vm.obj.items.findIndex(z => z.uid == r.itemUid);
   if (woitemindex == -1) {
     return null;
   }
@@ -1836,7 +1786,7 @@ function errorTargetFromSaveResult(vm, r, t) {
     return `Items[${woitemindex}].${t}`;
   }
 
-  let childindex = vm.obj.items[woitemindex][r.childKey].findIndex(
+  const childindex = vm.obj.items[woitemindex][r.childKey].findIndex(
     z => z.uid == r.childUid
   );
   if (childindex == -1) {
@@ -1869,7 +1819,7 @@ function formErrorFromSaveResult(vm) {
     //{error:{code:xx,message:xx,target:xx},fatal:true}
     if (z.error.details != null) {
       z.error.details.forEach(x => {
-        let target = errorTargetFromSaveResult(vm, z, x.target);
+        const target = errorTargetFromSaveResult(vm, z, x.target);
         if (target != null) {
           ret.details.push({
             message: x.message,
@@ -1879,14 +1829,9 @@ function formErrorFromSaveResult(vm) {
         }
       });
     } else {
-      //only one error so just return it
-      //console.log("single error path:", z.error);
       ret = z.error;
-      //ret.details.push(z.error);
     }
   });
-
-  //console.log("formErrorFromSaveResult Returning ret=:", ret);
   return ret;
 }
 
@@ -1916,7 +1861,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1947,7 +1892,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicateDlg = true;
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.WorkOrder,
             selectedRowIds: [m.vm.obj.id]
@@ -1992,12 +1937,6 @@ async function clickHandler(menuItem) {
           id: m.vm.obj.fromPMId
         });
         break;
-      // case "csr":
-      //   window.$gz.eventBus.$emit("openobject", {
-      //     type: window.$gz.type.CustomerServiceRequest,
-      //     id: m.vm.obj.fromCSRId
-      //   });
-      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -2011,7 +1950,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     hideCoreBizStandardOptions: vm.obj.userIsRestrictedType,
@@ -2052,8 +1991,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -2061,8 +1998,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
@@ -2153,7 +2089,6 @@ function generateMenu(vm) {
   }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  //MIGRATE_OUTSTANDING test once have quote pm and csr created workorders
   let hasFromInsertDivider = false;
 
   if (
@@ -2177,18 +2112,6 @@ function generateMenu(vm) {
     });
     hasFromInsertDivider = true;
   }
-  // if (
-  //   vm.obj.fromCSRId != null &&
-  //   window.$gz.role.canOpen(window.$gz.type.CustomerServiceRequest)
-  // ) {
-  //   menuOptions.menuItems.push({
-  //     title: "CustomerServiceRequest",
-  //     icon: "$ayiConciergeBell",
-  //     key: FORM_KEY + ":csr",
-  //     vm: vm
-  //   });
-  //   hasFromInsertDivider = true;
-  // }
 
   if (hasFromInsertDivider) {
     menuOptions.menuItems.push({ divider: true, inset: false });
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index 5aa24eef..aa1cea48 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -60,7 +60,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "workorder-list";
 export default {
@@ -125,7 +124,7 @@ export default {
         return;
       }
       //get id from number then push open
-      let res = await window.$gz.api.get(
+      const res = await window.$gz.api.get(
         "workorder/id-from-number/" + this.openWoNumber
       );
       if (res.error) {
@@ -134,7 +133,6 @@ export default {
           window.$gz.errorHandler.errorToString(res, this)
         );
         return;
-        // throw new Error(window.$gz.errorHandler.errorToString(res, this));
       }
 
       this.$router.push({
@@ -152,7 +150,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -162,7 +160,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.WorkOrder)
         );
         if (res && res.refresh == true) {
@@ -171,7 +169,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrder
             ),
@@ -181,7 +179,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       case "WorkOrderItemList":
@@ -205,7 +203,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiTools",
     title: "WorkOrderList",
@@ -226,8 +224,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -235,8 +231,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index 9a83929c..a89a359f 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -573,31 +573,19 @@
     </v-overlay>
   </div>
 </template>
-
 <script>
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
 const FORM_KEY = "vendor-edit";
 const API_BASE_URL = "vendor/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Vendor"; //<-- Should always be CoreBizObject AyaType name here where possible
-
+const FORM_CUSTOM_TEMPLATE_KEY = "Vendor";
 export default {
   async created() {
-    let vm = this;
-
+    const vm = this;
     try {
       await initForm(vm);
-
       vm.rights = window.$gz.role.getRights(window.$gz.type.Vendor);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
-
       let setDirty = false;
-      let setValid = true;
-
       //id 0 means create or duplicate to new
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
@@ -605,7 +593,7 @@ export default {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
         } else {
-          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+          await vm.getDataFromApi(vm.$route.params.recordid);
         }
       } else {
         //Might be a duplicate and contain another record
@@ -624,7 +612,7 @@ export default {
         vm: vm,
         loading: false,
         dirty: setDirty,
-        valid: setValid
+        valid: true
       });
 
       generateMenu(vm);
@@ -651,42 +639,38 @@ export default {
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj:
-        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
-        //I.E. Serial, usertype fields, ACTIVE
-        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
-        {
-          id: 0,
-          concurrency: 0,
-          name: null,
-          active: true,
-          notes: null,
-          wiki: null,
-          customFields: "{}",
-          tags: [],
-          webAddress: null,
-          alertNotes: null,
-          contactNotes: null,
-          contact: null,
-          accountNumber: null,
-          phone1: null,
-          phone2: null,
-          phone3: null,
-          phone4: null,
-          phone5: null,
-          emailAddress: null,
-          postAddress: null,
-          postCity: null,
-          postRegion: null,
-          postCountry: null,
-          postCode: null,
-          address: null,
-          city: null,
-          region: null,
-          country: null,
-          latitude: null,
-          longitude: null
-        },
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        notes: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        webAddress: null,
+        alertNotes: null,
+        contactNotes: null,
+        contact: null,
+        accountNumber: null,
+        phone1: null,
+        phone2: null,
+        phone3: null,
+        phone4: null,
+        phone5: null,
+        emailAddress: null,
+        postAddress: null,
+        postCity: null,
+        postRegion: null,
+        postCountry: null,
+        postCode: null,
+        address: null,
+        city: null,
+        region: null,
+        country: null,
+        latitude: null,
+        longitude: null
+      },
       tab: 0,
       formState: {
         ready: false,
@@ -702,23 +686,19 @@ export default {
       ayaType: window.$gz.type.Vendor
     };
   },
-  //WATCHERS
   watch: {
     formState: {
       handler: function(val) {
-        //,oldval is available here too if necessary
         if (this.formState.loading) {
           return;
         }
 
-        //enable / disable save button
         if (val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
         } else {
           window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
         }
 
-        //enable / disable duplicate / new button
         if (!val.dirty && val.valid && !val.readOnly) {
           window.$gz.eventBus.$emit(
             "menu-enable-item",
@@ -759,7 +739,7 @@ export default {
       }
     },
     async getDataFromApi(recordId) {
-      let vm = this;
+      const vm = this;
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
@@ -767,14 +747,10 @@ export default {
       if (!recordId) {
         throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
       }
-      let url = API_BASE_URL + recordId;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.get(url);
-
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
         if (res.error) {
-          //Not found?
           if (res.error.code == "2010") {
             window.$gz.form.handleObjectNotFound(vm);
           }
@@ -782,9 +758,7 @@ export default {
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
           vm.obj = res.data;
-          //modify the menu as necessary
           generateMenu(vm);
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -802,7 +776,7 @@ export default {
       }
     },
     async submit() {
-      let vm = this;
+      const vm = this;
       if (vm.canSave == false) {
         return;
       }
@@ -812,36 +786,26 @@ export default {
           vm: vm,
           loading: true
         });
-        let url = API_BASE_URL; // + vm.$route.params.recordid;
-        //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-
-        let res = await window.$gz.api.upsert(url, vm.obj);
-
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
           if (res.data.id) {
-            //POST - whole new object returned
+            //POST
             vm.obj = res.data;
-            //Change URL to new record
-            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
-
             this.$router.replace({
               name: "vendor-edit",
               params: {
                 recordid: res.data.id,
-                obj: res.data // Pass data object to new form
+                obj: res.data
               }
             });
           } else {
-            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
-            //Handle "put" of an existing record (UPDATE)
+            //PUT
             vm.obj.concurrency = res.data.concurrency;
           }
-          //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
             dirty: false,
@@ -858,42 +822,35 @@ export default {
       }
     },
     async remove() {
-      let vm = this;
+      const vm = this;
       try {
-        let dialogResult = await window.$gz.dialog.confirmDelete();
+        const dialogResult = await window.$gz.dialog.confirmDelete();
         if (dialogResult != true) {
           return;
         }
-
-        //do the delete
         window.$gz.form.setFormState({
           vm: vm,
           loading: true
         });
-        //No need to delete a new record, just abandon it...
+
         if (vm.$route.params.recordid == 0) {
-          //this should not get offered for delete but to be safe and clear just in case:
           JUST_DELETED = true;
-          // navigate backwards
+
           vm.$router.go(-1);
         } else {
-          let url = API_BASE_URL + vm.$route.params.recordid;
-
           window.$gz.form.deleteAllErrorBoxErrors(vm);
-          let res = await window.$gz.api.remove(url);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + vm.$route.params.recordid
+          );
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //workaround to prevent warning about leaving dirty record
-            //For some reason I couldn't just reset isdirty in formstate
             JUST_DELETED = true;
-            // navigate backwards
             vm.$router.go(-1);
           }
         }
       } catch (error) {
-        //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
@@ -902,7 +859,6 @@ export default {
       }
     },
     duplicate() {
-      //Navigate to new record
       this.$router.push({
         name: "vendor-edit",
         params: {
@@ -912,25 +868,23 @@ export default {
       });
     },
     AddressCopyToPostal() {
-      let vm = this;
+      const vm = this;
       vm.obj.postAddress = vm.obj.address;
       vm.obj.postCity = vm.obj.city;
       vm.obj.postRegion = vm.obj.region;
       vm.obj.postCountry = vm.obj.country;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyToPhysical() {
-      let vm = this;
+      const vm = this;
       vm.obj.address = vm.obj.postAddress;
       vm.obj.city = vm.obj.postCity;
       vm.obj.region = vm.obj.postRegion;
       vm.obj.country = vm.obj.postCountry;
-      //flag form dirty
       this.formState.dirty = true;
     },
     AddressCopyPhysicalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -953,7 +907,7 @@ export default {
       window.$gz.util.copyToClipboard(ret);
     },
     AddressCopyPostalToClipBoard() {
-      let vm = this;
+      const vm = this;
       let ret = "";
       if (vm.obj.name) {
         ret += vm.obj.name + "\n";
@@ -981,10 +935,10 @@ export default {
       window.$gz.util.copyToClipboard(ret);
     },
     async GeoCapture() {
-      let vm = this;
+      const vm = this;
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let loc = await window.$gz.util.getGeoLocation();
+        const loc = await window.$gz.util.getGeoLocation();
         vm.obj.latitude = loc.latitude;
         vm.fieldValueChanged("latitude");
         vm.obj.longitude = loc.longitude;
@@ -993,8 +947,6 @@ export default {
         window.$gz.errorHandler.handleFormError(ex, vm);
       }
     }
-
-    //end methods
   }
 };
 
@@ -1005,7 +957,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "save":
@@ -1024,7 +976,7 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        let res = await m.vm.$refs.reportSelector.open(
+        const res = await m.vm.$refs.reportSelector.open(
           {
             AType: window.$gz.type.Vendor,
             selectedRowIds: [m.vm.obj.id]
@@ -1061,7 +1013,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiStore",
@@ -1096,8 +1048,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1105,8 +1055,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index fba10e08..ba055f8a 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -19,7 +19,6 @@
     </gz-data-table>
   </div>
 </template>
-
 <script>
 const FORM_KEY = "vendor-list";
 export default {
@@ -53,7 +52,7 @@ async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
-  let m = window.$gz.menu.parseMenuItem(menuItem);
+  const m = window.$gz.menu.parseMenuItem(menuItem);
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "new":
@@ -63,7 +62,7 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        let res = await m.vm.$refs.extensions.open(
+        const res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor)
         );
         if (res && res.refresh == true) {
@@ -72,7 +71,7 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         {
-          let res = await m.vm.$refs.reportSelector.open(
+          const res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor),
             m.id
           );
@@ -80,7 +79,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm); //refresh the menu with the new report
+          generateMenu(m.vm);
         }
         break;
       default:
@@ -96,7 +95,7 @@ async function clickHandler(menuItem) {
 //
 //
 function generateMenu(vm) {
-  let menuOptions = {
+  const menuOptions = {
     isMain: true,
     icon: "$ayiStore",
     title: "VendorList",
@@ -117,8 +116,6 @@ function generateMenu(vm) {
     });
   }
 
-  //REPORTS
-  //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -126,8 +123,7 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //get last report selected
-  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,