diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index 6f538d4a..f86a90d9 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -310,7 +310,6 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-workorder-items.vue")
     },
-
     {
       path: "/svc-workorder-item-units",
       name: "svc-workorder-item-units",
@@ -391,7 +390,7 @@ export default new Router({
           /* webpackChunkName: "svc" */ "./views/svc-workorder-item-outside-services.vue"
         )
     },
-
+    // ---------------------- quote ----------------------
     {
       path: "/svc-quotes",
       name: "svc-quotes",
@@ -404,7 +403,6 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-quote.vue")
     },
-
     {
       path: "/svc-quote-status",
       name: "svc-quote-status",
@@ -419,7 +417,77 @@ export default new Router({
           /* webpackChunkName: "svc" */ "./views/svc-quote-status-edit.vue"
         )
     },
-
+    {
+      path: "/svc-quote-items",
+      name: "svc-quote-items",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-items.vue")
+    },
+    {
+      path: "/svc-quote-item-units",
+      name: "svc-quote-item-units",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-item-units.vue")
+    },
+    {
+      path: "/svc-quote-item-scheduled-users",
+      name: "svc-quote-item-scheduled-users",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-item-scheduled-users.vue"
+        )
+    },
+    {
+      path: "/svc-quote-item-tasks",
+      name: "svc-quote-item-tasks",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-item-tasks.vue")
+    },
+    {
+      path: "/svc-quote-item-parts",
+      name: "svc-quote-item-parts",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-item-parts.vue")
+    },
+    {
+      path: "/svc-quote-item-labors",
+      name: "svc-quote-item-labors",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-item-labors.vue"
+        )
+    },
+    {
+      path: "/svc-quote-item-travels",
+      name: "svc-quote-item-travels",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-item-travels.vue"
+        )
+    },
+    {
+      path: "/svc-quote-item-expenses",
+      name: "svc-quote-item-expenses",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-item-expenses.vue"
+        )
+    },
+    {
+      path: "/svc-quote-item-loans",
+      name: "svc-quote-item-loans",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-item-loans.vue")
+    },
+    {
+      path: "/svc-quote-item-outside-services",
+      name: "svc-quote-item-outside-services",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-quote-item-outside-services.vue"
+        )
+    },
+    //----------------------- PM -----------------------------------
     {
       path: "/svc-pms",
       name: "svc-pms",
@@ -432,6 +500,71 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-pm.vue")
     },
