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(ui): tooltip on Capitalize as Fixed Asset, fleet hint above empty units (#1863)
Brad Barbinaccc6ddf24a8
diff --git a/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsx b/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsxindex 94f112258b..eeb4957d12 100644--- a/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsx+++ b/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsx@@ -31,6 +31,9 @@ import {ModalHeader,ModalTitle,Input as SearchInput,+ Tooltip,+ TooltipContent,+ TooltipTrigger,toast,useDisclosure,VStack@@ -400,15 +403,21 @@ const InventoryStorageUnits = ({)}{/* A fixed asset is one serialized unit; a batch row is many. */}{item.trackedEntityId && isSerial && canCapitalize && (- <Link to={capitalizeHref(item)}>- <IconButton- aria-label={t`Capitalize as Fixed Asset`}- title={t`Capitalize as Fixed Asset`}- variant="ghost"- size="sm"- icon={<LuBuilding2 />}- />- </Link>+ <Tooltip>+ <TooltipTrigger asChild>+ <Link to={capitalizeHref(item)}>+ <IconButton+ aria-label={t`Capitalize as Fixed Asset`}+ variant="ghost"+ size="sm"+ icon={<LuBuilding2 />}+ />+ </Link>+ </TooltipTrigger>+ <TooltipContent>+ <Trans>Capitalize as Fixed Asset</Trans>+ </TooltipContent>+ </Tooltip>)}<IconButtonaria-label={t`Update Quantity`}diff --git a/apps/erp/app/modules/sales/ui/Rentals/RentalUnitsGrid.tsx b/apps/erp/app/modules/sales/ui/Rentals/RentalUnitsGrid.tsxindex eddfed5b16..bf4950dd9c 100644--- a/apps/erp/app/modules/sales/ui/Rentals/RentalUnitsGrid.tsx+++ b/apps/erp/app/modules/sales/ui/Rentals/RentalUnitsGrid.tsx@@ -215,14 +215,10 @@ const RentalUnitsGrid = ({);const canAdd = permissions.can("create", "sales");- const noUnitsAvailable = rentableAssets.length === 0 && (- <div className="w-full max-w-2xl text-left">- <FleetUnitsHint />- </div>- );return (<div className="flex w-full flex-col gap-4">+ {rows.length === 0 && rentableAssets.length === 0 && <FleetUnitsHint />}{rows.length === 0 ? (<div className="flex w-full flex-col items-center justify-center gap-3 rounded-lg border border-dashed border-border px-6 py-16 text-center"><p className="text-sm text-muted-foreground">@@ -237,7 +233,6 @@ const RentalUnitsGrid = ({><Trans>Add Units</Trans></Button>- {noUnitsAvailable}</div>) : (<>@@ -267,18 +262,15 @@ const RentalUnitsGrid = ({sort={null}/></div>- <div className="flex flex-col gap-2">- <div>- <Button- variant="secondary"- leftIcon={<LuPlus />}- isDisabled={!canAdd || rentableAssets.length === 0}- onClick={addUnits.onOpen}- >- <Trans>Add Units</Trans>- </Button>- </div>- {noUnitsAvailable}+ <div>+ <Button+ variant="secondary"+ leftIcon={<LuPlus />}+ isDisabled={!canAdd || rentableAssets.length === 0}+ onClick={addUnits.onOpen}+ >+ <Trans>Add Units</Trans>+ </Button></div></>)}