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
Merge remote-tracking branch 'origin/main' into feat/keyboard-nav-polish
aashu6665c876dad2
diff --cc apps/erp/app/components/Layout/Navigation/PrimaryNavigation.tsxindex 6a5c52c44c,00ce3ace2a..0d9731960f--- a/apps/erp/app/components/Layout/Navigation/PrimaryNavigation.tsx+++ b/apps/erp/app/components/Layout/Navigation/PrimaryNavigation.tsx@@@ -53,8 -55,20 +56,26 @@@ import { useNavigationEditMode } from "// accent hover instead of the active-tinted one module links use.const ACTION_HOVER = "hover:bg-accent hover:text-accent-foreground";-const renderLink = (link: Authenticated<NavItem>, isActive: boolean) => (++// Only modules have a g-then-letter key; pass it for those.++const renderLink = (++ link: Authenticated<NavItem>,++ isActive: boolean,++ goToKey?: string++) => (+ <NavRailLink+ key={link.name}+ to={link.to}+ icon={<link.icon />}+ label={link.name}+ tag={link.tag}+ external={link.external}+ isActive={isActive}++ trailing={goToKey ? <GoToHint goToKey={goToKey} /> : undefined}+ />+ );+const PrimaryNavigation = () => {- const { t } = useLingui();+ const { t, i18n } = useLingui();const { isMobile } = useSidebar();const permissions = usePermissions();const location = useOptimisticLocation();diff --cc apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsxindex e853550e29,a6fc68fdac..30ad653763--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsx@@@ -19,13 -19,15 +19,16 @@@ importHeading,HStack,IconButton,+ MENU_ITEM_SHORTCUTS,useDisclosure} from "@carbon/react";- import { formatDate } from "@carbon/utils";+ import { formatDate, isUnaffectedByNavigation } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { LuEllipsisVertical, LuRepeat, LuTrash } from "react-icons/lu";- import type { LoaderFunctionArgs } from "react-router";+ import type {+ LoaderFunctionArgs,+ ShouldRevalidateFunction+ } from "react-router";import {Link,Outlet,diff --cc apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsxindex e31a7a60b2,5a96ea7ead..ce505e15ee--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsx@@@ -20,9 -20,9 +20,10 @@@ importDropdownMenuItem,DropdownMenuSeparator,DropdownMenuTrigger,+ MENU_ITEM_SHORTCUTS,useDisclosure} from "@carbon/react";+ import { isUnaffectedByNavigation } from "@carbon/utils";import { msg } from "@lingui/core/macro";import {LuChevronDown,diff --cc apps/erp/app/routes/x+/workflows+/runs.tsxindex 29f0de0ff8,e1bb0ac1ef..bf033449ec--- a/apps/erp/app/routes/x+/workflows+/runs.tsx+++ b/apps/erp/app/routes/x+/workflows+/runs.tsx@@@ -5,12 -5,13 +5,16 @@@import { requirePermissions } from "@carbon/auth/auth.server";import { requireFeature } from "@carbon/ee/plan.server";import { VStack } from "@carbon/react";- import type { LoaderFunctionArgs } from "react-router";+ import { isUnaffectedByNavigation } from "@carbon/utils";+ import type {+ LoaderFunctionArgs,+ ShouldRevalidateFunction+ } from "react-router";import { Outlet, useLoaderData } from "react-router";-import { getWorkflowRuns } from "~/modules/workflows";+import {+ getWorkflowRunRecordNames,+ getWorkflowRuns+} from "~/modules/workflows";import WorkflowRunsTable from "~/modules/workflows/ui/Runs/WorkflowRunsTable";import { path } from "~/utils/path";import { getGenericQueryFilters } from "~/utils/query";