+    {
+      path: "/svc-pm-items",
+      name: "svc-pm-items",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-items.vue")
+    },
+    {
+      path: "/svc-pm-item-units",
+      name: "svc-pm-item-units",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-units.vue")
+    },
+    {
+      path: "/svc-pm-item-scheduled-users",
+      name: "svc-pm-item-scheduled-users",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-pm-item-scheduled-users.vue"
+        )
+    },
+    {
+      path: "/svc-pm-item-tasks",
+      name: "svc-pm-item-tasks",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-tasks.vue")
+    },
+    {
+      path: "/svc-pm-item-parts",
+      name: "svc-pm-item-parts",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-parts.vue")
+    },
+    {
+      path: "/svc-pm-item-labors",
+      name: "svc-pm-item-labors",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-labors.vue")
+    },
+    {
+      path: "/svc-pm-item-travels",
+      name: "svc-pm-item-travels",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-travels.vue")
+    },
+    {
+      path: "/svc-pm-item-expenses",
+      name: "svc-pm-item-expenses",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-expenses.vue")
+    },
+    {
+      path: "/svc-pm-item-loans",
+      name: "svc-pm-item-loans",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-item-loans.vue")
+    },
+    {
+      path: "/svc-pm-item-outside-services",
+      name: "svc-pm-item-outside-services",
+      component: () =>
+        import(
+          /* webpackChunkName: "svc" */ "./views/svc-pm-item-outside-services.vue"
+        )
+    },
+    //---------------------------------------------------------------------
     {
       path: "/svc-units",
       name: "svc-units",
diff --git a/ayanova/src/views/svc-pm-item-expenses.vue b/ayanova/src/views/svc-pm-item-expenses.vue
new file mode 100644
index 00000000..9ea33cd6
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-expenses.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-expense-list"
+      data-list-key="WorkOrderItemExpenseDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemExpensesTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-expense-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemExpense,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemExpense
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemExpense
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemExpense
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemExpense
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiMoneyBillWave",
+    title: "WorkOrderItemExpenseList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemExpense
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-labors.vue b/ayanova/src/views/svc-pm-item-labors.vue
new file mode 100644
index 00000000..04cd696a
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-labors.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-labor-list"
+      data-list-key="WorkOrderItemLaborDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemLaborsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-labor-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemLabor,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemLabor
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemLabor
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemLabor
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemLabor
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiHammer",
+    title: "WorkOrderItemLaborList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemLabor
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-loans.vue b/ayanova/src/views/svc-pm-item-loans.vue
new file mode 100644
index 00000000..3aa306c8
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-loans.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-loan-list"
+      data-list-key="WorkOrderItemLoanDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemLoansTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-loan-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemLoan,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemLoan
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemLoan
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemLoan
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemLoan
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiPlug",
+    title: "WorkOrderItemLoanList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemLoan
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-outside-services.vue b/ayanova/src/views/svc-pm-item-outside-services.vue
new file mode 100644
index 00000000..1b1b2bc0
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-outside-services.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-outside-service-list"
+      data-list-key="WorkOrderItemOutsideServiceDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemOutsideServicesTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-outside-service-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemOutsideService,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemOutsideService
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemOutsideService
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiLuggageCart",
+    title: "WorkOrderItemOutsideServiceList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemOutsideService
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-parts.vue b/ayanova/src/views/svc-pm-item-parts.vue
new file mode 100644
index 00000000..282912a9
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-parts.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-part-list"
+      data-list-key="WorkOrderItemPartDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemPartsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-part-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemPart,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemPart
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemPart
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemPart
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemPart
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiBoxes",
+    title: "WorkOrderItemPartList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemPart
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-scheduled-users.vue b/ayanova/src/views/svc-pm-item-scheduled-users.vue
new file mode 100644
index 00000000..a4aeaf1f
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-scheduled-users.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-scheduled-user-list"
+      data-list-key="WorkOrderItemScheduledUserDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemScheduledUsersTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-scheduled-user-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemScheduledUser,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemScheduledUser
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemScheduledUser
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiUserClock",
+    title: "WorkOrderItemScheduledUserList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemScheduledUser
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-tasks.vue b/ayanova/src/views/svc-pm-item-tasks.vue
new file mode 100644
index 00000000..715dfc9d
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-tasks.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-task-list"
+      data-list-key="WorkOrderItemTaskDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemTasksTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-task-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemTask,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemTask
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemTask
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemTask
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemTask
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiTasks",
+    title: "WorkOrderItemTasks",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemTask
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-travels.vue b/ayanova/src/views/svc-pm-item-travels.vue
new file mode 100644
index 00000000..0005d366
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-travels.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-travel-list"
+      data-list-key="WorkOrderItemTravelDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemTravelsTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-travel-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemTravel,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemTravel
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemTravel
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemTravel
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemTravel
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiTruckMonster",
+    title: "WorkOrderItemTravelList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemTravel
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-item-units.vue b/ayanova/src/views/svc-pm-item-units.vue
new file mode 100644
index 00000000..c34071ee
--- /dev/null
+++ b/ayanova/src/views/svc-pm-item-units.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-unit-list"
+      data-list-key="WorkOrderItemUnitDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemUnitsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-unit-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemUnit,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemUnit
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemUnit
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemUnit
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemUnit
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiFan",
+    title: "WorkOrderItemUnitList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemUnit
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pm-items.vue b/ayanova/src/views/svc-pm-items.vue
new file mode 100644
index 00000000..58a6dde2
--- /dev/null
+++ b/ayanova/src/views/svc-pm-items.vue
@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="pm-item-list"
+      data-list-key="PMItemDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="pmItemsTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "pm-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.PMItem,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "pm-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem)
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: { recordid: m.id, ayatype: window.$gz.type.PMItem }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem)
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: { recordid: res.id, ayatype: window.$gz.type.PMItem }
+          });
+        }
+        break;
+      case "PMList":
+        m.vm.$router.push({
+          name: "svc-pms"
+        });
+        break;
+
+      case "WorkOrderItemUnitList":
+        m.vm.$router.push({
+          name: "svc-pm-item-units"
+        });
+        break;
+
+      case "WorkOrderItemScheduledList":
+        m.vm.$router.push({
+          name: "svc-pm-item-scheduled-users"
+        });
+        break;
+
+      case "WorkOrderItemTasks":
+        m.vm.$router.push({
+          name: "svc-pm-item-tasks"
+        });
+        break;
+
+      case "WorkOrderItemPartList":
+        m.vm.$router.push({
+          name: "svc-pm-item-parts"
+        });
+        break;
+
+      case "WorkOrderItemLaborList":
+        m.vm.$router.push({
+          name: "svc-pm-item-labors"
+        });
+        break;
+      case "WorkOrderItemTravelList":
+        m.vm.$router.push({
+          name: "svc-pm-item-travels"
+        });
+        break;
+      case "WorkOrderItemExpenseList":
+        m.vm.$router.push({
+          name: "svc-pm-item-expenses"
+        });
+        break;
+      case "WorkOrderItemLoanList":
+        m.vm.$router.push({
+          name: "svc-pm-item-loans"
+        });
+        break;
+      case "WorkOrderItemOutsideServiceList":
+        m.vm.$router.push({
+          name: "svc-pm-item-outside-services"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiWrench",
+    title: "WorkOrderItemList",
+    helpUrl: "svc-pms",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.PMItem
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "PMList",
+    icon: "$ayiPencilAlt",
+    key: FORM_KEY + ":PMList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemUnitList",
+    icon: "$ayiFan",
+    key: FORM_KEY + ":WorkOrderItemUnitList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemScheduledUserList",
+    icon: "$ayiUserClock",
+    key: FORM_KEY + ":WorkOrderItemScheduledList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemTasks",
+    icon: "$ayiTasks",
+    key: FORM_KEY + ":WorkOrderItemTasks",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemPartList",
+    icon: "$ayiBoxes",
+    key: FORM_KEY + ":WorkOrderItemPartList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemLaborList",
+    icon: "$ayiHammer",
+    key: FORM_KEY + ":WorkOrderItemLaborList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemTravelList",
+    icon: "$ayiTruckMonster",
+    key: FORM_KEY + ":WorkOrderItemTravelList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemExpenseList",
+    icon: "$ayiMoneyBillWave",
+    key: FORM_KEY + ":WorkOrderItemExpenseList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemLoanList",
+    icon: "$ayiPlug",
+    key: FORM_KEY + ":WorkOrderItemLoanList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemOutsideServiceList",
+    icon: "$ayiLuggageCart",
+    key: FORM_KEY + ":WorkOrderItemOutsideServiceList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-pms.vue b/ayanova/src/views/svc-pms.vue
index 2f72d173..c689cd38 100644
--- a/ayanova/src/views/svc-pms.vue
+++ b/ayanova/src/views/svc-pms.vue
@@ -198,7 +198,7 @@ async function clickHandler(menuItem) {
           });
         }
         break;
