diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index aa5e9ae7..2c068ad8 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -243,7 +243,8 @@ TODO: 1 BETA DOCS:
   \_____|______|_____|______|_| \_|  |_|   
                                            
 
-- 1 bugbug?:open vendor, print report, go back it shows as savable all of a sudden despite no changes made in UI, also does not give dirty save prompt when leave it even though save icon is showing enabled bold
+
+
 - 1 fixed?? changed to attachment files path : for some reason user files path is blank in server settings under ops in ayanova app on linux desktop when using the single data path folder, check in windows
 
 - 1 todo: firefox schedule fix: https://github.com/vuetifyjs/vuetify/issues/14243#issuecomment-944907925
@@ -252,7 +253,7 @@ TODO: 1 BETA DOCS:
 - 1 translation cleanup, work order sb Orden de trabajo but is translated as Pedido?! (which is very generic and not work order, usually like a restaurant order or online shipping order sense for pedido)
 	I did a couple but realized it needs to be done one by one roundtripped carefully as it's used in alternative tenses and forms throughout
 
-
+- 1 todo: put reset link somewhere in UI so user can just click on it, maybe the login form?? Or the About form?
 
 - 2 todo: First print if it's downloading or will need to download chromium it should state there will be a delay while it attempts to download and install chromium render engine
 	or maybe trigger it on first boot?
@@ -841,7 +842,7 @@ BUILD 8.0.0-beta.0.9 CHANGES OF NOTE
 - opened up log files and server configuration even when server is locked to allow for troubleshooting ability with locked server
 - changed unlicensed mode at client from only showing a license option in menu to now showing a limited OPS section with view logs and view server config as options
 	this allows troubleshooting a not yet licensed server installation and also for when a license expires "unexpectedly"
-
+- fixed bug where printing a report would make the save icon show as available due to setting last report in menu
 
 
 
diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index bdf1d16b..e6c4a61b 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -914,7 +914,7 @@ export default {
   }, ////////////////////////////////////
   //  Set last report used in form settings
   //
-  setLastReport(formKey, reportSelected) {
+  setLastReportMenuItem(formKey, reportSelected, vm) {
     let fs = window.$gz.store.state.formSettings[formKey];
     if (fs == null) {
       fs = {};
@@ -925,6 +925,14 @@ export default {
       formKey: formKey,
       formSettings: fs
     });
+
+    window.$gz.eventBus.$emit("menu-upsert-last-report", {
+      title: reportSelected.name,
+      notrans: true,
+      icon: "$ayiFileAlt",
+      key: formKey + ":report:" + reportSelected.id,
+      vm: vm
+    });
   }, ////////////////////////////////////
   //  Add no selection item
   // Used by forms that need the option of an unselected
diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index 723a2768..c38bc0ff 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -200,25 +200,61 @@ export default {
       });
     }
   },
-  ///////////////////////////////
-  // CHANGE HANDLER
+  //Unused to date of beta 0.9
+  // ///////////////////////////////
+  // // CHANGE HANDLER
+  // //
+  // // Deal with a menu item update request
+  // // called from App.vue
+  // handleReplaceMenuItem(vm, newItem) {
+  //   if (!vm.appBar.menuItems || !newItem) {
+  //     return;
+  //   }
+  //   //Find the key that is in the collection and replace it
+  //   for (let i = 0; i < vm.appBar.menuItems.length; i++) {
+  //     if (vm.appBar.menuItems[i].key == newItem.key) {
+  //       //NOTE: since we are adding a new object, it has no reactivity in it so we need to use the Vue.Set to set it which
+  //       //automatically adds the setters and getters that trigger reactivity
+  //       //If it was set directly on the array it wouldn't update the UI
+  //       vm.$set(vm.appBar.menuItems, i, newItem);
+  //       return;
+  //     }
+  //   }
+  // },
+  //////////////////////////////////////////////
+  // LAST REPORT CHANGE HANDLER
+  // update / add last report menu item
   //
