Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
feat(purchasing): link RFQ lines to the item master (#1812)
Brad Barbin42f45fa38895
diff --git a/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQExplorer.tsx b/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQExplorer.tsxindex a5d332232e..f2d47be647 100644--- a/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQExplorer.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQExplorer.tsx@@ -30,7 +30,7 @@ import {LuTrash} from "react-icons/lu";import { Link, useParams } from "react-router";-import { Empty, ItemThumbnail } from "~/components";+import { Empty, ItemThumbnail, MethodItemTypeIcon } from "~/components";import type { DragHandleBindings } from "~/components/LineReorder";import {ReorderableLineList,@@ -39,7 +39,9 @@ import {useLineOrderEditMode} from "~/components/LineReorder";import { usePermissions, useRouteData } from "~/hooks";-import type { MethodItemType } from "~/modules/shared";+import { getLinkToItemDetails } from "~/modules/items/ui/Item/ItemForm";+import type { ItemType, MethodItemType } from "~/modules/shared";+import { itemType } from "~/modules/shared";import { EXPLORER_SHORTCUTS } from "~/shortcuts";import { path } from "~/utils/path";import { isRfqLocked } from "../../purchasing.models";@@ -317,6 +319,30 @@ function PurchasingRFQLineItem({<DropdownMenuIcon icon={<LuTrash />} /><Trans>Delete Line</Trans></DropdownMenuItem>+ {line.itemId &&+ itemType.includes(line.itemType as ItemType) && (+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.view}+ asChild+ onClick={(e) => e.stopPropagation()}+ >+ <Link+ to={getLinkToItemDetails(+ line.itemType as ItemType,+ line.itemId+ )}+ >+ <DropdownMenuIcon+ icon={+ <MethodItemTypeIcon+ type={line.itemType as ItemType}+ />+ }+ />+ <Trans>View Item Master</Trans>+ </Link>+ </DropdownMenuItem>+ )}</DropdownMenuContent></DropdownMenu></div>diff --git a/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsx b/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsxindex c98585c870..b61dfbb0c0 100644--- a/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsx@@ -31,8 +31,9 @@ import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";import { BsThreeDotsVertical } from "react-icons/bs";import { LuTrash } from "react-icons/lu";-import { useParams } from "react-router";+import { Link, useParams } from "react-router";import type { z } from "zod";+import { MethodItemTypeIcon } from "~/components";import {ArrayNumeric,ConversionFactor,@@ -44,6 +45,8 @@ import {UnitOfMeasure} from "~/components/Form";import { usePermissions, useRouteData, useUser } from "~/hooks";+import { getLinkToItemDetails } from "~/modules/items/ui/Item/ItemForm";+import { itemType as itemTypes } from "~/modules/shared";import type { ItemType } from "~/modules/shared/types";import { path } from "~/utils/path";import {@@ -132,6 +135,8 @@ const PurchasingRFQLineForm = ({};const deleteDisclosure = useDisclosure();+ const canDelete = !isLocked && permissions.can("update", "purchasing");+ const canViewItem = !!itemData.itemId && itemTypes.includes(itemType);return (<>@@ -179,30 +184,49 @@ const PurchasingRFQLineForm = ({)}</ModalCardDescription></ModalCardHeader>- {isEditing &&- !isLocked &&- permissions.can("update", "purchasing") && (- <CardAction className="pr-12">- <DropdownMenu>- <DropdownMenuTrigger asChild>- <IconButton- icon={<BsThreeDotsVertical />}- aria-label={t`More`}- variant="ghost"- />- </DropdownMenuTrigger>- <DropdownMenuContent align="end">+ {isEditing && (canDelete || canViewItem) && (+ <CardAction className="pr-12">+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <IconButton+ icon={<BsThreeDotsVertical />}+ aria-label={t`More`}+ variant="ghost"+ />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ {canDelete && (<DropdownMenuItemshortcut={MENU_ITEM_SHORTCUTS.delete}+ destructiveonClick={deleteDisclosure.onOpen}><DropdownMenuIcon icon={<LuTrash />} /><Trans>Delete Line</Trans></DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </CardAction>- )}+ )}+ {canViewItem && (+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.view}+ asChild+ >+ <Link+ to={getLinkToItemDetails(+ itemType,+ itemData.itemId+ )}+ >+ <DropdownMenuIcon+ icon={<MethodItemTypeIcon type={itemType} />}+ />+ <Trans>View Item Master</Trans>+ </Link>+ </DropdownMenuItem>+ )}+ </DropdownMenuContent>+ </DropdownMenu>+ </CardAction>+ )}</HStack><ModalCardBody><Hidden name="id" />