case 4052

ayanova/src/views/acc-service-rate.vue

@@ -555,16 +555,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -600,7 +590,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/acc-tax-code.vue

@@ -518,16 +518,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -563,7 +553,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/acc-travel-rate.vue

@@ -540,16 +540,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -586,6 +576,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/adm-translation.vue

@@ -524,19 +524,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-  if (
+
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    vm.obj.stock != true
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -586,6 +574,19 @@ function generateMenu(vm) {
     });
   }
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    vm.obj.stock != true
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/adm-user.vue

@@ -935,15 +935,7 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -976,6 +968,16 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
   if (vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({

ayanova/src/views/ay-report-edit.vue

@@ -955,16 +955,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
@@ -983,6 +973,15 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   //EXPORT

ayanova/src/views/cust-customer-note.vue

@@ -385,16 +385,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -421,6 +411,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }

ayanova/src/views/cust-customer.vue

@@ -1384,16 +1384,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1429,6 +1419,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 

ayanova/src/views/cust-head-office.vue

@@ -1249,16 +1249,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1294,7 +1284,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/cust-user.vue

@@ -910,16 +910,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -945,6 +935,16 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
   if (vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({

ayanova/src/views/home-memo.vue

@@ -561,16 +561,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (!vm.composing) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -614,6 +604,16 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+  if (!vm.composing) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/home-notify-subscription.vue

@@ -611,16 +611,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
@@ -638,6 +628,16 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }

ayanova/src/views/home-reminder.vue

@@ -495,16 +495,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -541,6 +531,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/home-review.vue

@@ -569,18 +569,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    if (vm.selfAssigned || vm.hasSupervisorRole) {
-      menuOptions.menuItems.push({
-        title: "Delete",
-        icon: "$ayiTrashAlt",
-        surface: false,
-        key: FORM_KEY + ":delete",
-        vm: vm
-      });
-    }
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -618,6 +606,19 @@ function generateMenu(vm) {
       });
     }
   }
+
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    if (vm.selfAssigned || vm.hasSupervisorRole) {
+      menuOptions.menuItems.push({
+        title: "Delete",
+        icon: "$ayiTrashAlt",
+        surface: false,
+        key: FORM_KEY + ":delete",
+        vm: vm
+      });
+    }
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }

ayanova/src/views/inv-part-assembly.vue

@@ -654,16 +654,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -700,6 +690,15 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/inv-part-warehouse.vue

@@ -470,21 +470,6 @@ function generateMenu(vm) {
     });
   }
 
-  //don't allow deleting the default warehouse id=1
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    vm.$route.params.recordid != 1
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -520,6 +505,20 @@ function generateMenu(vm) {
       vm: vm
     });
   }
+  //don't allow deleting the default warehouse id=1
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    vm.$route.params.recordid != 1
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
   if (
     vm.obj.id != null &&

ayanova/src/views/inv-part.vue

@@ -731,16 +731,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -777,6 +767,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   if (

ayanova/src/views/inv-purchase-order.vue

@@ -1808,16 +1808,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1854,6 +1844,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/svc-contract.vue

@@ -1824,16 +1824,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1870,6 +1860,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/svc-csr.vue

@@ -728,20 +728,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.formState.readOnly
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -760,6 +746,19 @@ function generateMenu(vm) {
     });
   }
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   if (vm.rights.change) {

ayanova/src/views/svc-loaner.vue

@@ -812,16 +812,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -858,6 +848,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/svc-pm.vue

@@ -1770,20 +1770,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.obj.userIsRestrictedType
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1851,6 +1837,19 @@ function generateMenu(vm) {
   }
 
   //--- /show all ---
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.obj.userIsRestrictedType
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
 
   if (!vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({ divider: true, inset: false });

ayanova/src/views/svc-project.vue

@@ -554,16 +554,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -599,7 +589,15 @@ function generateMenu(vm) {
       vm: vm
     });
   }
-
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/svc-quote.vue

@@ -1829,20 +1829,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.obj.userIsRestrictedType
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1909,6 +1895,20 @@ function generateMenu(vm) {
     });
   }
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.obj.userIsRestrictedType
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   if (!vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({ divider: true, inset: false });
     menuOptions.menuItems.push({

ayanova/src/views/svc-task-group.vue

@@ -587,20 +587,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.formState.readOnly
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -619,6 +605,20 @@ function generateMenu(vm) {
     });
   }
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/svc-unit-model.vue

@@ -593,16 +593,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -639,6 +629,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/svc-unit.vue

@@ -1224,16 +1224,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -1270,6 +1260,16 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({

ayanova/src/views/svc-work-order-item-priorities-edit.vue

@@ -381,20 +381,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.formState.readOnly
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   if (vm.rights.change && !vm.formState.readOnly) {
     menuOptions.menuItems.push({
       title: "New",
@@ -412,6 +398,20 @@ function generateMenu(vm) {
     vm: vm
   });
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }

ayanova/src/views/svc-work-order-item-status-edit.vue

@@ -393,20 +393,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.formState.readOnly
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   if (vm.rights.change && !vm.formState.readOnly) {
     menuOptions.menuItems.push({
       title: "New",
@@ -424,6 +410,20 @@ function generateMenu(vm) {
     vm: vm
   });
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.formState.readOnly
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   window.$gz.eventBus.$emit("menu-change", menuOptions);

ayanova/src/views/svc-work-order-status-edit.vue

@@ -437,6 +437,15 @@ function generateMenu(vm) {
     });
   }
 
+  if (vm.rights.change && !vm.formState.readOnly) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
   if (
     vm.rights.delete &&
     vm.$route.params.recordid != 0 &&
@@ -451,15 +460,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (vm.rights.change && !vm.formState.readOnly) {
-    menuOptions.menuItems.push({
-      title: "New",
-      icon: "$ayiPlus",
-      key: FORM_KEY + ":new",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({ divider: true, inset: false });
   menuOptions.menuItems.push({
     title: "WorkOrderStatusList",

ayanova/src/views/svc-workorder.vue

@@ -1992,20 +1992,6 @@ function generateMenu(vm) {
     });
   }
 
-  if (
-    vm.rights.delete &&
-    vm.$route.params.recordid != 0 &&
-    !vm.obj.userIsRestrictedType
-  ) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$ayiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$ayiFileAlt",
@@ -2072,6 +2058,20 @@ function generateMenu(vm) {
     });
   }
 
+  if (
+    vm.rights.delete &&
+    vm.$route.params.recordid != 0 &&
+    !vm.obj.userIsRestrictedType
+  ) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   //--- /show all ---
 
   if (!vm.obj.userIsRestrictedType) {