diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 8d3af35f..20ecaccc 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -405,32 +405,6 @@ function initNavPanel() { }); } - //RESTOCK REQUIRED - if ( - useInventory && - window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest) - ) { - sub.push({ - title: "PurchaseOrderUIRestockList", - icon: "$ayiClipboardList", - route: "/inv-part-restocks", - key: key++ - }); - } - - //PART REQUESTS - if ( - useInventory && - window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest) - ) { - sub.push({ - title: "WorkOrderItemPartRequestList", - icon: "$ayiParachuteBox", - route: "/inv-part-requests", - key: key++ - }); - } - //PART ASSEMBLIES if (window.$gz.role.canOpen(window.$gz.type.PartAssembly)) { sub.push({ diff --git a/ayanova/src/api/translation.js b/ayanova/src/api/translation.js index 8da1153c..35daf767 100644 --- a/ayanova/src/api/translation.js +++ b/ayanova/src/api/translation.js @@ -256,7 +256,7 @@ export default { "Tags", "Tag", "Customize", - "ObjectCustomFieldCustomGrid", + "ObjectCustomFieldCustomGrid", //<---wtf? Is this being used? "RowsPerPage", "PageOfPageText", "Loading", diff --git a/ayanova/src/components/extension-restock-po-control.vue b/ayanova/src/components/extension-restock-po-control.vue deleted file mode 100644 index b7357f21..00000000 --- a/ayanova/src/components/extension-restock-po-control.vue +++ /dev/null @@ -1,145 +0,0 @@ - - diff --git a/ayanova/src/components/extensions-control.vue b/ayanova/src/components/extensions-control.vue index 013f4410..8cbe7610 100644 --- a/ayanova/src/components/extensions-control.vue +++ b/ayanova/src/components/extensions-control.vue @@ -28,7 +28,6 @@ @ext-show-job-log="handleError($event)" :data-list-selection="dataListSelection" /> - @@ -43,13 +42,12 @@ import ExtensionTags from "./extension-tags-control.vue"; import ExtensionExport from "./extension-export-control.vue"; import ExtensionDelete from "./extension-delete-control.vue"; -import ExtensionRestockPo from "./extension-restock-po-control.vue"; + export default { components: { ExtensionTags, ExtensionExport, - ExtensionDelete, - ExtensionRestockPo + ExtensionDelete }, async created() { await initForm(this); diff --git a/ayanova/src/router.js b/ayanova/src/router.js index 529585bd..3e492502 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -454,18 +454,18 @@ export default new Router({ component: () => import(/* webpackChunkName: "inv" */ "./views/inv-part-adjustment.vue") }, - { - path: "/inv-part-requests", - name: "inv-part-requests", - component: () => - import(/* webpackChunkName: "inv" */ "./views/inv-part-requests.vue") - }, - { - path: "/inv-part-restocks", - name: "inv-part-restocks", - component: () => - import(/* webpackChunkName: "inv" */ "./views/inv-part-restocks.vue") - }, + // { + // path: "/inv-part-requests", + // name: "inv-part-requests", + // component: () => + // import(/* webpackChunkName: "inv" */ "./views/inv-part-requests.vue") + // }, + // { + // path: "/inv-part-restocks", + // name: "inv-part-restocks", + // component: () => + // import(/* webpackChunkName: "inv" */ "./views/inv-part-restocks.vue") + // }, { path: "/inv-purchase-orders", diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue deleted file mode 100644 index 0979a9ef..00000000 --- a/ayanova/src/views/inv-part-requests.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/ayanova/src/views/inv-part-restocks.vue b/ayanova/src/views/inv-part-restocks.vue deleted file mode 100644 index 68a00829..00000000 --- a/ayanova/src/views/inv-part-restocks.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue index 8ebc4038..bd929f10 100644 --- a/ayanova/src/views/inv-purchase-order.vue +++ b/ayanova/src/views/inv-purchase-order.vue @@ -1383,6 +1383,14 @@ async function clickHandler(menuItem) { } break; + case "restocklist": + alert("stub: restocklist"); + break; + + case "requestlist": + alert("under construction: MIGRATE_OUTSTANDING workorderitempartrequest"); + break; + default: window.$gz.eventBus.$emit( "notify-warning", @@ -1469,6 +1477,24 @@ function generateMenu(vm) { }); } + if (vm.rights.change) { + menuOptions.menuItems.push({ divider: true, inset: false }); + + menuOptions.menuItems.push({ + title: "PurchaseOrderUIRestockList", + icon: "$ayiClipboardList", + key: FORM_KEY + ":restocklist", + vm: vm + }); + + //MIGRATE_OUTSTANDING workorderitempartrequest awaiting + menuOptions.menuItems.push({ + title: "WorkOrderItemPartRequestList", + icon: "$ayiParachuteBox", + key: FORM_KEY + ":requestlist", + vm: vm + }); + } menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); @@ -1538,6 +1564,8 @@ async function fetchTranslatedText(vm) { "Receive", "JobCompleted", "ConfirmUpdatePartCost", + "PurchaseOrderUIRestockList", + "WorkOrderItemPartRequestList", "PurchaseOrderCustom1", "PurchaseOrderCustom2", "PurchaseOrderCustom3", @@ -1609,5 +1637,35 @@ async function fetchTranslatedText(vm) { hasVendorNumber: true, hasUnreceived: true } - };*/ + }; + + + + //RESTOCK REQUIRED + if ( + useInventory && + window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest) + ) { + sub.push({ + title: "PurchaseOrderUIRestockList", + icon: "$ayiClipboardList", + route: "/inv-part-restocks", + key: key++ + }); + } + + //PART REQUESTS + if ( + useInventory && + window.$gz.role.canOpen(window.$gz.type.WorkOrderItemPartRequest) + ) { + sub.push({ + title: "WorkOrderItemPartRequestList", + icon: "$ayiParachuteBox", + route: "/inv-part-requests", + key: key++ + }); + } + + */