-      case "PMItemList":
+      case "WorkOrderItemList":
         m.vm.$router.push({
           name: "svc-pm-items"
         });
@@ -275,9 +275,9 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "PMItemList",
+    title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":PMItemList",
+    key: FORM_KEY + ":WorkOrderItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-expenses.vue b/ayanova/src/views/svc-quote-item-expenses.vue
new file mode 100644
index 00000000..9ea33cd6
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-expenses.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-expense-list"
+      data-list-key="WorkOrderItemExpenseDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemExpensesTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-expense-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemExpense,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemExpense
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemExpense
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemExpense
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemExpense
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiMoneyBillWave",
+    title: "WorkOrderItemExpenseList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemExpense
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-labors.vue b/ayanova/src/views/svc-quote-item-labors.vue
new file mode 100644
index 00000000..04cd696a
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-labors.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-labor-list"
+      data-list-key="WorkOrderItemLaborDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemLaborsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-labor-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemLabor,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemLabor
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemLabor
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemLabor
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemLabor
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiHammer",
+    title: "WorkOrderItemLaborList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemLabor
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-loans.vue b/ayanova/src/views/svc-quote-item-loans.vue
new file mode 100644
index 00000000..3aa306c8
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-loans.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-loan-list"
+      data-list-key="WorkOrderItemLoanDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemLoansTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-loan-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemLoan,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemLoan
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemLoan
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemLoan
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemLoan
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiPlug",
+    title: "WorkOrderItemLoanList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemLoan
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-outside-services.vue b/ayanova/src/views/svc-quote-item-outside-services.vue
new file mode 100644
index 00000000..1b1b2bc0
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-outside-services.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-outside-service-list"
+      data-list-key="WorkOrderItemOutsideServiceDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemOutsideServicesTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-outside-service-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemOutsideService,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemOutsideService
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemOutsideService
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiLuggageCart",
+    title: "WorkOrderItemOutsideServiceList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemOutsideService
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-parts.vue b/ayanova/src/views/svc-quote-item-parts.vue
new file mode 100644
index 00000000..282912a9
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-parts.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-part-list"
+      data-list-key="WorkOrderItemPartDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemPartsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-part-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemPart,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemPart
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemPart
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemPart
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemPart
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiBoxes",
+    title: "WorkOrderItemPartList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemPart
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-scheduled-users.vue b/ayanova/src/views/svc-quote-item-scheduled-users.vue
new file mode 100644
index 00000000..a4aeaf1f
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-scheduled-users.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-scheduled-user-list"
+      data-list-key="WorkOrderItemScheduledUserDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemScheduledUsersTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-scheduled-user-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemScheduledUser,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemScheduledUser
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemScheduledUser
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiUserClock",
+    title: "WorkOrderItemScheduledUserList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemScheduledUser
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-tasks.vue b/ayanova/src/views/svc-quote-item-tasks.vue
new file mode 100644
index 00000000..715dfc9d
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-tasks.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-task-list"
+      data-list-key="WorkOrderItemTaskDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemTasksTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-task-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemTask,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemTask
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemTask
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemTask
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemTask
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiTasks",
+    title: "WorkOrderItemTasks",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemTask
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-travels.vue b/ayanova/src/views/svc-quote-item-travels.vue
new file mode 100644
index 00000000..0005d366
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-travels.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-travel-list"
+      data-list-key="WorkOrderItemTravelDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemTravelsTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-travel-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemTravel,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemTravel
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemTravel
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemTravel
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemTravel
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiTruckMonster",
+    title: "WorkOrderItemTravelList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemTravel
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-item-units.vue b/ayanova/src/views/svc-quote-item-units.vue
new file mode 100644
index 00000000..c34071ee
--- /dev/null
+++ b/ayanova/src/views/svc-quote-item-units.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="workorder-item-unit-list"
+      data-list-key="WorkOrderItemUnitDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="WorkOrderItemUnitsTable"
+      :client-criteria="clientCriteria"
+      :pre-filter-mode="preFilterMode"
+      @clear-pre-filter="clearPreFilter"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "workorder-item-unit-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    //------ Show all ----
+    //OPTIONAL "Show All" FILTER
+    this.objectId = window.$gz.util.stringToIntOrNull(
+      this.$route.params.objectId
+    );
+    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
+
+    if (this.objectId && this.objectId != 0 && this.aForType) {
+      //OBJECTID,AYATYPE
+      this.clientCriteria = `${this.objectId},${this.aForType}`;
+
+      this.preFilterMode = {
+        icon: window.$gz.util.iconForType(this.aForType),
+        id: this.objectId,
+        ayatype: this.aForType,
+        viz: this.$route.params.name,
+        clearable: true
+      };
+    }
+    //------ /show all ----
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrderItemUnit,
+      selectedItems: [],
+      reload: false,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    },
+    clearPreFilter() {
+      this.clientCriteria = null;
+      this.preFilterMode = null;
+      this.reload = !this.reload;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "workorder-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.WorkOrderItemUnit
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.WorkOrderItemUnit
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrderItemUnit
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.WorkOrderItemUnit
+            }
+          });
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders"
+        });
+        break;
+      case "WorkOrderItemList":
+        m.vm.$router.push({
+          name: "svc-workorder-items"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiFan",
+    title: "WorkOrderItemUnitList",
+    helpUrl: "svc-workorders",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.WorkOrderItemUnit
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$ayiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemList",
+    icon: "$ayiWrench",
+    key: FORM_KEY + ":WorkOrderItemList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quote-items.vue b/ayanova/src/views/svc-quote-items.vue
new file mode 100644
index 00000000..d682d8bc
--- /dev/null
+++ b/ayanova/src/views/svc-quote-items.vue
@@ -0,0 +1,289 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="quote-item-list"
+      data-list-key="QuoteItemDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="quoteItemsTable"
+    >
+    </gz-data-table>
+  </div>
+</template>
+
+<script>
+const FORM_KEY = "quote-list";
+export default {
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.QuoteItem,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "quote-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.QuoteItem)
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: { recordid: m.id, ayatype: window.$gz.type.QuoteItem }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.QuoteItem
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: { recordid: res.id, ayatype: window.$gz.type.QuoteItem }
+          });
+        }
+        break;
+      case "QuoteList":
+        m.vm.$router.push({
+          name: "svc-quotes"
+        });
+        break;
+
+      case "WorkOrderItemUnitList":
+        m.vm.$router.push({
+          name: "svc-quote-item-units"
+        });
+        break;
+
+      case "WorkOrderItemScheduledList":
+        m.vm.$router.push({
+          name: "svc-quote-item-scheduled-users"
+        });
+        break;
+
+      case "WorkOrderItemTasks":
+        m.vm.$router.push({
+          name: "svc-quote-item-tasks"
+        });
+        break;
+
+      case "WorkOrderItemPartList":
+        m.vm.$router.push({
+          name: "svc-quote-item-parts"
+        });
+        break;
+
+      case "WorkOrderItemLaborList":
+        m.vm.$router.push({
+          name: "svc-quote-item-labors"
+        });
+        break;
+      case "WorkOrderItemTravelList":
+        m.vm.$router.push({
+          name: "svc-quote-item-travels"
+        });
+        break;
+      case "WorkOrderItemExpenseList":
+        m.vm.$router.push({
+          name: "svc-quote-item-expenses"
+        });
+        break;
+      case "WorkOrderItemLoanList":
+        m.vm.$router.push({
+          name: "svc-quote-item-loans"
+        });
+        break;
+      case "WorkOrderItemOutsideServiceList":
+        m.vm.$router.push({
+          name: "svc-quote-item-outside-services"
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiWrench",
+    title: "WorkOrderItemList",
+    helpUrl: "svc-quotes",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.QuoteItem
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "QuoteList",
+    icon: "$ayiPencilAlt",
+    key: FORM_KEY + ":QuoteList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemUnitList",
+    icon: "$ayiFan",
+    key: FORM_KEY + ":WorkOrderItemUnitList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemScheduledUserList",
+    icon: "$ayiUserClock",
+    key: FORM_KEY + ":WorkOrderItemScheduledList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemTasks",
+    icon: "$ayiTasks",
+    key: FORM_KEY + ":WorkOrderItemTasks",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemPartList",
+    icon: "$ayiBoxes",
+    key: FORM_KEY + ":WorkOrderItemPartList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemLaborList",
+    icon: "$ayiHammer",
+    key: FORM_KEY + ":WorkOrderItemLaborList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemTravelList",
+    icon: "$ayiTruckMonster",
+    key: FORM_KEY + ":WorkOrderItemTravelList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemExpenseList",
+    icon: "$ayiMoneyBillWave",
+    key: FORM_KEY + ":WorkOrderItemExpenseList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemLoanList",
+    icon: "$ayiPlug",
+    key: FORM_KEY + ":WorkOrderItemLoanList",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "WorkOrderItemOutsideServiceList",
+    icon: "$ayiLuggageCart",
+    key: FORM_KEY + ":WorkOrderItemOutsideServiceList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+</script>
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index f6a8f270..4e65d08c 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -198,7 +198,7 @@ async function clickHandler(menuItem) {
           });
         }
         break;
-      case "QuoteItemList":
+      case "WorkOrderItemList":
         m.vm.$router.push({
           name: "svc-quote-items"
         });
@@ -275,9 +275,9 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "QuoteItemList",
+    title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":QuoteItemList",
+    key: FORM_KEY + ":WorkOrderItemList",
     vm: vm
   });