-  // Deal with a menu item update request
-  // called from App.vue
-  handleReplaceMenuItem(vm, newItem) {
+  handleUpsertLastReport(vm, newItem) {
     if (!vm.appBar.menuItems || !newItem) {
       return;
     }
-    //Find the key that is in the collection and replace it
+
+    /*
+      window.$gz.eventBus.$emit("menu-upsert-last-report", {
+      title: reportSelected.name,
+      notrans: true,
+      icon: "$ayiFileAlt",
+      key: formKey + ":report:" + reportSelected.id,
+      vm: vm
+    });
+    */
+    //Find the last report key and update it if present
     for (let i = 0; i < vm.appBar.menuItems.length; i++) {
-      if (vm.appBar.menuItems[i].key == newItem.key) {
-        //NOTE: since we are adding a new object, it has no reactivity in it so we need to use the Vue.Set to set it which
-        //automatically adds the setters and getters that trigger reactivity
-        //If it was set directly on the array it wouldn't update the UI
-        vm.$set(vm.appBar.menuItems, i, newItem);
+      var key = vm.appBar.menuItems[i].key;
+      if (key && key.includes(":report:")) {
+        vm.appBar.menuItems[i].key = newItem.key;
+        vm.appBar.menuItems[i].title = newItem.title;
         return;
       }
     }
+    //No prior last report so slot it in under the report one
+    for (let i = 0; i < vm.appBar.menuItems.length; i++) {
+      var key = vm.appBar.menuItems[i].key;
+      if (key && key.endsWith(":report")) {
+        vm.appBar.menuItems.splice(i + 1, 0, newItem);
+      }
+    }
   },
   ///////////////////////////////
   // ENABLE / DISABLE HANDLER
@@ -355,11 +391,19 @@ export default {
       that.handleMenuChange(vm, ctx);
     });
 
-    window.$gz.eventBus.$on("menu-replace-item", function handleReplaceMenuItem(
-      newItem
-    ) {
-      that.handleReplaceMenuItem(vm, newItem);
-    });
+    //currently as of beta 0.9 unused anywhere
+    // window.$gz.eventBus.$on("menu-replace-item", function handleReplaceMenuItem(
+    //   newItem
+    // ) {
+    //   that.handleReplaceMenuItem(vm, newItem);
+    // });
+
+    window.$gz.eventBus.$on(
+      "menu-upsert-last-report",
+      function handleUpsertLastReport(newItem) {
+        that.handleUpsertLastReport(vm, newItem);
+      }
+    );
 
     window.$gz.eventBus.$on("menu-disable-item", function handleDisableMenuItem(
       key
diff --git a/ayanova/src/views/acc-service-bank.vue b/ayanova/src/views/acc-service-bank.vue
index a69f2640..dc331903 100644
--- a/ayanova/src/views/acc-service-bank.vue
+++ b/ayanova/src/views/acc-service-bank.vue
@@ -352,8 +352,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/acc-service-banks.vue b/ayanova/src/views/acc-service-banks.vue
index 4aa136fa..d83e10c3 100644
--- a/ayanova/src/views/acc-service-banks.vue
+++ b/ayanova/src/views/acc-service-banks.vue
@@ -121,8 +121,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue
index 11fbff46..d6e5f538 100644
--- a/ayanova/src/views/acc-service-rate.vue
+++ b/ayanova/src/views/acc-service-rate.vue
@@ -513,8 +513,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/acc-service-rates.vue b/ayanova/src/views/acc-service-rates.vue
index f860cb05..e903fa69 100644
--- a/ayanova/src/views/acc-service-rates.vue
+++ b/ayanova/src/views/acc-service-rates.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index 3fea136e..efd433dc 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -476,8 +476,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/acc-tax-codes.vue b/ayanova/src/views/acc-tax-codes.vue
index 66451dee..be88ff40 100644
--- a/ayanova/src/views/acc-tax-codes.vue
+++ b/ayanova/src/views/acc-tax-codes.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue
index 7eb6d8af..6aa06bbf 100644
--- a/ayanova/src/views/acc-travel-rate.vue
+++ b/ayanova/src/views/acc-travel-rate.vue
@@ -499,8 +499,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/acc-travel-rates.vue b/ayanova/src/views/acc-travel-rates.vue
index f47de30b..9531804d 100644
--- a/ayanova/src/views/acc-travel-rates.vue
+++ b/ayanova/src/views/acc-travel-rates.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index d05b4cf8..25a5a3b2 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -486,8 +486,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 4b2ee816..529c5f4f 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -858,8 +858,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "directnotify":
         if (m.vm.obj.id == 0) {
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 919e9cc5..1fbd3dc9 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -79,8 +79,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "directnotify":
diff --git a/ayanova/src/views/cust-customer-note.vue b/ayanova/src/views/cust-customer-note.vue
index cbeb5d03..81902fb9 100644
--- a/ayanova/src/views/cust-customer-note.vue
+++ b/ayanova/src/views/cust-customer-note.vue
@@ -346,8 +346,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/cust-customer-notes.vue b/ayanova/src/views/cust-customer-notes.vue
index e53ad2da..0838f042 100644
--- a/ayanova/src/views/cust-customer-notes.vue
+++ b/ayanova/src/views/cust-customer-notes.vue
@@ -102,8 +102,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index abbc7a4e..29b39120 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -1275,8 +1275,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({
diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue
index d71b5b12..d2b1fd3f 100644
--- a/ayanova/src/views/cust-customers.vue
+++ b/ayanova/src/views/cust-customers.vue
@@ -112,8 +112,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 1a555381..69c5c1b9 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -1187,8 +1187,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({
diff --git a/ayanova/src/views/cust-head-offices.vue b/ayanova/src/views/cust-head-offices.vue
index edf289e6..cfcd9c8f 100644
--- a/ayanova/src/views/cust-head-offices.vue
+++ b/ayanova/src/views/cust-head-offices.vue
@@ -83,8 +83,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index fcd5d437..ddaa9c4f 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -850,8 +850,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index 8a5b8a74..b19949e3 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -73,8 +73,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "directnotify":
diff --git a/ayanova/src/views/customer-workorders.vue b/ayanova/src/views/customer-workorders.vue
index 33ce220f..21345019 100644
--- a/ayanova/src/views/customer-workorders.vue
+++ b/ayanova/src/views/customer-workorders.vue
@@ -97,8 +97,7 @@ async function clickHandler(menuItem) {
       //     if (res == null) {
       //       return;
       //     }
-      //     window.$gz.form.setLastReport(FORM_KEY, res);
-      //     generateMenu(m.vm);
+      //window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   }
       //   break;
 
diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue
index 462d40f9..677d5670 100644
--- a/ayanova/src/views/home-memo.vue
+++ b/ayanova/src/views/home-memo.vue
@@ -514,8 +514,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "reply":
         m.vm.replyForward(false);
diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue
index 7cc35ea6..fb97ce27 100644
--- a/ayanova/src/views/home-memos.vue
+++ b/ayanova/src/views/home-memos.vue
@@ -79,8 +79,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index c5988c2a..0d372823 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -454,8 +454,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue
index 874185a6..3d08e96d 100644
--- a/ayanova/src/views/home-reminders.vue
+++ b/ayanova/src/views/home-reminders.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 50349b1b..930e0eec 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -528,8 +528,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/home-reviews.vue b/ayanova/src/views/home-reviews.vue
index 9bc47eb3..8ec4ebf9 100644
--- a/ayanova/src/views/home-reviews.vue
+++ b/ayanova/src/views/home-reviews.vue
@@ -110,8 +110,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index f08d9292..41bf1ff4 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -954,8 +954,7 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/inv-part-assemblies.vue b/ayanova/src/views/inv-part-assemblies.vue
index f00f6497..b72fcbe4 100644
--- a/ayanova/src/views/inv-part-assemblies.vue
+++ b/ayanova/src/views/inv-part-assemblies.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index 14bd379d..f708d772 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -612,8 +612,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue
index 211fb25e..efac6ebc 100644
--- a/ayanova/src/views/inv-part-inventory-transactions.vue
+++ b/ayanova/src/views/inv-part-inventory-transactions.vue
@@ -126,8 +126,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue
index d241a12f..2865f31b 100644
--- a/ayanova/src/views/inv-part-inventory.vue
+++ b/ayanova/src/views/inv-part-inventory.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue
index 45e1d920..f1d55b28 100644
--- a/ayanova/src/views/inv-part-requests.vue
+++ b/ayanova/src/views/inv-part-requests.vue
@@ -112,8 +112,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-part-warehouse.vue b/ayanova/src/views/inv-part-warehouse.vue
index a01781f6..e8e65ad0 100644
--- a/ayanova/src/views/inv-part-warehouse.vue
+++ b/ayanova/src/views/inv-part-warehouse.vue
@@ -401,8 +401,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "PartByWarehouseInventoryList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/inv-part-warehouses.vue b/ayanova/src/views/inv-part-warehouses.vue
index 2cd28863..d99e7d99 100644
--- a/ayanova/src/views/inv-part-warehouses.vue
+++ b/ayanova/src/views/inv-part-warehouses.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-part.vue b/ayanova/src/views/inv-part.vue
index 312e9b57..ad728b85 100644
--- a/ayanova/src/views/inv-part.vue
+++ b/ayanova/src/views/inv-part.vue
@@ -619,8 +619,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "PartSerialNumbersAvailable":
         m.vm.$router.push({
diff --git a/ayanova/src/views/inv-parts.vue b/ayanova/src/views/inv-parts.vue
index d8e3916d..b858cbc1 100644
--- a/ayanova/src/views/inv-parts.vue
+++ b/ayanova/src/views/inv-parts.vue
@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index e7201cce..82acb7e8 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -1767,8 +1767,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue
index 8abb8f27..4aae2995 100644
--- a/ayanova/src/views/inv-purchase-orders.vue
+++ b/ayanova/src/views/inv-purchase-orders.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index 612d6df9..8a112858 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -1783,8 +1783,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index d4ef0822..b80e5bf6 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 1abd9caf..09df2a9d 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -687,8 +687,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/svc-csrs.vue b/ayanova/src/views/svc-csrs.vue
index 318d086b..3fd45bc6 100644
--- a/ayanova/src/views/svc-csrs.vue
+++ b/ayanova/src/views/svc-csrs.vue
@@ -84,8 +84,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index 5081a4fc..0b9f40d8 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -741,8 +741,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index 64600e8b..6557d63b 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-meter-reading.vue b/ayanova/src/views/svc-meter-reading.vue
index 0679b99e..d8812c8d 100644
--- a/ayanova/src/views/svc-meter-reading.vue
+++ b/ayanova/src/views/svc-meter-reading.vue
@@ -304,8 +304,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/svc-meter-readings.vue b/ayanova/src/views/svc-meter-readings.vue
index 8f8d3b4a..9adf2430 100644
--- a/ayanova/src/views/svc-meter-readings.vue
+++ b/ayanova/src/views/svc-meter-readings.vue
@@ -86,8 +86,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-pm-item-expenses.vue b/ayanova/src/views/svc-pm-item-expenses.vue
index b454aa4a..9ac9c1dd 100644
--- a/ayanova/src/views/svc-pm-item-expenses.vue
+++ b/ayanova/src/views/svc-pm-item-expenses.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-labors.vue b/ayanova/src/views/svc-pm-item-labors.vue
index ea3405af..4a626dab 100644
--- a/ayanova/src/views/svc-pm-item-labors.vue
+++ b/ayanova/src/views/svc-pm-item-labors.vue
@@ -116,8 +116,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-loans.vue b/ayanova/src/views/svc-pm-item-loans.vue
index 5b8552d4..245d5246 100644
--- a/ayanova/src/views/svc-pm-item-loans.vue
+++ b/ayanova/src/views/svc-pm-item-loans.vue
@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-outside-services.vue b/ayanova/src/views/svc-pm-item-outside-services.vue
index 18854421..52ab6c28 100644
--- a/ayanova/src/views/svc-pm-item-outside-services.vue
+++ b/ayanova/src/views/svc-pm-item-outside-services.vue
@@ -81,8 +81,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-parts.vue b/ayanova/src/views/svc-pm-item-parts.vue
index 61f8c67a..bf1d881a 100644
--- a/ayanova/src/views/svc-pm-item-parts.vue
+++ b/ayanova/src/views/svc-pm-item-parts.vue
@@ -114,8 +114,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-scheduled-users.vue b/ayanova/src/views/svc-pm-item-scheduled-users.vue
index 0dcf0bef..235d145d 100644
--- a/ayanova/src/views/svc-pm-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-pm-item-scheduled-users.vue
@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-tasks.vue b/ayanova/src/views/svc-pm-item-tasks.vue
index 195f7b06..965bf864 100644
--- a/ayanova/src/views/svc-pm-item-tasks.vue
+++ b/ayanova/src/views/svc-pm-item-tasks.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-travels.vue b/ayanova/src/views/svc-pm-item-travels.vue
index 514191e2..6cf99f1b 100644
--- a/ayanova/src/views/svc-pm-item-travels.vue
+++ b/ayanova/src/views/svc-pm-item-travels.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-item-units.vue b/ayanova/src/views/svc-pm-item-units.vue
index ae22cc65..8eabbb79 100644
--- a/ayanova/src/views/svc-pm-item-units.vue
+++ b/ayanova/src/views/svc-pm-item-units.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm-items.vue b/ayanova/src/views/svc-pm-items.vue
index 8dc5ebb2..c78aa8b1 100644
--- a/ayanova/src/views/svc-pm-items.vue
+++ b/ayanova/src/views/svc-pm-items.vue
@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index 98533a7d..4501c441 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -1694,8 +1694,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-pms.vue b/ayanova/src/views/svc-pms.vue
index bb8df03e..f55f5fe3 100644
--- a/ayanova/src/views/svc-pms.vue
+++ b/ayanova/src/views/svc-pms.vue
@@ -174,8 +174,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index fa9c0336..b0476909 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -483,8 +483,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-projects.vue b/ayanova/src/views/svc-projects.vue
index 0205df01..8336c32a 100644
--- a/ayanova/src/views/svc-projects.vue
+++ b/ayanova/src/views/svc-projects.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-quote-item-expenses.vue b/ayanova/src/views/svc-quote-item-expenses.vue
index 89e14d69..b1287e16 100644
--- a/ayanova/src/views/svc-quote-item-expenses.vue
+++ b/ayanova/src/views/svc-quote-item-expenses.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-labors.vue b/ayanova/src/views/svc-quote-item-labors.vue
index de5b9687..492c60d8 100644
--- a/ayanova/src/views/svc-quote-item-labors.vue
+++ b/ayanova/src/views/svc-quote-item-labors.vue
@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-loans.vue b/ayanova/src/views/svc-quote-item-loans.vue
index a7cafa79..62701474 100644
--- a/ayanova/src/views/svc-quote-item-loans.vue
+++ b/ayanova/src/views/svc-quote-item-loans.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-outside-services.vue b/ayanova/src/views/svc-quote-item-outside-services.vue
index a2bfe575..6233558a 100644
--- a/ayanova/src/views/svc-quote-item-outside-services.vue
+++ b/ayanova/src/views/svc-quote-item-outside-services.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-parts.vue b/ayanova/src/views/svc-quote-item-parts.vue
index c19777d4..5d4daddc 100644
--- a/ayanova/src/views/svc-quote-item-parts.vue
+++ b/ayanova/src/views/svc-quote-item-parts.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-scheduled-users.vue b/ayanova/src/views/svc-quote-item-scheduled-users.vue
index 95080d9c..58d1811f 100644
--- a/ayanova/src/views/svc-quote-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-quote-item-scheduled-users.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-tasks.vue b/ayanova/src/views/svc-quote-item-tasks.vue
index 5ea2a17b..d0e5bc62 100644
--- a/ayanova/src/views/svc-quote-item-tasks.vue
+++ b/ayanova/src/views/svc-quote-item-tasks.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-travels.vue b/ayanova/src/views/svc-quote-item-travels.vue
index b6e3385a..36ee897a 100644
--- a/ayanova/src/views/svc-quote-item-travels.vue
+++ b/ayanova/src/views/svc-quote-item-travels.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-item-units.vue b/ayanova/src/views/svc-quote-item-units.vue
index 3bb1ddf7..b50c6eaf 100644
--- a/ayanova/src/views/svc-quote-item-units.vue
+++ b/ayanova/src/views/svc-quote-item-units.vue
@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote-items.vue b/ayanova/src/views/svc-quote-items.vue
index 369c172a..9bfc839a 100644
--- a/ayanova/src/views/svc-quote-items.vue
+++ b/ayanova/src/views/svc-quote-items.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index 3a06e6bd..59ea9c49 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -1748,8 +1748,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index fa15fdbf..1783a101 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -176,8 +176,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":
diff --git a/ayanova/src/views/svc-schedule-user.vue b/ayanova/src/views/svc-schedule-user.vue
index 8b498b8e..91ca1732 100644
--- a/ayanova/src/views/svc-schedule-user.vue
+++ b/ayanova/src/views/svc-schedule-user.vue
@@ -867,8 +867,8 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+      //
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue
index c8feb4ba..7870ebaf 100644
--- a/ayanova/src/views/svc-schedule.vue
+++ b/ayanova/src/views/svc-schedule.vue
@@ -944,8 +944,8 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-task-group.vue b/ayanova/src/views/svc-task-group.vue
index f24e0edf..b82ca57d 100644
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -547,8 +547,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index 1bcd1561..f8e2d747 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -552,8 +552,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index 143c9863..a03c8953 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 37a6385b..c13c51fc 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -1142,8 +1142,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index d730ca88..60c4afcc 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -111,8 +111,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:
diff --git a/ayanova/src/views/svc-workorder-item-expenses.vue b/ayanova/src/views/svc-workorder-item-expenses.vue
index 07eb8816..8eab66e3 100644
--- a/ayanova/src/views/svc-workorder-item-expenses.vue
+++ b/ayanova/src/views/svc-workorder-item-expenses.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-labors.vue b/ayanova/src/views/svc-workorder-item-labors.vue
index 92a8f551..9a76de58 100644
--- a/ayanova/src/views/svc-workorder-item-labors.vue
+++ b/ayanova/src/views/svc-workorder-item-labors.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-loans.vue b/ayanova/src/views/svc-workorder-item-loans.vue
index 56d13148..6b64a0f0 100644
--- a/ayanova/src/views/svc-workorder-item-loans.vue
+++ b/ayanova/src/views/svc-workorder-item-loans.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-outside-services.vue b/ayanova/src/views/svc-workorder-item-outside-services.vue
index 6618013e..aaed476a 100644
--- a/ayanova/src/views/svc-workorder-item-outside-services.vue
+++ b/ayanova/src/views/svc-workorder-item-outside-services.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 
diff --git a/ayanova/src/views/svc-workorder-item-part-requests.vue b/ayanova/src/views/svc-workorder-item-part-requests.vue
index 14a6b348..db1414f9 100644
--- a/ayanova/src/views/svc-workorder-item-part-requests.vue
+++ b/ayanova/src/views/svc-workorder-item-part-requests.vue
@@ -82,8 +82,8 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-parts.vue b/ayanova/src/views/svc-workorder-item-parts.vue
index e9890702..6b6cc4a2 100644
--- a/ayanova/src/views/svc-workorder-item-parts.vue
+++ b/ayanova/src/views/svc-workorder-item-parts.vue
@@ -115,8 +115,8 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 
diff --git a/ayanova/src/views/svc-workorder-item-scheduled-users.vue b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
index 22f41e44..696c6b9d 100644
--- a/ayanova/src/views/svc-workorder-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-tasks.vue b/ayanova/src/views/svc-workorder-item-tasks.vue
index 8af67223..84f1660b 100644
--- a/ayanova/src/views/svc-workorder-item-tasks.vue
+++ b/ayanova/src/views/svc-workorder-item-tasks.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 
diff --git a/ayanova/src/views/svc-workorder-item-travels.vue b/ayanova/src/views/svc-workorder-item-travels.vue
index f0e496e9..03033251 100644
--- a/ayanova/src/views/svc-workorder-item-travels.vue
+++ b/ayanova/src/views/svc-workorder-item-travels.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-item-units.vue b/ayanova/src/views/svc-workorder-item-units.vue
index d439d0f8..58ce7288 100644
--- a/ayanova/src/views/svc-workorder-item-units.vue
+++ b/ayanova/src/views/svc-workorder-item-units.vue
@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder-items.vue b/ayanova/src/views/svc-workorder-items.vue
index f4d043b6..81d7f240 100644
--- a/ayanova/src/views/svc-workorder-items.vue
+++ b/ayanova/src/views/svc-workorder-items.vue
@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index f4f21a80..344825e6 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1917,8 +1917,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index aa1cea48..6d1390e4 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -178,8 +178,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index 743c011a..5e4612d9 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -986,8 +986,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index ba055f8a..7932c435 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default: