fixed set last report menu item making save icon appear available

2022-01-03 21:17:03 +00:00
parent 52866a4af8
commit 98af909019
97 changed files with 171 additions and 208 deletions
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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(
--- 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:
--- 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(
--- 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) {
--- 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":
--- 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(
--- 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:
--- 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({
--- 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:
--- 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({
--- 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:
--- 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
--- 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":
--- 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;

--- 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);
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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({
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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({
--- 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:
--- 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({
--- 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:
--- 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(
--- 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:
--- 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(
--- 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:
--- 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(
--- 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:
--- 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({
--- 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:
--- 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(
--- 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:
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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({
--- 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":
--- 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({
--- 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:
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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":
--- 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({
--- 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":
--- 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({
--- 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({
--- 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(
--- 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(
--- 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:
--- 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({
--- 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:
--- 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":
--- 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":
--- 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":
--- 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;

--- 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":
--- 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;

--- 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":
--- 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;

--- 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":
--- 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":
--- 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":
--- 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({
--- 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":
--- 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({
--- 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: