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/mobile-redesign
aashu25890932aeba
diff --cc apps/erp/app/components/Assignee.tsxindex 20569c5703,08ba5486ad..3f076d45a3--- a/apps/erp/app/components/Assignee.tsx+++ b/apps/erp/app/components/Assignee.tsx@@@ -43,9 -43,10 +43,13 @@@ export type AssigneeProps = Omitplaceholder?: string;variant?: AssigneeVariants;onChange?: (selected: string) => void;+ /** Controlled picker state. Omit both to let the trigger open it. */+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+ /** Saves the choice through the caller instead of the generic assign+ * route — for a record whose assignment has rules of its own (a planning+ * action marks a hand-set assignee so MRP never re-resolves it). */+ onAssign?: (selected: string) => void;};const Assign = forwardRef<HTMLButtonElement, AssigneeProps>(@@@ -59,8 -60,7 +63,9 @@@placeholder,variant = "button",onChange,+ open: controlledOpen,+ onOpenChange,+ onAssign,className,...props},diff --cc apps/erp/app/components/DocumentPage/DocumentPage.tsxindex 0000000000,dd63c7497e..a2d24d5924mode 000000,100644..100644--- a/apps/erp/app/components/DocumentPage/DocumentPage.tsx+++ b/apps/erp/app/components/DocumentPage/DocumentPage.tsx@@@ -1,0 -1,154 +1,154 @@@+ // SPDX-License-Identifier: AGPL-3.0-only+ // Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+ // including ports, remain AGPLv3; serving them over a network requires releasing their source.++ import {+ Drawer,+ DrawerContent,+ DrawerTitle,+ ResizableHandle,- useIsMobile++ useViewport+ } from "@carbon/react";+ import { Trans } from "@lingui/react/macro";+ import type { ReactNode } from "react";+ import { createContext, useContext, useRef, useState } from "react";+ import type { ImperativePanelHandle } from "react-resizable-panels";+ import { Panel, PanelGroup } from "react-resizable-panels";++ type DocumentPageContextType = {+ hasSidebar: boolean;+ isSidebarOpen: boolean;+ toggleSidebar: () => void;+ };++ const DocumentPageContext = createContext<DocumentPageContextType>({+ hasSidebar: false,+ isSidebarOpen: false,+ // biome-ignore lint/suspicious/noEmptyBlockStatements: no-op outside a DocumentPage+ toggleSidebar: () => {}+ });++ export function useDocumentPage() {+ return useContext(DocumentPageContext);+ }++ type DocumentPageProps = {+ /** Identity, status and actions — usually a `DocumentPageHeader`. Pinned. */+ header: ReactNode;+ /** The work: details, lines, notes. Scrolls under the header. */+ children: ReactNode;+ /** Related documents and activity — usually a `DocumentSidebar`. */+ sidebar?: ReactNode;+ };++ const SIDEBAR_PANEL_ID = "document-page-sidebar";++ /**+ * The layout for documents that are filled in and then posted — shipments,+ * receipts, transfers, journal entries. One readable column for the work, and+ * a resizable, collapsible side panel for what surrounds it. The panel's size+ * and collapsed state are shared by every document that uses this layout.+ */+ export function DocumentPage({ header, children, sidebar }: DocumentPageProps) {- const isMobile = useIsMobile();++ const { isPhone: isMobile } = useViewport();+ const sidebarRef = useRef<ImperativePanelHandle>(null);+ // Desktop: mirrors the panel, which restores its own saved layout and+ // reports back through onCollapse / onExpand. Mobile: the drawer, closed+ // until asked for.+ const [isSidebarOpen, setIsSidebarOpen] = useState(true);+ const [isDrawerOpen, setIsDrawerOpen] = useState(false);++ const hasSidebar = Boolean(sidebar);++ const toggleSidebar = () => {+ if (isMobile) {+ setIsDrawerOpen((open) => !open);+ return;+ }+ const panel = sidebarRef.current;+ if (!panel) return;+ if (panel.isCollapsed()) panel.expand();+ else panel.collapse();+ };++ const context = {+ hasSidebar,+ isSidebarOpen: isMobile ? isDrawerOpen : isSidebarOpen,+ toggleSidebar+ };++ const content = (+ <div className="h-[calc(100dvh-var(--topbar-height)-var(--content-inset))] w-full overflow-y-auto scrollbar-hide">+ {header}+ <div className="@container w-full max-w-5xl mx-auto px-4 md:px-8 pb-16">+ <div className="flex flex-col gap-4 w-full">{children}</div>+ </div>+ </div>+ );++ const showPanel = hasSidebar && !isMobile;++ // One tree for every case, the content panel always in the same place, so+ // crossing the mobile breakpoint never remounts the form underneath (and+ // its unsaved state). The group is `react-resizable-panels` itself rather+ // than the `@carbon/react` wrapper: the wrapper renders nothing on the+ // server, and the page's content has to be in the server HTML.+ return (+ <DocumentPageContext.Provider value={context}>+ <PanelGroup+ direction="horizontal"+ autoSaveId={showPanel ? "document-page" : undefined}+ className="flex h-full w-full"+ >+ <Panel+ id="document-page-content"+ order={1}+ defaultSize={showPanel ? 70 : 100}+ minSize={40}+ >+ {content}+ </Panel>+ {showPanel && (+ <>+ <ResizableHandle withHandle />+ <Panel+ ref={sidebarRef}+ id={SIDEBAR_PANEL_ID}+ order={2}+ defaultSize={30}+ minSize={20}+ maxSize={50}+ collapsible+ collapsedSize={0}+ onCollapse={() => setIsSidebarOpen(false)}+ onExpand={() => setIsSidebarOpen(true)}+ className="bg-background/30"+ >+ {isSidebarOpen && (+ <div className="flex h-[calc(100dvh-var(--topbar-height)-var(--content-inset))] flex-col overflow-hidden">+ {sidebar}+ </div>+ )}+ </Panel>+ </>+ )}+ </PanelGroup>+ {hasSidebar && isMobile && (+ <Drawer open={isDrawerOpen} onOpenChange={setIsDrawerOpen}>+ <DrawerContent+ position="right"+ size="content"+ className="w-[24rem] max-w-[90vw] p-0"+ >+ <DrawerTitle className="sr-only">+ <Trans>Documents and activity</Trans>+ </DrawerTitle>+ <div className="flex flex-1 min-h-0 flex-col overflow-hidden">+ {sidebar}+ </div>+ </DrawerContent>+ </Drawer>+ )}+ </DocumentPageContext.Provider>+ );+ }diff --cc apps/erp/app/components/DocumentPage/DocumentPageHeader.tsxindex 0000000000,52a225deb3..22d54c08e8mode 000000,100644..100644--- a/apps/erp/app/components/DocumentPage/DocumentPageHeader.tsx+++ b/apps/erp/app/components/DocumentPage/DocumentPageHeader.tsx@@@ -1,0 -1,137 +1,172 @@@+ // SPDX-License-Identifier: AGPL-3.0-only+ // Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+ // including ports, remain AGPLv3; serving them over a network requires releasing their source.++ import {+ Copy,+ cn,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuTrigger,+ Heading,- IconButton++ IconButton,++ useViewport+ } from "@carbon/react";+ import { useLingui } from "@lingui/react/macro";+ import type { ReactNode } from "react";+ import { Children, useEffect, useRef, useState } from "react";+ import { LuEllipsisVertical, LuPanelRight } from "react-icons/lu";++import { BottomBar } from "../Layout/Mobile/ChromeSlots";++import { RecordPhoneChrome } from "../Layout/RecordHeader";+ import { useDocumentPage } from "./DocumentPage";++ type DocumentPageHeaderProps = {+ /** The readable id — shown, copyable. */+ title: string;+ status?: ReactNode;+ /** ⋯ menu contents: secondary and destructive actions. */+ menuItems?: ReactNode;+ /** Outputs, then the lifecycle step — the next step is the one primary. */+ actions?: ReactNode;+ /** Short facts under the title, joined with a middot. */+ meta?: ReactNode;+ };++ /**+ * The flat header of a `DocumentPage`: identity left, actions right, a line+ * of facts underneath. It is pinned, and draws its bottom rule only once the- * content has scrolled under it.++ * content has scrolled under it. Phones: the ⋯ menu and Copy ID move to the++ * app bar and the actions to the bottom bar, as on every record page.+ */+ export function DocumentPageHeader({+ title,+ status,+ menuItems,+ actions,+ meta+ }: DocumentPageHeaderProps) {+ const { t } = useLingui();++ const { isPhone } = useViewport();+ const { hasSidebar, isSidebarOpen, toggleSidebar } = useDocumentPage();+ const sentinelRef = useRef<HTMLDivElement>(null);+ const [isStuck, setIsStuck] = useState(false);++ useEffect(() => {+ const sentinel = sentinelRef.current;+ if (!sentinel) return;+ const observer = new IntersectionObserver(([entry]) =>+ setIsStuck(!entry.isIntersecting)+ );+ observer.observe(sentinel);+ return () => observer.disconnect();+ }, []);++ const metaItems = Children.toArray(meta);++ const metaLine =++ metaItems.length > 0 ? (++ <div className="text-sm text-muted-foreground flex flex-wrap items-center gap-x-1.5 gap-y-1">++ {metaItems.map((item, index) => (++ // The separator leads its item, so a wrap never strands it++ // at the end of a line.++ <span key={index} className="inline-flex items-center gap-1">++ {index > 0 && (++ <span aria-hidden className="mr-0.5">++ ·++ </span>++ )}++ {item}++ </span>++ ))}++ </div>++ ) : null;++++ const sidebarToggle = hasSidebar ? (++ <IconButton++ aria-label={++ isSidebarOpen++ ? t`Hide documents and activity`++ : t`Show documents and activity`++ }++ icon={<LuPanelRight />}++ variant="ghost"++ aria-expanded={isSidebarOpen}++ onClick={toggleSidebar}++ />++ ) : null;++++ if (isPhone) {++ return (++ <>++ <RecordPhoneChrome menu={menuItems} copyValue={title} />++ {status || metaLine || sidebarToggle ? (++ <header className="flex flex-col gap-1.5 border-b border-border bg-card px-4 py-3">++ <div className="flex min-h-11 items-center justify-between gap-2">++ <div className="flex min-w-0 flex-wrap items-center gap-1.5">++ {status}++ </div>++ {sidebarToggle}++ </div>++ {metaLine}++ </header>++ ) : null}++ {actions ? (++ <BottomBar>++ <div className="flex items-center gap-2 border-t border-border bg-card px-4 pt-2 pb-safe-4 [&>*]:min-w-0 [&>*]:flex-1">++ {actions}++ </div>++ </BottomBar>++ ) : null}++ </>++ );++ }++ return (+ <>+ <div ref={sentinelRef} className="h-px" aria-hidden />+ <header+ className={cn(+ "sticky top-0 z-10 bg-card border-b transition-colors",+ isStuck ? "border-border" : "border-transparent"+ )}+ >+ <div className="flex flex-col gap-1 w-full max-w-5xl mx-auto px-4 md:px-8 pt-5 pb-4">+ <div className="flex items-center justify-between gap-x-4 gap-y-2 flex-wrap">+ <div className="flex items-center gap-2 min-w-0">+ <Heading+ as="h1"+ size="h2"+ className="min-w-0 whitespace-nowrap truncate"+ >+ {title}+ </Heading>+ <Copy text={title} />+ {menuItems && (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <IconButton+ aria-label={t`More options`}+ icon={<LuEllipsisVertical />}+ variant="secondary"+ size="sm"+ />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start">+ {menuItems}+ </DropdownMenuContent>+ </DropdownMenu>+ )}+ {status && (+ <div className="flex items-center gap-1 shrink-0">{status}</div>+ )}+ </div>+ <div className="flex items-center gap-2 shrink-0">+ {actions}- {hasSidebar && (- <IconButton- aria-label={- isSidebarOpen- ? t`Hide documents and activity`- : t`Show documents and activity`- }- icon={<LuPanelRight />}- variant="ghost"- aria-expanded={isSidebarOpen}- onClick={toggleSidebar}- />- )}++ {sidebarToggle}+ </div>+ </div>- {metaItems.length > 0 && (- <div className="text-sm text-muted-foreground flex flex-wrap items-center gap-x-1.5 gap-y-1">- {metaItems.map((item, index) => (- // The separator leads its item, so a wrap never strands it- // at the end of a line.- <span key={index} className="inline-flex items-center gap-1">- {index > 0 && (- <span aria-hidden className="mr-0.5">- ·- </span>- )}- {item}- </span>- ))}- </div>- )}++ {metaLine}+ </div>+ </header>+ </>+ );+ }diff --cc apps/erp/app/components/Grid/Grid.tsxindex 9a7843e6b4,eb6d5ae4ba..ce44d8cb3d--- a/apps/erp/app/components/Grid/Grid.tsx+++ b/apps/erp/app/components/Grid/Grid.tsx@@@ -342,13 -381,124 +381,124 @@@ const Grid = <T extends object>(const rows = table.getRowModel().rows;+ /* Row virtualization (only with `maxHeight`) */+ const isVirtual = maxHeight !== undefined;++ // The selected row stays rendered when it scrolls out of view: it holds the+ // keyboard focus and, mid-edit, the open editor. Dropping it would lose both.+ const selectedRow = selectedCell?.row;+ const rangeExtractor = useCallback(+ (range: Range) => {+ const indexes = defaultRangeExtractor(range);+ if (+ selectedRow === undefined ||+ selectedRow >= range.count ||+ indexes.includes(selectedRow)+ ) {+ return indexes;+ }+ return [...indexes, selectedRow].sort((a, b) => a - b);+ },+ [selectedRow]+ );++ const rowVirtualizer = useVirtualizer({+ enabled: isVirtual,+ count: rows.length,+ getScrollElement: () => tableContainerRef.current,+ getItemKey: (index) => rows[index]?.id ?? index,+ estimateSize: () => ESTIMATED_ROW_HEIGHT,+ overscan: OVERSCAN,+ scrollMargin: HEADER_HEIGHT,+ rangeExtractor,+ // The scroller is not measured until after the first render; without this+ // that render would draw no rows at all.+ initialRect: { width: 0, height: maxHeight ?? 0 }+ });++ const renderRow = (row: (typeof rows)[number], virtualIndex?: number) => (+ <Row+ key={row.id}+ editableComponents={+ canEdit && (isRowEditable?.(row.original) ?? true)+ ? editableComponents+ : {}+ }+ isEditing={isEditing}+ selectedCell={selectedCell}+ row={row}+ rowIsSelected={selectedCell?.row === row.index}+ rowRef={isVirtual ? rowVirtualizer.measureElement : undefined}+ virtualIndex={virtualIndex}+ withRowBorder={isVirtual}+ onCellClick={onCellClick}+ onCellUpdate={onCellUpdate}+ onEditRow={onEditRow}+ />+ );++ // The rows in view, with an empty row standing in for each run of rows that+ // is not rendered, so the scrollbar and every row's position stay true.+ const renderVirtualRows = () => {+ const columnCount = table.getVisibleLeafColumns().length;+ const spacer = (key: string, height: number) => (+ <tr key={key} aria-hidden>+ <td colSpan={columnCount} style={{ height, padding: 0 }} />+ </tr>+ );++ const rendered: ReactNode[] = [];+ let offset = 0;+ for (const item of rowVirtualizer.getVirtualItems()) {+ const row = rows[item.index];+ if (!row) continue;+ const start = item.start - HEADER_HEIGHT;+ if (start > offset) {+ rendered.push(spacer(`before-${item.index}`, start - offset));+ }+ rendered.push(renderRow(row, item.index));+ offset = item.end - HEADER_HEIGHT;+ }+ const totalSize = rowVirtualizer.getTotalSize();+ if (totalSize > offset) rendered.push(spacer("after", totalSize - offset));+ return rendered;+ };++ // In a virtualized grid "New" sits under the scroller, always in view, so+ // adding a row never means scrolling to the end of a long list first. The+ // added row lands at the end, out of view, so the grid scrolls to it.+ const awaitedRowCount = useRef<number | null>(null);+ const onNewRowClick = () => {+ awaitedRowCount.current = rows.length + 1;+ onNewRow?.();+ };+ useEffect(() => {+ const awaited = awaitedRowCount.current;+ awaitedRowCount.current = null;+ if (awaited === rows.length) {+ rowVirtualizer.scrollToIndex(rows.length - 1, { align: "end" });+ }+ }, [rows.length, rowVirtualizer]);+return (- <VStack spacing={0} className="h-full w-full">+ <VStack+ spacing={0}+ className={cn(+ "h-full w-full",+ // The frame the table's own wrapper would otherwise draw: here it has+ // to go around the scroller and the "New" button under it.+ isVirtual && !contained && "overflow-hidden rounded-md border"+ )}+ ><divclassName={cn(- "w-full h-full overflow-x-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent",+ "w-full h-full overflow-x-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent max-md:scroll-fade-x",- contained ? "" : "relative"+ contained ? "" : "relative",+ isVirtual && "overflow-y-auto")}+ style={+ isVirtual ? { maxHeight, scrollPaddingTop: HEADER_HEIGHT } : undefined+ }ref={tableContainerRef}onKeyDown={onKeyDown}>diff --cc apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsxindex 407fbed452,d2e23892bf..8cca7a5723--- a/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsx+++ b/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsx@@@ -16,8 -24,10 +16,9 @@@ importimport { LuPanelLeft } from "react-icons/lu";import type { Location } from "react-router";import { useLocation, useMatches, useNavigation } from "react-router";-import { useOptimisticLocation } from "~/hooks";import { useUIStore } from "~/stores/ui";import type { Handle } from "~/utils/handle";+ import { useSlidingHoverCard } from "./useSlidingHoverCard";interface CollapsibleSidebarContextValue {hasSidebar: boolean;diff --cc apps/erp/app/components/Layout/Navigation/DetailsTopbar.tsxindex ce4b57be87,00a7aa4124..4ee2ef1049--- a/apps/erp/app/components/Layout/Navigation/DetailsTopbar.tsx+++ b/apps/erp/app/components/Layout/Navigation/DetailsTopbar.tsx@@@ -19,9 -18,7 +19,10 @@@ import { useMemo } from "react"import type { IconType } from "react-icons";import { useNavigate } from "react-router";import { useOptimisticLocation, useUrlParams } from "~/hooks";+import type { CompactTabItem } from "../CompactTabRow";+import { CompactTabRow } from "../CompactTabRow";+import { recordFrameSlot, recordTabsSlot } from "../Panels";+ import { useSlidingHoverCard } from "./useSlidingHoverCard";type DetailTopbarProps = {links: {@@@ -67,44 -68,17 +72,53 @@@ const DetailTopbar = ());+ // Phones: inside a record frame the links join its one tab row; elsewhere+ // they render here as a scrolling underline row.+ const { isPhone } = useViewport();+ const paramString = params.toString();+ // `links` is a new array on every render: keyed on what the tabs show.+ const itemsKey = links+ .map((link) => {+ const active = link.isActive+ ? link.isActive(location.pathname)+ : location.pathname.includes(link.to);+ return `${link.name}|${link.to}|${link.count}|${active}`;+ })+ .join(",");+ // biome-ignore lint/correctness/useExhaustiveDependencies: keyed on itemsKey+ const items = useMemo<CompactTabItem[]>(+ () =>+ links.map((route) => ({+ id: route.to,+ label: route.name,+ to: preserveParams ? `${route.to}?${paramString}` : route.to,+ count: route.count,+ active: route.isActive+ ? route.isActive(location.pathname)+ : location.pathname.includes(route.to)+ })),+ [itemsKey, preserveParams, paramString]+ );+ recordTabsSlot.useProvide(isPhone ? items : null);+ const inRecordFrame = recordFrameSlot.useValue() !== null;++ if (isPhone) {+ return inRecordFrame ? null : (+ <CompactTabRow className="w-full min-w-0 shrink" items={items} />+ );+ }+return (- <div className="inline-flex h-9 items-center justify-center rounded-[0.5rem] bg-muted p-1 text-muted-foreground shadow-[inset_0_1px_2px_rgba(0,0,0,0.15)] border-b border-border">+ <div+ ref={containerRef}+ className="relative inline-flex items-center justify-center rounded-[0.5rem] bg-muted p-0.5 text-muted-foreground border border-border"+ {...handlers}+ >+ <span+ ref={cardRef}+ aria-hidden+ className="pointer-events-none absolute left-0 top-0 rounded-[6px] bg-active opacity-0 transition-[transform,width,opacity] duration-150 ease-[cubic-bezier(0.23,1,0.32,1)] motion-reduce:transition-none"+ />{links.map((route) => {const isActive = route.isActive? route.isActive(location.pathname)diff --cc apps/erp/app/components/Table/Table.tsxindex 40d968dede,3a30e7897e..ec81a1bcbf--- a/apps/erp/app/components/Table/Table.tsx+++ b/apps/erp/app/components/Table/Table.tsx@@@ -318,10 -315,9 +324,11 @@@ const Table = <T extends object>(renderActions,renderContextMenu,renderExpandedRow,+ pinExpandedRows = false,canExpandRow,- groupRowsBy+ groupRowsBy,+ mobileLayout = "list",+ mobileMenuItems}: TableProps<T>) => {const { t } = useLingui();const tableContainerRef = useRef<HTMLDivElement>(null);diff --cc apps/erp/app/modules/accounting/ui/FixedAssets/DepreciationRunTable.tsxindex 6c0ff3241b,8d56d768bb..70149f29f7--- a/apps/erp/app/modules/accounting/ui/FixedAssets/DepreciationRunTable.tsx+++ b/apps/erp/app/modules/accounting/ui/FixedAssets/DepreciationRunTable.tsx@@@ -58,7 -57,9 +58,10 @@@ const DepreciationRunTable = memo<DateTime value={row.original.periodEnd} variant="date" />),meta: {+ mobile: "P3",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/accounting/ui/FixedAssets/FixedAssetsTable.tsxindex 0298bf59ca,ddfe220746..1e16055cac--- a/apps/erp/app/modules/accounting/ui/FixedAssets/FixedAssetsTable.tsx+++ b/apps/erp/app/modules/accounting/ui/FixedAssets/FixedAssetsTable.tsx@@@ -97,10 -98,9 +100,10 @@@ const FixedAssetsTable = memo/>),meta: {+ mobile: "P2",filter: {type: "static",- options: fixedAssetStatuses.map((v) => ({+ options: visibleFixedAssetStatuses.map((v) => ({label: <FixedAssetStatus status={v} />,value: v}))diff --cc apps/erp/app/modules/accounting/ui/JournalEntries/JournalLineRow.tsxindex 462698783d,bb193b57ff..dab127375e--- a/apps/erp/app/modules/accounting/ui/JournalEntries/JournalLineRow.tsx+++ b/apps/erp/app/modules/accounting/ui/JournalEntries/JournalLineRow.tsx@@@ -105,38 -141,49 +141,49 @@@ const JournalLineRow = (</div>{/* Debit */}- <NumberField- className="max-md:col-start-2"- value={line.debit ?? 0}- onChange={handleDebitChange}- formatOptions={INPUT_FORMAT.rate(currencyCode, currencyDecimals)}- minValue={0}- isDisabled={isDisabled}- isReadOnly={isDisabled}- >- <NumberInput- className="text-right font-mono tabular-nums max-md:px-3"+ <div className={journalLineCell.debit}>+ <div className={journalLineCell.narrowLabel}>+ <Trans>Debit</Trans>+ </div>+ <NumberField+ value={line.debit ?? 0}+ onChange={handleDebitChange}+ formatOptions={INPUT_FORMAT.rate(currencyCode, currencyDecimals)}+ minValue={0}+ isDisabled={isDisabled}isReadOnly={isDisabled}- />- </NumberField>+ >+ <NumberInput- className="text-right font-mono tabular-nums"++ className="text-right font-mono tabular-nums max-md:px-3"+ isReadOnly={isDisabled}+ />+ </NumberField>+ </div>{/* Credit */}- <NumberField- value={line.credit ?? 0}- onChange={handleCreditChange}- formatOptions={INPUT_FORMAT.rate(currencyCode, currencyDecimals)}- minValue={0}- isDisabled={isDisabled}- isReadOnly={isDisabled}- >- <NumberInput- className="text-right font-mono tabular-nums max-md:px-3"+ <div className={journalLineCell.credit}>+ <div className={journalLineCell.narrowLabel}>+ <Trans>Credit</Trans>+ </div>+ <NumberField+ value={line.credit ?? 0}+ onChange={handleCreditChange}+ formatOptions={INPUT_FORMAT.rate(currencyCode, currencyDecimals)}+ minValue={0}+ isDisabled={isDisabled}isReadOnly={isDisabled}- />- </NumberField>+ >+ <NumberInput- className="text-right font-mono tabular-nums"++ className="text-right font-mono tabular-nums max-md:px-3"+ isReadOnly={isDisabled}+ />+ </NumberField>+ </div>{/* Delete button */}- <div className="flex h-9 items-center justify-center">+ <div+ className={`${journalLineCell.actions} flex h-9 items-center justify-center`}+ >{!isDisabled && (<IconButtonaria-label={t`Delete line`}diff --cc apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsxindex 0210ca48d3,94f112258b..1aabde6e60--- a/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsx+++ b/apps/erp/app/modules/inventory/ui/Inventory/InventoryStorageUnits.tsx@@@ -66,8 -57,7 +57,8 @@@ import { Input, Location, Select, TextAimport ScrapReason from "~/components/Form/ScrapReason";import StorageUnit from "~/components/Form/StorageUnit";import { useUnitOfMeasure } from "~/components/Form/UnitOfMeasure";+import { BottomBar } from "~/components/Layout/Mobile/ChromeSlots";- import { usePermissions, usePrinting } from "~/hooks";+ import { usePermissions, usePrinting, useQuantityFormatter } from "~/hooks";import type {ItemStorageUnitQuantities,itemTrackingTypes,@@@ -87,8 -77,6 +78,8 @@@ type InventoryStorageUnitsProps =} | null;trackedEntityExpirations: Record<string, string | null>;storageUnits: { value: string; label: string }[];- /** The inventory quantities page: phones show rows and a bottom bar. */++ /** The inventory quantities page: phones show a bottom bar. */+ variant?: "quantity";};const InventoryStorageUnits = ({@@@ -103,9 -90,6 +94,7 @@@}: InventoryStorageUnitsProps) => {const permissions = usePermissions();const { t } = useLingui();- const { isPhone } = useViewport();+ const isQuantity = variant === "quantity";- const showPhoneRows = isQuantity && isPhone;const adjustmentModal = useDisclosure();const ruleViolations = useRuleViolations({action: path.to.inventoryItemAdjustment(pickMethod.itemId),@@@ -498,141 -452,140 +457,157 @@@<Card className="w-full"><HStack className="w-full justify-between"><CardHeader>- <CardTitle>- <HStack className="gap-2 items-center">- <Trans>Storage Units</Trans>- <Enumerable- value={- unitOfMeasures.find(- (uom) => uom.value === itemUnitOfMeasureCode- )?.label || itemUnitOfMeasureCode- }- />- </HStack>+ <CardTitle className="whitespace-nowrap">+ <Trans>Storage Units</Trans></CardTitle></CardHeader>- {/* Quantities page, phones: the action is in the bottom bar. */}- <CardAction className={isQuantity ? "max-md:hidden" : undefined}>- <Button onClick={() => openAdjustmentModal()}>- <Trans>Update Inventory</Trans>- </Button>+ <CardAction>+ <HStack>+ {/* A search box over a handful of rows is clutter. */}+ {visibleStorageUnitQuantities.length > 8 && (+ <InputGroup size="sm" className="w-40">+ <InputLeftElement>+ <LuSearch className="h-4 w-4" />+ </InputLeftElement>+ <SearchInput+ aria-label={t`Search storage units and tracking numbers`}+ placeholder={t`Search...`}+ value={search}+ onChange={(e) => setSearch(e.target.value)}+ />+ </InputGroup>+ )}- <Button onClick={() => openAdjustmentModal()}>++ {/* Quantities page, phones: the action is in the bottom bar. */}++ <Button++ className={isQuantity ? "max-md:hidden" : undefined}++ onClick={() => openAdjustmentModal()}++ >+ <Trans>Update Inventory</Trans>+ </Button>+ </HStack></CardAction></HStack>- <CardContent- className={showPhoneRows ? "overflow-hidden max-md:p-0" : undefined}- >- {showPhoneRows ? (- phoneRows- ) : (- <Table className="table-fixed">- <Thead>- <Tr>- <Th>- <Trans>Storage Unit</Trans>- </Th>-- <Th>- <Trans>Quantity</Trans>- </Th>- <Th>- <Trans>Tracking ID</Trans>- </Th>- {showExpirationColumn && (- <Th>- <Trans>Expiration Date</Trans>- </Th>- )}- <Th className="flex flex-shrink-0 justify-end" />- </Tr>- </Thead>- <Tbody>- {storageUnitGroups.map((group) => {- if (group.members.length === 1) {- return renderStorageUnitRow(group.members[0], group.key);- }- const isExpanded = expandedGroupKeys.has(group.key);- const first = group.members[0];- const { summedQuantity, earliestExpiration } = summarizeGroup(- group.members- );- return (- <Fragment key={group.key}>- <Tr>- <Td>- <HStack className="gap-1">- <IconButton- aria-label={isExpanded ? t`Collapse` : t`Expand`}- variant="ghost"- icon={- isExpanded ? (- <LuChevronDown />- ) : (- <LuChevronRight />- )- }- onClick={() => toggleGroup(group.key)}- />- <span>- {storageUnits.find(- (s) => s.value === first.storageUnitId- )?.label ||- first.storageUnitName ||- first.storageUnitId}- </span>- </HStack>- </Td>- <Td>- <span>{summedQuantity}</span>- </Td>- <Td>- <HStack>- {first.readableId && (- <span>{first.readableId}</span>- )}- <span className="text-xs text-muted-foreground">- ×{group.members.length}- </span>- </HStack>- </Td>- {showExpirationColumn && (- <Td>- {earliestExpiration && (- <span>- <DateTime- value={earliestExpiration}- variant="date"- />+ <CardContent>+ {storageUnitGroups.length === 0 && (+ <p className="py-6 text-center text-sm text-muted-foreground">+ {search.trim() ? (+ <Trans>No storage units or tracking numbers match.</Trans>+ ) : (+ <Trans>No stock on hand at this location.</Trans>+ )}+ </p>+ )}+ <div className="text-sm">+ {storageUnitGroups.map((unit) => {+ const unitLabel = unit.name ?? (+ <span className="text-muted-foreground">+ <Trans>No storage unit</Trans>+ </span>+ );+ const [onlyLot] = unit.lots;+ // A bin holding one untracked row needs no lot rows under it.+ const isSingleUntrackedRow =+ unit.lots.length === 1 &&+ onlyLot.members.length === 1 &&+ !onlyLot.members[0].trackedEntityId;++ return (+ <div+ key={unit.storageUnitId}+ className="border-t py-1.5 first:border-t-0"+ >+ <div+ className={cn(+ rowClassName,+ isSingleUntrackedRow && "hover:bg-muted/60"+ )}+ >+ <span className="truncate font-medium">{unitLabel}</span>+ {renderQuantity(unit.quantity, "font-medium")}+ {isSingleUntrackedRow ? (+ renderActions(onlyLot.members[0])+ ) : (+ // The unit sits beside the total so the digits stay in one column.+ <span className="truncate text-xs text-muted-foreground">+ {unitOfMeasureLabel}+ </span>+ )}+ </div>+ {!isSingleUntrackedRow &&+ unit.lots.map((lot) => {+ const first = lot.members[0];+ if (lot.members.length === 1) {+ return renderStockRow(first, lot.key, "pl-7");+ }+ const isExpanded = expandedGroupKeys.has(lot.key);+ const earliestExpiration = lot.members+ .map((m) =>+ m.trackedEntityId+ ? trackedEntityExpirations[m.trackedEntityId]+ : null+ )+ .filter((d): d is string => Boolean(d))+ .sort()[0];+ return (+ <Fragment key={lot.key}>+ <div className={rowClassName}>+ <div className="flex min-w-0 items-center">+ {/* The chevron sits in the gutter the other lots leave empty. */}+ <IconButton+ aria-label={+ isExpanded ? t`Collapse` : t`Expand`+ }+ aria-expanded={isExpanded}+ variant="ghost"+ size="sm"+ className="-ml-0.5 mr-0.5 size-7 shrink-0"+ icon={+ isExpanded ? (+ <LuChevronDown />+ ) : (+ <LuChevronRight />+ )+ }+ onClick={() => toggleGroup(lot.key)}+ />+ {renderTracking(first, earliestExpiration)}+ <span className="ml-2 shrink-0 text-xs text-muted-foreground">+ ×{lot.members.length}</span>+ </div>+ {renderQuantity(lot.quantity)}+ <span />+ </div>+ {isExpanded &&+ lot.members.map((item, index) =>+ renderStockRow(+ item,+ `${lot.key}:${index}`,+ "pl-14"+ ))}- </Td>- )}- <Td className="flex flex-shrink-0 justify-end items-center" />- </Tr>- {isExpanded &&- group.members.map((item, index) =>- renderStorageUnitRow(item, `${group.key}:${index}`)- )}- </Fragment>- );- })}- </Tbody>- </Table>- )}+ </Fragment>+ );+ })}+ </div>+ );+ })}+ </div></CardContent></Card>+ {isQuantity ? (+ <BottomBar>+ <div className="flex items-center gap-2 border-t border-border bg-card px-4 pt-2 pb-safe-4">+ <Button+ size="lg"+ className="w-full"+ onClick={() => openAdjustmentModal()}+ >+ <Trans>Update Inventory</Trans>+ </Button>+ </div>+ </BottomBar>+ ) : null}{adjustmentModal.isOpen && (<Modalopendiff --cc apps/erp/app/modules/inventory/ui/InventoryCount/InventoryCount.tsxindex fe01e65ef2,cea8595f12..83c6cb43fc--- a/apps/erp/app/modules/inventory/ui/InventoryCount/InventoryCount.tsx+++ b/apps/erp/app/modules/inventory/ui/InventoryCount/InventoryCount.tsx@@@ -23,12 -24,7 +24,12 @@@ importLuRotateCcw,LuSend} from "react-icons/lu";- import { useFetcher, useRevalidator } from "react-router";+ import { useFetcher } from "react-router";+import {+ RecordAction,+ RecordHero,+ RecordPhoneChrome+} from "~/components/Layout/RecordHeader";import { usePermissions } from "~/hooks";import type {InventoryCountLine,diff --cc apps/erp/app/modules/inventory/ui/PickingLists/PickingListLines.tsxindex a6426b9362,f90a718199..59a8aa30ca--- a/apps/erp/app/modules/inventory/ui/PickingLists/PickingListLines.tsx+++ b/apps/erp/app/modules/inventory/ui/PickingLists/PickingListLines.tsx@@@ -513,7 -368,7 +515,7 @@@ function PickingListLineItem(return (<divclassName={cn(- "group flex items-center justify-between gap-6 p-4 border-b max-md:flex-col max-md:items-stretch max-md:gap-3",- "group flex flex-col gap-4 p-4 border-b @3xl:flex-row @3xl:items-center @3xl:justify-between @3xl:gap-6",++ "group flex flex-col gap-4 p-4 border-b @3xl:flex-row @3xl:items-center @3xl:justify-between @3xl:gap-6 max-md:gap-3",isLast && "border-none")}>@@@ -555,17 -412,9 +559,14 @@@<RecommendedLots resolve={recommendations} lineId={line.id} />)}</VStack>+ {isPhone && isShort && (+ <Status color="orange" disableTooltip className="ml-auto shrink-0">+ <Trans>Short</Trans>+ </Status>+ )}</HStack>- <HStack- spacing={6}- className="shrink-0 max-md:flex-wrap max-md:gap-3 max-md:space-x-0"- >- <div className="flex flex-wrap items-center justify-end gap-x-6 gap-y-2 @3xl:shrink-0 @3xl:flex-nowrap">++ <div className="flex flex-wrap items-center justify-end gap-x-6 gap-y-2 @3xl:shrink-0 @3xl:flex-nowrap max-md:gap-3">{source ? (<div className="text-base font-medium whitespace-nowrap">{source}@@@ -624,21 -473,104 +625,21 @@@</TooltipContent></Tooltip>)}- {isTracked ? (- <Badge- variant={isPicked ? "green" : quantityPicked > 0 ? "orange" : "red"}- className="text-base tabular-nums"- >- {quantityPicked}/{quantityToPick}- {unitSuffix}- </Badge>- ) : (- <Badge- variant={isPicked ? "green" : isShort ? "orange" : "red"}- className="text-base tabular-nums"- >- {isShort ? quantityPicked : quantityToPick}- {unitSuffix}- </Badge>- )}- {isLocked ? null : isTracked ? (- <HStack spacing={1}>- {pickedLots.length === 1 ? (- <Button- variant="secondary"- leftIcon={<LuUndo2 />}- isDisabled={!canPick || isPending}- onClick={() => unpickTracked(pickedLots[0].trackedEntityId)}- >- {pickedLots[0].trackedEntity?.readableId ? (- <Trans>Unpick {pickedLots[0].trackedEntity.readableId}</Trans>- ) : (- <Trans>Unpick</Trans>- )}- </Button>- ) : pickedLots.length > 1 ? (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button- variant="secondary"- leftIcon={<LuUndo2 />}- rightIcon={<LuChevronDown />}- isDisabled={!canPick || isPending}- >- <Trans>Unpick</Trans>- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- {pickedLots.map((lot) => (- <DropdownMenuItem- key={lot.trackedEntityId}- onClick={() => unpickTracked(lot.trackedEntityId)}- >- <DropdownMenuIcon icon={<LuUndo2 />} />- {lot.trackedEntity?.readableId ?? lot.trackedEntityId}- </DropdownMenuItem>- ))}- </DropdownMenuContent>- </DropdownMenu>- ) : null}- {!isPicked && (- <Button- variant="secondary"- leftIcon={<LuQrCode />}- isDisabled={!canPick || isPending}- onClick={openPicker}- >- <Trans>Scan</Trans>- </Button>+ {isPhone ? (+ <span className="ml-auto inline-flex items-center gap-1.5 text-sm text-muted-foreground">+ {isTracked || isPicked || isShort ? (+ <Trans>Picked</Trans>+ ) : (+ <Trans>To pick</Trans>)}- </HStack>- ) : isPicked ? (- <Button- variant="secondary"- leftIcon={<LuUndo2 />}- isDisabled={!canPick || isPending}- isLoading={isPending}- onClick={() => pick(0)}- >- <Trans>Unpick</Trans>- </Button>+ {quantityBadge}+ </span>) : (- <HStack spacing={1}>- <Button- variant="secondary"- isDisabled={!canPick || isPending}- onClick={() => setShortOpen(true)}- >- <Trans>Short</Trans>- </Button>- <Button- leftIcon={<LuCirclePlus />}- isDisabled={!canPick || isPending}- isLoading={isPending}- onClick={() => pick(quantityToPick)}- >- <Trans>Pick</Trans>- </Button>- </HStack>+ quantityBadge)}+ {isPhone ? null : actions}- </HStack>+ </div>+ {isPhone && actions ? <div className="flex w-full">{actions}</div> : null}{shortOpen && (<ShortPickModaldiff --cc apps/erp/app/modules/inventory/ui/Receipts/ReceiptLines.tsxindex 60beb4ddcb,833d8f03ba..de6b1c7685--- a/apps/erp/app/modules/inventory/ui/Receipts/ReceiptLines.tsx+++ b/apps/erp/app/modules/inventory/ui/Receipts/ReceiptLines.tsx@@@ -466,7 -460,7 +465,7 @@@ function ReceiptLineItem(return (<divclassName={cn(- "flex flex-col border-b p-6 gap-6 relative max-md:p-4 max-md:gap-4",- "@container flex flex-col border-b p-6 gap-6 relative",++ "@container flex flex-col border-b p-6 gap-6 relative max-md:p-4 max-md:gap-4",className)}>@@@ -600,9 -605,9 +610,9 @@@</VStack></HStack>- <div className="flex flex-col items-start gap-1 min-w-[140px] text-sm">+ <div className="flex flex-col items-start gap-1 min-w-[140px] text-sm max-md:w-full"><label className="text-xs text-muted-foreground">- Storage Unit+ <Trans>Storage Unit</Trans></label><StorageUnitlocationId={line.locationId}diff --cc apps/erp/app/modules/inventory/ui/Shipments/ShipmentLines.tsxindex cb7b2835d8,2746127760..c33099423e--- a/apps/erp/app/modules/inventory/ui/Shipments/ShipmentLines.tsx+++ b/apps/erp/app/modules/inventory/ui/Shipments/ShipmentLines.tsx@@@ -451,19 -447,12 +452,12 @@@ function ShipmentLineItem(return (<divclassName={cn(- "flex flex-col border-b p-6 gap-6 relative max-md:p-4 max-md:gap-4",- "@container flex flex-col border-b p-6 gap-6 relative",++ "@container flex flex-col border-b p-6 gap-6 relative max-md:p-4 max-md:gap-4",className)}>- <div className="absolute top-3 right-6 max-md:right-4">- {line.fulfillment?.type === "Job" ? (- <div className="flex flex-col items-end gap-0">- <span>Job</span>- <span className="text-xs text-muted-foreground">- {line.fulfillment?.job?.jobId}- </span>- </div>- ) : (+ {!isJobFulfillment && (- <div className="absolute top-3 right-6">++ <div className="absolute top-3 right-6 max-md:right-4"><DropdownMenu><DropdownMenuTrigger asChild><IconButtondiff --cc apps/erp/app/modules/inventory/ui/StockMovements/StockMovementsTable.tsxindex 6e8afb36d6,4452219e23..70deb5ba99--- a/apps/erp/app/modules/inventory/ui/StockMovements/StockMovementsTable.tsx+++ b/apps/erp/app/modules/inventory/ui/StockMovements/StockMovementsTable.tsx@@@ -243,7 -243,9 +247,10 @@@ const StockMovementsTable = memo<DateTime value={item.getValue<string>()} variant="date" />),meta: {+ mobile: "P3",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLines.tsxindex 502f4ab5ad,037cd912ca..cbc76216b9--- a/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLines.tsx+++ b/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLines.tsx@@@ -99,7 -99,7 +99,7 @@@ function StockTransferLineComponent(return (<divclassName={cn(- "flex flex-col border-b p-6 gap-6 max-md:p-4 max-md:gap-4",- "@container flex flex-col border-b p-6 gap-6",++ "@container flex flex-col border-b p-6 gap-6 max-md:p-4 max-md:gap-4",index === totalLines - 1 && "border-none",isPicked && "opacity-50 hover:opacity-100")}@@@ -144,10 -150,13 +150,13 @@@)}/></HStack>- <div className="flex flex-grow items-center justify-between gap-4 pl-4 w-1/2 max-md:w-full max-md:flex-wrap max-md:gap-3 max-md:pl-0">- <HStack spacing={4} className="text-left items-center max-md:min-w-0">- <div className="flex items-center justify-between gap-4 w-full @3xl:w-auto @3xl:flex-1 min-w-0">++ <div className="flex items-center justify-between gap-4 w-full @3xl:w-auto @3xl:flex-1 min-w-0 max-md:gap-3">+ <HStack spacing={4} className="text-left items-center min-w-0">{"fromStorageUnitId" in line && (- <span className="text-base font-medium whitespace-nowrap max-md:min-w-0 max-md:truncate">+ <span+ className="text-base font-medium truncate"+ title={line.fromStorageUnitName ?? undefined}+ >{line.fromStorageUnitName ?? ""}</span>)}diff --cc apps/erp/app/modules/inventory/ui/StorageUnits/StorageUnitsTable.tsxindex 7e4e8bf14b,56d223944a..f10787bd0b--- a/apps/erp/app/modules/inventory/ui/StorageUnits/StorageUnitsTable.tsx+++ b/apps/erp/app/modules/inventory/ui/StorageUnits/StorageUnitsTable.tsx@@@ -20,9 -19,9 +20,10 @@@ importModalTitle,Spinner,toast,- useDisclosure+ useDisclosure,+ useViewport} from "@carbon/react";+ import { async } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { ColumnDef } from "@tanstack/react-table";import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";diff --cc apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferLines.tsxindex 6799f99aa7,d74203f21a..c2d4114875--- a/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferLines.tsx+++ b/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransferLines.tsx@@@ -144,45 -146,49 +146,49 @@@ function WarehouseTransferLineListItem(const date = line.updatedAt ?? line.createdAt;return (- <div className={cn("border-b p-6 max-md:p-4", className)}>- <div className="flex flex-1 justify-between items-center w-full max-md:flex-col max-md:items-stretch max-md:gap-3">- <HStack spacing={4} className="w-1/2 max-md:w-full">- <HStack- spacing={4}- className="flex-1 max-md:min-w-0 max-md:flex-col max-md:items-start max-md:gap-3 max-md:space-x-0"- >- <div className="flex items-center space-x-3 max-md:min-w-0">- <ItemThumbnail- size="sm"- thumbnailPath={line.item?.thumbnailPath}- type={(item.type as "Part") ?? "Part"}- />- <VStack spacing={0}>- <span className="text-sm font-medium truncate">- {item.name}- </span>- <span className="text-xs text-muted-foreground truncate">- {item.readableIdWithRevision}- </span>- </VStack>- </div>- <div className="flex items-center gap-2 max-md:flex-wrap">- <Badge variant="secondary">- {Number(line.quantity).toLocaleString()}- </Badge>- {line.fromStorageUnit && (- <Badge variant="outline">{line.fromStorageUnit.name}</Badge>- )}- <LuArrowRight className="size-4" />- {line.toStorageUnit && (- <Badge variant="outline">{line.toStorageUnit.name}</Badge>- )}- </div>- </HStack>- </HStack>- <div className="flex items-center justify-end gap-2 max-md:justify-between">- <div className={cn("@container border-b p-6", className)}>++ <div className={cn("@container border-b p-6 max-md:p-4", className)}>+ {/* Sized by the line's own width, not the viewport: the content pane+ it sits in is resizable. The item takes what the rest leaves, and+ the quantity and bins drop below it on a narrow line. */}+ <div className="flex items-start @xl:items-center gap-4 w-full">+ <div className="flex flex-1 min-w-0 flex-col @xl:flex-row @xl:items-center gap-x-4 gap-y-3">+ <div className="flex flex-1 min-w-0 items-center gap-3">+ <ItemThumbnail+ size="sm"+ thumbnailPath={line.item?.thumbnailPath}+ type={(item.type as "Part") ?? "Part"}+ />+ <VStack spacing={0} className="flex-1 min-w-0">+ <span+ className="text-sm font-medium truncate block w-full"+ title={item.name}+ >+ {item.name}+ </span>+ <span+ className="text-xs text-muted-foreground truncate block w-full"+ title={item.readableIdWithRevision}+ >+ {item.readableIdWithRevision}+ </span>+ </VStack>+ </div>+ <div className="flex flex-wrap items-center gap-2 shrink-0">+ <Badge variant="secondary">+ {formatQuantity(Number(line.quantity))}+ </Badge>+ {line.fromStorageUnit && (+ <Badge variant="outline">{line.fromStorageUnit.name}</Badge>+ )}+ <LuArrowRight className="size-4 shrink-0" />+ {line.toStorageUnit && (+ <Badge variant="outline">{line.toStorageUnit.name}</Badge>+ )}+ </div>+ </div>+ <div className="flex items-center justify-end gap-2 shrink-0"><HStack spacing={2}>- <span className="text-xs text-muted-foreground">+ <span className="hidden @min-[42rem]:inline text-xs text-muted-foreground whitespace-nowrap">{isUpdated ? t`Updated` : t`Created`}{" "}<DateTime value={date} variant="relative" /></span>diff --cc apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransfersTable.tsxindex 4ffe762559,1d7e2d427c..ff880cf189--- a/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransfersTable.tsx+++ b/apps/erp/app/modules/inventory/ui/WarehouseTransfers/WarehouseTransfersTable.tsx@@@ -123,7 -120,9 +123,10 @@@ const WarehouseTransfersTable = memoreturn date ? <DateTime value={date} variant="date" /> : "N/A";},meta: {+ mobile: "P2",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceHeader.tsxindex 17336e4d47,a1253d4a0a..ed21b41135--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceHeader.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceHeader.tsx@@@ -27,8 -30,13 +27,10 @@@ importLuCircleCheck,LuCircleX,LuDollarSign,- LuEllipsisVertical,LuEye,LuFile,+ LuFileText,- LuPanelLeft,- LuPanelRight,+ LuSend,LuTicketX,LuTrash,LuTruck@@@ -215,124 -271,182 +266,176 @@@ const SalesInvoiceHeader = () =>invoiceId,balance: salesInvoice.balance});+ const isDraft = routeData?.salesInvoice?.status === "Draft";+ const menuItems = (+ <>+ {auditLogTrigger}+ {canMarkPaid && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ disabled={statusFetcher.state !== "idle"}+ onClick={() =>+ statusFetcher.submit(+ { status: "Paid" },+ {+ method: "post",+ action: path.to.salesInvoiceStatus(invoiceId)+ }+ )+ }+ >+ <DropdownMenuIcon icon={<LuCircleCheck />} />+ <Trans>Mark as Paid</Trans>+ </DropdownMenuItem>+ </>+ )}+ {canMarkUnpaid && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ disabled={statusFetcher.state !== "idle"}+ onClick={() =>+ statusFetcher.submit(+ { status: "Submitted" },+ {+ method: "post",+ action: path.to.salesInvoiceStatus(invoiceId)+ }+ )+ }+ >+ <DropdownMenuIcon icon={<LuCircleX />} />+ <Trans>Mark as Unpaid</Trans>+ </DropdownMenuItem>+ </>+ )}+ {isPosted && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ disabled={isVoided || !permissions.can("update", "invoicing")}+ destructive+ onClick={voidModal.onOpen}+ >+ <DropdownMenuIcon icon={<LuTicketX />} />+ <Trans>Void</Trans>+ </DropdownMenuItem>+ </>+ )}+ <DropdownMenuSeparator />+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.delete}+ disabled={+ salesInvoice.status !== "Draft" ||+ !permissions.can("delete", "invoicing") ||+ !permissions.is("employee")+ }+ destructive+ onClick={deleteModal.onOpen}+ >+ <DropdownMenuIcon icon={<LuTrash />} />+ <Trans>Delete Sales Invoice</Trans>+ </DropdownMenuItem>+ </>+ );+ const statusBadges = (+ <>+ <SalesInvoiceStatus status={salesInvoice.status} />++ {holdReason && (++ <Status color="orange" tooltip={holdReason}>++ <Trans>Needs Review</Trans>++ </Status>++ )}++ {showEmailed &&++ (sentViaStripe ? (++ <Status color="green" tooltip={t`On ${sentDate}`}>++ <Trans>Sent via Stripe</Trans>++ </Status>++ ) : (++ <Status color="green" tooltip={t`To ${sentTo} on ${sentDate}`}>++ <Trans>Emailed</Trans>++ </Status>++ ))}++ {showNotSent && (++ <>++ <Status color="red" tooltip={salesInvoice.sendError}>++ <Trans>Not sent</Trans>++ </Status>++ <Button++ variant="secondary"++ leftIcon={<LuSend />}++ isLoading={sendFetcher.state !== "idle"}++ isDisabled={++ sendFetcher.state !== "idle" ||++ !permissions.can("update", "invoicing")++ }++ onClick={() =>++ sendFetcher.submit(++ {},++ {++ method: "post",++ action: path.to.salesInvoiceSend(invoiceId)++ }++ )++ }++ >++ <Trans>Send</Trans>++ </Button>++ </>++ )}+ {routeData?.stripeInvoiceUrl && isPosted && (+ <a+ href={routeData.stripeInvoiceUrl}+ target="_blank"+ rel="noreferrer"+ className="no-underline"+ >+ <Status color="purple">+ <Trans>Stripe</Trans>+ </Status>+ </a>+ )}+ </>+ );return (<>- <div className="flex flex-shrink-0 items-center justify-between gap-x-4 p-2 bg-card border-b h-[var(--header-height)] overflow-x-auto scrollbar-hide">- <HStack className="w-full justify-between">- <HStack>- <IconButton- aria-label={t`Toggle Explorer`}- icon={<LuPanelLeft />}- onClick={toggleExplorer}- variant="ghost"- />- <Link to={path.to.salesInvoiceDetails(invoiceId)}>- <Heading size="h4" className="flex items-center gap-2">- <span>{routeData?.salesInvoice?.invoiceId}</span>- </Heading>- </Link>- <Copy text={routeData?.salesInvoice?.invoiceId ?? ""} />- <DropdownMenu>- <DropdownMenuTrigger asChild>- <IconButton- aria-label={t`More options`}- icon={<LuEllipsisVertical />}- variant="secondary"- size="sm"- />- </DropdownMenuTrigger>- <DropdownMenuContent>- {auditLogTrigger}- {canMarkPaid && (- <>- <DropdownMenuSeparator />- <DropdownMenuItem- disabled={statusFetcher.state !== "idle"}- onClick={() =>- statusFetcher.submit(- { status: "Paid" },- {- method: "post",- action: path.to.salesInvoiceStatus(invoiceId)- }- )- }- >- <DropdownMenuIcon icon={<LuCircleCheck />} />- <Trans>Mark as Paid</Trans>- </DropdownMenuItem>- </>- )}- {canMarkUnpaid && (- <>- <DropdownMenuSeparator />- <DropdownMenuItem- disabled={statusFetcher.state !== "idle"}- onClick={() =>- statusFetcher.submit(- { status: "Submitted" },- {- method: "post",- action: path.to.salesInvoiceStatus(invoiceId)- }- )- }- >- <DropdownMenuIcon icon={<LuCircleX />} />- <Trans>Mark as Unpaid</Trans>- </DropdownMenuItem>- </>- )}- {isPosted && (- <>- <DropdownMenuSeparator />- <DropdownMenuItem- disabled={- isVoided || !permissions.can("update", "invoicing")- }- destructive- onClick={voidModal.onOpen}- >- <DropdownMenuIcon icon={<LuTicketX />} />- <Trans>Void</Trans>- </DropdownMenuItem>- </>- )}- <DropdownMenuSeparator />- <DropdownMenuItem- shortcut={MENU_ITEM_SHORTCUTS.delete}- disabled={- salesInvoice.status !== "Draft" ||- !permissions.can("delete", "invoicing") ||- !permissions.is("employee")- }- destructive- onClick={deleteModal.onOpen}- >- <DropdownMenuIcon icon={<LuTrash />} />- <Trans>Delete Sales Invoice</Trans>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- <SalesInvoiceStatus status={salesInvoice.status} />- {holdReason && (- <Status color="orange" tooltip={holdReason}>- <Trans>Needs Review</Trans>- </Status>- )}- {showEmailed &&- (sentViaStripe ? (- <Status color="green" tooltip={t`On ${sentDate}`}>- <Trans>Sent via Stripe</Trans>- </Status>- ) : (- <Status color="green" tooltip={t`To ${sentTo} on ${sentDate}`}>- <Trans>Emailed</Trans>- </Status>- ))}- {showNotSent && (- <>- <Status color="red" tooltip={salesInvoice.sendError}>- <Trans>Not sent</Trans>- </Status>- <Button- variant="secondary"- leftIcon={<LuSend />}- isLoading={sendFetcher.state !== "idle"}- isDisabled={- sendFetcher.state !== "idle" ||- !permissions.can("update", "invoicing")- }- onClick={() =>- sendFetcher.submit(- {},- {- method: "post",- action: path.to.salesInvoiceSend(invoiceId)- }- )- }- >- <Trans>Send</Trans>- </Button>- </>- )}- {routeData?.stripeInvoiceUrl && isPosted && (- <a- href={routeData.stripeInvoiceUrl}- target="_blank"- rel="noreferrer"- className="no-underline"- >- <Status color="purple">- <Trans>Stripe</Trans>- </Status>- </a>- )}- </HStack>- <HStack>+ <RecordHeader+ title={routeData?.salesInvoice?.invoiceId}+ titleTo={path.to.salesInvoiceDetails(invoiceId)}+ copyValue={routeData?.salesInvoice?.invoiceId ?? ""}+ menu={menuItems}+ status={statusBadges}+ onToggleExplorer={toggleExplorer}+ onToggleProperties={toggleProperties}+ actions={+ <>+ {contract && (- <Button variant="secondary" leftIcon={<LuFileText />} asChild>- <Link to={path.to.contract(contract.id)}>- <Trans>Contract {contractReadableId}</Trans>- </Link>- </Button>++ <RecordAction slot="overflow">++ <Button variant="secondary" leftIcon={<LuFileText />} asChild>++ <Link to={path.to.contract(contract.id)}>++ <Trans>Contract {contractReadableId}</Trans>++ </Link>++ </Button>++ </RecordAction>+ )}+{relatedDocs.salesOrders.length === 1 && (- <Button- variant="secondary"- leftIcon={<RiProgress8Line />}- asChild- >- <Link- to={path.to.salesOrderDetails(relatedDocs.salesOrders[0].id)}+ <RecordAction slot="overflow">+ <Button+ variant="secondary"+ leftIcon={<RiProgress8Line />}+ asChild>- <Trans>Sales Order</Trans>- </Link>- </Button>+ <Link+ to={path.to.salesOrderDetails(+ relatedDocs.salesOrders[0].id+ )}+ >+ <Trans>Sales Order</Trans>+ </Link>+ </Button>+ </RecordAction>)}{relatedDocs.salesOrders.length > 1 && (diff --cc apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsxindex b55b6f67e1,080595274f..5f8b308eaf--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsx@@@ -134,13 -135,26 +137,27 @@@ const SalesInvoicesTable = memo(({ data{accessorKey: "status",header: t`Status`,- cell: (item) => {- const status =- item.getValue<(typeof salesInvoiceStatusType)[number]>();- return <SalesInvoiceStatus status={status} />;+ cell: ({ row }) => {+ const invoice = row.original;+ // A held draft, or a posted invoice whose email failed: the reason+ // is the badge's tooltip. Filter on it with "Needs Review".+ const reviewReason =+ invoice.status === "Draft"+ ? invoice.automationHoldReason+ : invoice.sendError;+ return (+ <span className="flex items-center gap-1">+ <SalesInvoiceStatus status={invoice.status} />+ {invoice.needsReview && (+ <Status color="orange" tooltip={reviewReason ?? undefined}>+ <Trans>Needs Review</Trans>+ </Status>+ )}+ </span>+ );},meta: {+ mobile: "P2",filter: {type: "static",options: salesInvoiceStatusType.map((status) => ({diff --cc apps/erp/app/modules/items/ui/Item/BillOfProcess.tsxindex e2a240a5b8,bf8fdb0454..53da8e7cf6--- a/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx+++ b/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx@@@ -72,15 -71,9 +72,10 @@@ importLuMaximize2,LuMinimize2,LuSquareFunction,- LuTriangleAlert+ LuTriangleAlert,+ LuWorkflow} from "react-icons/lu";- import {- useFetcher,- useFetchers,- useParams,- useRevalidator- } from "react-router";+ import { useFetcher, useFetchers, useParams } from "react-router";import { z } from "zod";import {DateTime,diff --cc apps/erp/app/modules/items/ui/Item/CustomerParts/CustomerParts.tsxindex 882ed6075d,cb1c2ba593..a5cd05b634--- a/apps/erp/app/modules/items/ui/Item/CustomerParts/CustomerParts.tsx+++ b/apps/erp/app/modules/items/ui/Item/CustomerParts/CustomerParts.tsx@@@ -113,38 -112,31 +113,35 @@@ const CustomerParts = ({ customerParts);return (- <>- <Card className="w-full">- <HStack className="justify-between items-start">- <CardHeader>- <CardTitle>- <Trans>Customer Parts</Trans>- </CardTitle>- </CardHeader>- <CardAction>- {canEdit && (- <NewPlacementContext.Provider value="inline">- <New to={path.to.newCustomerPart(itemId)} />- </NewPlacementContext.Provider>- )}- </CardAction>- </HStack>- <CardContent>- <Grid<CustomerPart>- data={customerParts}- columns={columns}- canEdit={canEdit}- editableComponents={editableComponents}- onNewRow={- canEdit- ? () => navigate(path.to.newCustomerPart(itemId))- : undefined- }- />- </CardContent>- </Card>- <Outlet />- </>+ <Card className="w-full">+ <HStack className="justify-between items-start">+ <CardHeader>+ <CardTitle>+ <Trans>Customer Parts</Trans>+ </CardTitle>+ </CardHeader>+ <CardAction>- {canEdit && <New to={path.to.newCustomerPart(itemId)} />}++ {canEdit && (++ <NewPlacementContext.Provider value="inline">++ <New to={path.to.newCustomerPart(itemId)} />++ </NewPlacementContext.Provider>++ )}+ </CardAction>+ </HStack>+ <CardContent>+ <Grid<CustomerPart>+ data={customerParts}+ columns={columns}+ canEdit={canEdit}+ editableComponents={editableComponents}+ onNewRow={+ canEdit+ ? () => navigate(path.to.newCustomerPart(itemId))+ : undefined+ }+ />+ </CardContent>+ </Card>);};diff --cc apps/erp/app/modules/people/ui/Holidays/HolidaysTable.tsxindex 1e0913a655,1cf4b2b64d..1db8a8548a--- a/apps/erp/app/modules/people/ui/Holidays/HolidaysTable.tsx+++ b/apps/erp/app/modules/people/ui/Holidays/HolidaysTable.tsx@@@ -69,7 -68,9 +69,10 @@@ const HolidaysTable = memo(({ data, cou<DateTime value={item.getValue<string>()} variant="date" />),meta: {+ mobile: "P2",+ filter: {+ type: "dateRange"+ },icon: <LuCalendarDays />}}diff --cc apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsxindex a4937e33e3,60ede512c2..0f633e5ee5--- a/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsx+++ b/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsx@@@ -13,9 -13,9 +13,10 @@@ importIconButton,MENU_ITEM_SHORTCUTS,useUrlParams,+ useViewport,VStack} from "@carbon/react";+ import { distinctItemText } from "@carbon/utils";import { getLocalTimeZone, parseDate } from "@internationalized/date";import { useLingui } from "@lingui/react/macro";import { useDateFormatter, useNumberFormatter } from "@react-aria/i18n";@@@ -125,13 -124,16 +126,18 @@@ const DemandProjectionsTable = memotype={row.original.type}/>- <VStack spacing={0} className="font-medium">- {row.original.readableIdWithRevision}+ <VStack spacing={0} className="font-medium max-md:min-w-0">+ <span className="max-md:block max-md:w-full max-md:truncate">+ {row.original.readableIdWithRevision}+ </span>- <div className="w-full truncate text-muted-foreground text-xs">- {row.original.name}- </div>+ {distinctItemText(+ row.original.readableIdWithRevision,+ row.original.name+ ) && (+ <div className="w-full truncate text-muted-foreground text-xs">+ {row.original.name}+ </div>+ )}</VStack></HStack></Hyperlink>@@@ -205,9 -205,9 +211,9 @@@count={count}defaultColumnPinning={defaultColumnPinning}title={t`Demand Forecasts`}- table="production-planning"+ table="demand-projection"withSavedView- withSelectableRows+ withSelectableRows={!isPhone}withSimpleSortingprimaryAction={<div className="flex items-center gap-2">diff --cc apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsxindex 4f0b20fe76,3200fa8c18..db03963451--- a/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsx@@@ -88,16 -87,10 +88,11 @@@ importLuRefreshCcw,LuSend,LuShieldX,+ LuSquareChartGantt,- LuTriangleAlert+ LuTriangleAlert,+ LuWorkflow} from "react-icons/lu";- import {- Link,- useFetcher,- useFetchers,- useParams,- useRevalidator- } from "react-router";+ import { Link, useFetcher, useFetchers, useParams } from "react-router";import type { z } from "zod";import {Assignee,diff --cc apps/erp/app/modules/production/ui/Jobs/JobsTable.tsxindex eeb4a4aa2e,c197940222..4c50fb953e--- a/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsx@@@ -18,9 -18,9 +18,10 @@@ importMenuItem,toast,useDisclosure,+ useViewport,VStack} from "@carbon/react";+ import { distinctItemText } from "@carbon/utils";import {getLocalTimeZone,isSameDay,@@@ -155,7 -167,7 +168,8 @@@ const JobsTable = memo((props: JobsTablconst { data, count, tags, batchesByJobId = {} } = props;const navigate = useNavigate();const { t } = useLingui();+ const { isPhone } = useViewport();+ const releasedJobsMessage = useReleasedJobsMessage();const [params] = useUrlParams();const parts = useParts();const tools = useTools();diff --cc apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsxindex ba57e4a552,3e326662a8..4a49bc47ad--- a/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsx+++ b/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsx@@@ -400,92 -521,52 +522,58 @@@ const ProductionPlanningTable = (}},{- accessorKey: "reorderingPolicy",- header: t`Reorder Policy`,- cell: ({ row }) => {- return (- <HStack>- <Tooltip>- <TooltipTrigger>- <ItemReorderPolicy- reorderingPolicy={row.original.reorderingPolicy}- />- </TooltipTrigger>- <TooltipContent>- {getReorderPolicyDescription(row.original)}- </TooltipContent>- </Tooltip>- </HStack>- );- },+ id: PLANNING_ASSIGNEE_COLUMN,+ header: t`Assignee`,+ cell: ({ row }) => (+ <EmployeeAvatarGroup+ employeeIds={[+ ...new Set(+ (visibleActionsByItemId.get(row.original.id) ?? []).flatMap(+ (action) => (action.assignee ? [action.assignee] : [])+ )+ )+ ]}+ />+ ),meta: {- mobile: "P2",+ icon: <LuUserCheck />,+ pluralHeader: t`Assignees`,filter: {type: "static",- options: itemReorderingPolicies.map((policy) => ({- label: <ItemReorderPolicy reorderingPolicy={policy} />,- value: policy+ options: people.map((employee) => ({+ value: employee.id,+ label: employee.name}))},- icon: <LuCircleCheck />- }- },- {- accessorKey: "quantityOnHand",- header: t`On Hand`,- cell: ({ row }) => numberFormatter.format(row.original.quantityOnHand),- meta: {- mobile: "P3",- mobileLabel: true,- icon: <LuBlocks />,- renderTotal: true+ exportValue: (row: ProductionPlanningItem) =>+ [+ ...new Set(+ (visibleActionsByItemId.get(row.id) ?? []).flatMap((action) =>+ action.assignee ? [action.assignee] : []+ )+ )+ ]+ .map(+ (id) => people.find((person) => person.id === id)?.name ?? id+ )+ .join(", ")}},- ...periodColumns,+ ...shared.periods,- shared.reorderPolicy,+ {- accessorKey: "quantityToOrder",- header: t`Qty to Order`,- cell: ({ row }) => {- const value = row.original.quantityToOrder;- if (value === undefined || value === 0) return "-";- return (- <span className="font-medium">{numberFormatter.format(value)}</span>- );- },- meta: {- // Phones: the row's "Make N" button already shows this quantity.- mobile: "P4",- icon: <LuCirclePlay />- }++ ...shared.reorderPolicy,++ meta: { ...shared.reorderPolicy.meta, mobile: "P2" }+ },+ shared.unitOfMeasure,- shared.onHand,+ {- accessorKey: "type",- header: t`Type`,- cell: ({ row }) =>- row.original.type && (- <HStack>- <MethodItemTypeIcon type={row.original.type} />- <span>{row.original.type}</span>- </HStack>- ),- meta: {- filter: {- type: "static",- options: inventoryItemTypes- .filter((t) => ["Part", "Tool"].includes(t))- .map((type) => ({- label: (- <HStack spacing={2}>- <MethodItemTypeIcon type={type} />- <span>{type}</span>- </HStack>- ),- value: type- }))- },- icon: <LuBox />- }++ ...shared.onHand,++ meta: { ...shared.onHand.meta, mobile: "P3", mobileLabel: true }+ },+ shared.firstNegativeDate,+ shared.latestOrderDate,+ shared.timeFence,+ shared.type,+ shared.itemGroup,{id: "Order",header: "",@@@ -608,36 -753,15 +767,32 @@@<Trans>Recalculate</Trans></Button></TooltipTrigger>- <TooltipContent>- <Trans>- MRP runs automatically every 3 hours, but you can run it- manually here.- </Trans>- </TooltipContent>+ <TooltipContent>{mrpScheduleDescription}</TooltipContent></Tooltip></mrpFetcher.Form>+ <p className="basis-full text-xs text-muted-foreground md:hidden">- <Trans>- MRP runs every 3 hours. To run it now, use ⋯ › Recalculate.- </Trans>++ {mrpScheduleDescription}+ </p></div>}+ mobileMenuItems={+ <DropdownMenuItem+ disabled={mrpFetcher.state !== "idle"}+ onSelect={() =>+ mrpFetcher.submit(+ {},+ { method: "post", action: path.to.api.mrp(locationId) }+ )+ }+ >+ <DropdownMenuIcon icon={<LuCirclePlay />} />+ <Trans>Recalculate</Trans>+ </DropdownMenuItem>+ }renderActions={renderActions}+ renderExpandedRow={renderExpandedRow}+ pinExpandedRows+ canExpandRow={canExpandRow}title={t`Material Planning`}table="production-planning"withSavedViewdiff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/DateKanban.tsxindex 2a957fb960,697200eb2a..f2f7c403cb--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/DateKanban.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/DateKanban.tsx@@@ -306,23 -305,9 +306,21 @@@ const DateKanban = (const sensors = useSensors(useSensor(PointerSensor),- useSensor(KeyboardSensor, {- coordinateGetter: sortableKeyboardCoordinates- })+ useSensor(KeyboardSensor, KEYBOARD_SENSOR_OPTIONS));+ function createDateDragOrigin(activeItem: JobItem): DateDragOrigin | null {+ const placementOrigin = createDragOrigin(baseItems, activeItem);+ if (!placementOrigin) return null;+ return {+ ...placementOrigin,+ dueDate:+ activeItem.dueDate === undefined+ ? undefined+ : getDateOnly(activeItem.dueDate)+ };+ }+function clearDragState() {dragOriginRef.current = null;setDragState(null);diff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/Kanban.tsxindex 873c1b868d,503fd1a4ee..abd573a493--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/Kanban.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/Kanban.tsx@@@ -757,49 -751,19 +779,78 @@@ const Kanban = (columnsById);- if (commit) {- if (- isBatchItem(origin.item) &&- commit.columnId !== origin.placement.columnId- ) {- // A batch dropped on a DIFFERENT work center reassigns the whole batch- // (the server fn writes the work center to every member) and reschedules;- // the priority renumber is left to the resulting replan wave.+ if (commit) submitCommit(origin, commit);+ }++ clearDragState();+ }++ // Persists a resolved move: each moved card writes through its own endpoint.+ function submitCommit(origin: OperationDragOrigin, commit: DragCommit) {+ if (+ isBatchItem(origin.item) &&+ commit.columnId !== origin.placement.columnId+ ) {+ // A batch dropped on a DIFFERENT work center reassigns the whole batch+ // (the server fn writes the work center to every member) and reschedules;+ // the priority renumber is left to the resulting replan wave.+ submit(+ {+ intent: "update",+ batchId: origin.item.batchId,+ workCenterId: commit.columnId+ },+ {+ method: "post",+ action: path.to.priorityBatchingUpdate,+ navigate: false,+ flushSync: true,+ fetcherKey: `item:${origin.item.id}`+ }+ );+ } else {+ // Within-column reorder (or a non-batch cross-column move). Each+ // renumbered card writes through its own endpoint: an operation writes+ // its priority (+ work center), a batch card writes every member's+ // priority so min(member) lands at the batch's new dispatch slot.+ const flushSync = commit.updates.length === 1;++ const isBatchCard = (id: string) => {++ const target = itemsById.get(id);++ return !!target && isBatchItem(target);++ };++ // Several operations renumbered by one drop go in ONE request. One++ // request per card meant one page reload per card, and the board++ // stuttered for seconds after the drop.++ const operationUpdates = commit.updates.filter(++ (update) => !isBatchCard(update.id)++ );++ if (operationUpdates.length > 1) {++ submit(++ {++ columnId: commit.columnId,++ updates: JSON.stringify(operationUpdates)++ },++ {++ method: "post",++ action: path.to.priorityOperationUpdate,++ navigate: false,++ // Not the card's own key: a later move of that card would++ // replace this fetcher and drop the other cards' pending order.++ fetcherKey: `reorder:${commit.columnId}`++ }++ );++ }+ for (const update of commit.updates) {+ const target = itemsById.get(update.id);++ if (operationUpdates.length > 1 && !isBatchCard(update.id)) {++ continue;++ }+ if (target && isBatchItem(target)) {submit({- intent: "update",- batchId: origin.item.batchId,- workCenterId: commit.columnId+ intent: "reprioritize",+ batchId: target.batchId,+ priority: update.priority},{method: "post",diff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/components/BatchItemCard.tsxindex da206b44e0,4015eeeabb..f483f09d1c--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/components/BatchItemCard.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/components/BatchItemCard.tsx@@@ -37,13 -40,16 +40,17 @@@ importimport { useFetcher } from "react-router";import { CustomerAvatar, OperationStatusIcon } from "~/components";import { ConfirmDelete } from "~/components/Modals";+import { MoveToSubmenu } from "~/components/MoveToSubmenu";import { useDateFormatter } from "~/hooks";import { path } from "~/utils/path";- import { KANBAN_CARD_SHELL } from "../cardShell";+ import {+ KANBAN_CARD_SHELL,+ type SortableCardProps,+ sortableCardProps+ } from "../cardShell";import { useKanban } from "../context/KanbanContext";+ import { DUE_URGENCY_BORDER, getBatchDueUrgency } from "../dueUrgency";import type { BatchItem, OperationItem } from "../types";- import { useScheduleToday } from "../useScheduleToday";import { CardMaterialChips, CardSummaryRows } from "./CardSummaryRows";// The order a batch summary reports its members' statuses in: the most "live"@@@ -79,17 -85,34 +86,34 @@@ function rollupStatus(members: Operatio// card's information design — the same display-setting rows (status, progress,// due date, customer, duration, materials) rolled up across members — rather// than dropping them; the member list sits beneath that summary.- export function BatchItemCard({- item,- isOverlay- }: {+ type BatchItemCardProps = {item: BatchItem;isOverlay?: boolean;- }) {+ };++ export function BatchItemCard(props: BatchItemCardProps) {+ const sortable = useSortable({+ id: props.item.id,+ data: { type: "item", item: props.item },+ attributes: { roleDescription: "item" },+ disabled: props.item.batchStatus === "Completing"+ });+ return <BatchItemCardBody {...props} {...sortableCardProps(sortable)} />;+ }++ const BatchItemCardBody = memo(function BatchItemCardBody({+ item,+ isOverlay,+ setNodeRef,+ attributes,+ listeners,+ transform,+ transition,+ isDragging+ }: BatchItemCardProps & SortableCardProps) {const { t } = useLingui();const { formatRelativeTime } = useDateFormatter();- const { displaySettings, moveTo } = useKanban();- const scheduleToday = useScheduleToday();- const { displaySettings, scheduleToday } = useKanban();++ const { displaySettings, scheduleToday, moveTo } = useKanban();const fetcher = useFetcher();const isCompleting = item.batchStatus === "Completing";// Planned = composed but not yet on the floor. Visually distinct (dasheddiff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/components/ItemCard.tsxindex 0a14638eaa,445cc750e5..33fa3c02bc--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/components/ItemCard.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/components/ItemCard.tsx@@@ -147,11 -145,60 +146,60 @@@ function OperationCard(transition,transform: CSS.Translate.toString(transform)};+ const urgency = getDueUrgency({ ...item, status }, scheduleToday);++ // This shell re-renders whenever the drop target changes; the body does+ // not. It is the expensive part (a form, avatars and menus per card), and+ // rendering every card's body on each change made a drag stutter.+ return (+ <Card+ ref={setNodeRef}+ style={style}+ className={cn(+ "group/card max-w-[330px]",+ cardVariants({+ dragging: isOverlay ? "overlay" : isDragging ? "over" : undefined,+ // @ts-expect-error TS2322 - TODO: fix type+ status: status,+ highlighted: isHighlighted+ }),+ urgency && DUE_URGENCY_BORDER[urgency]+ )}+ >+ <OperationCardBody+ item={item}+ itemProgress={itemProgress}+ isHighlighted={isHighlighted}+ attributes={attributes}+ listeners={listeners}+ />+ </Card>+ );+ }++ const OperationCardBody = memo(function OperationCardBody({+ item,+ itemProgress,+ isHighlighted,+ attributes,+ listeners+ }: {+ item: Exclude<Item, { batchId: string }>;+ itemProgress: Progress | undefined;+ isHighlighted: boolean;+ attributes: ReturnType<typeof useSortable>["attributes"];+ listeners: ReturnType<typeof useSortable>["listeners"];+ }) {+ const { t } = useLingui();+ const { formatRelativeTime } = useDateFormatter();- const { displaySettings, setSelectedGroup, tags, scheduleToday } =++ const { displaySettings, setSelectedGroup, tags, scheduleToday, moveTo } =+ useKanban();const isOverdue =- item.deadlineType !== "No Deadline" && item.dueDate- ? item.dueDate < scheduleToday- : false;+ item.deadlineType !== "ASAP" &&+ item.deadlineType !== "No Deadline" &&+ !!item.dueDate &&+ item.dueDate < scheduleToday;const projectedCompletionDate = item.projectedCompletionAt? item.projectedCompletionAt.slice(0, 10)diff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/components/JobCard.tsxindex 2afe48f9a2,be4f4ff9c4..ac43f7d23e--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/components/JobCard.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/components/JobCard.tsx@@@ -105,34 -121,24 +122,24 @@@ const JobCardBody = memo(function JobCaitem,locationId,isOverlay,- progressByItemId- }: JobCardProps) {+ progressByItemId,+ setNodeRef,+ attributes,+ listeners,+ transform,+ transition,+ isDragging+ }: JobCardProps & SortableCardProps) {const { t } = useLingui();const submit = useSubmit();- // biome-ignore lint/correctness/noUnusedVariables: suppressed due to migrationconst {displaySettings,selectedGroup,setSelectedGroup,columnIds,- scheduleToday++ scheduleToday,+ moveTo} = useKanban();- const {- setNodeRef,- attributes,- listeners,- transform,- transition,- isDragging- } = useSortable({- id: item.id,- data: {- type: "item",- item- },- attributes: {- roleDescription: "item"- }- });const isHighlighted = selectedGroup === item.jobReadableId;diff --cc apps/erp/app/modules/production/ui/Schedule/Kanban/context/KanbanContext.tsxindex 78c7f253cc,c56ecc9c07..e30e486ed5--- a/apps/erp/app/modules/production/ui/Schedule/Kanban/context/KanbanContext.tsx+++ b/apps/erp/app/modules/production/ui/Schedule/Kanban/context/KanbanContext.tsx@@@ -2,23 -2,20 +2,27 @@@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+ import { replaceEqualDeep } from "@tanstack/react-query";import type { ReactNode } from "react";- import { createContext, useContext } from "react";+ import { createContext, useContext, useMemo, useRef } from "react";import type { DisplaySettings } from "../types";+ import { useScheduleToday } from "../useScheduleToday";+/** Tap-to-move for a card (phones): its target columns and the drop's move. */+export type KanbanMoveTo = {+ targetsFor: (itemId: string) => { id: string; title: string }[];+ onMove: (itemId: string, columnId: string) => void;+};+interface KanbanContextType {displaySettings: DisplaySettings;selectedGroup: string | null;setSelectedGroup: (jobId: string | null) => void;tags: { name: string }[];columnIds?: string[];+ moveTo?: KanbanMoveTo;+ /** Today on the board's calendar; see `useScheduleToday`. */+ scheduleToday: string;}const KanbanContext = createContext<KanbanContextType | null>(null);@@@ -39,22 -35,38 +43,57 @@@ export function KanbanProvider(selectedGroup,setSelectedGroup,tags,- columnIds+ columnIds,+ moveTo}: KanbanProviderProps) {+ // Every card reads this context, so its value must change only when its+ // contents do. The board passes the display settings as a fresh object on+ // every render, and a reload hands over a new `tags` array.+ const stableSettings = useStable(displaySettings);+ const stableTags = useStable(tags);+ const stableColumnIds = useStable(columnIds);+ // Read once for the board. In each card it subscribed the card to the+ // router: every fetcher and revalidation state change re-rendered them all.+ const scheduleToday = useScheduleToday();++ // The board builds `moveTo` on every render; cards call it lazily (when the++ // menu opens or a target is picked), so read the latest one through a ref.++ const moveToRef = useRef(moveTo);++ moveToRef.current = moveTo;++ const hasMoveTo = !!moveTo;++ const stableMoveTo = useMemo<KanbanMoveTo | undefined>(++ () =>++ hasMoveTo++ ? {++ targetsFor: (itemId) => moveToRef.current?.targetsFor(itemId) ?? [],++ onMove: (itemId, columnId) =>++ moveToRef.current?.onMove(itemId, columnId)++ }++ : undefined,++ [hasMoveTo]++ );+ const value = useMemo(+ () => ({+ displaySettings: stableSettings,+ selectedGroup,+ setSelectedGroup,+ tags: stableTags,+ columnIds: stableColumnIds,++ moveTo: stableMoveTo,+ scheduleToday+ }),+ [+ stableSettings,+ selectedGroup,+ setSelectedGroup,+ stableTags,+ stableColumnIds,++ stableMoveTo,+ scheduleToday+ ]+ );+return (- <KanbanContext.Provider- value={{- displaySettings,- selectedGroup,- setSelectedGroup,- tags,- columnIds,- moveTo- }}- >- {children}- </KanbanContext.Provider>+ <KanbanContext.Provider value={value}>{children}</KanbanContext.Provider>);}diff --cc apps/erp/app/modules/purchasing/ui/Planning/PurchasingPlanningTable.tsxindex c885650c92,2a45b6c6b4..80877d7859--- a/apps/erp/app/modules/purchasing/ui/Planning/PurchasingPlanningTable.tsx+++ b/apps/erp/app/modules/purchasing/ui/Planning/PurchasingPlanningTable.tsx@@@ -442,26 -639,12 +640,24 @@@ const PlanningTable = memoheader: t`Supplier`,cell: ({ row }) => {const supplierId = suppliersMap[row.original.id];- const onHand = numberFormatter.format(row.original.quantityOnHand);- if (!supplierId)- return <Status color="red">{t`No Supplier`}</Status>;++ const onHand = formatQuantity(row.original.quantityOnHand);- return <SupplierAvatar supplierId={supplierId} />;+ // Phones: on hand follows the supplier on the row's second line.+ return (+ <div className="contents max-md:flex max-md:min-w-0 max-md:items-center max-md:gap-1.5">+ {supplierId ? (+ <SupplierAvatar supplierId={supplierId} />+ ) : (- <Status color="red">- <Trans>No Supplier</Trans>- </Status>++ <Status color="red">{t`No Supplier`}</Status>+ )}+ <span className="shrink-0 md:hidden">+ · <Trans>{onHand} on hand</Trans>+ </span>+ </div>+ );},meta: {+ mobile: "P3",filter: {type: "static",options: suppliers.map((supplier) => ({@@@ -697,36 -869,15 +886,32 @@@<Trans>Recalculate</Trans></Button></TooltipTrigger>- <TooltipContent>- <Trans>- MRP runs automatically every 3 hours, but you can run it- manually here.- </Trans>- </TooltipContent>+ <TooltipContent>{mrpScheduleDescription}</TooltipContent></Tooltip></mrpFetcher.Form>+ <p className="basis-full text-xs text-muted-foreground md:hidden">- <Trans>- MRP runs every 3 hours. To run it now, use ⋯ › Recalculate.- </Trans>++ {mrpScheduleDescription}+ </p></div>}+ mobileMenuItems={+ <DropdownMenuItem+ disabled={mrpFetcher.state !== "idle"}+ onSelect={() =>+ mrpFetcher.submit(+ {},+ { method: "post", action: path.to.api.mrp(locationId) }+ )+ }+ >+ <DropdownMenuIcon icon={<LuCirclePlay />} />+ <Trans>Recalculate</Trans>+ </DropdownMenuItem>+ }renderActions={renderActions}+ renderExpandedRow={renderExpandedRow}+ pinExpandedRows+ canExpandRow={canExpandRow}title={t`Material Planning`}table="planning"withSavedViewdiff --cc apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsxindex e051fd4e7e,8b7b829333..9371e35f6a--- a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsx@@@ -18,11 -17,10 +18,11 @@@ importTd,Tr,TruncatedTooltipText,+ useViewport,VStack} from "@carbon/react";- import { getItemReadableId } from "@carbon/utils";+ import { distinctItemText, getItemReadableId } from "@carbon/utils";-import { Trans } from "@lingui/react/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { motion } from "motion/react";import { useState } from "react";diff --cc apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsxindex 1c3d2d4402,4f650221d4..3b54c1c810--- a/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchasingRfq/PurchasingRFQLineForm.tsx@@@ -235,12 -247,25 +247,25 @@@ const PurchasingRFQLineForm = (<Hiddenname="inventoryUnitOfMeasureCode"value={- itemData?.inventoryUom || itemData?.purchaseUom || "EA"+ isService+ ? EACH_UNIT_OF_MEASURE_CODE+ : itemData?.inventoryUom || itemData?.purchaseUom || "EA"}/>+ {/* A service is always bought in EA, so no unit of measure+ or conversion factor is asked for. */}+ {isService && (+ <>+ <Hidden+ name="purchaseUnitOfMeasureCode"+ value={EACH_UNIT_OF_MEASURE_CODE}+ />+ <Hidden name="conversionFactor" value={1} />+ </>+ )}<VStack><div className="grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-3">- <div className="col-span-2 grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min">+ <div className="col-span-2 max-md:col-span-full grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min"><ItemautoFocusname="itemId"diff --cc apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteHeader.tsxindex 468cfc8d5e,dac3b1d0f9..9727243236--- a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteHeader.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteHeader.tsx@@@ -46,9 -53,8 +47,9 @@@ importLuTriangleAlert} from "react-icons/lu";import type { FetcherWithComponents } from "react-router";- import { useFetcher, useParams, useRevalidator } from "react-router";-import { Link, useFetcher, useParams } from "react-router";++import { useFetcher, useParams } from "react-router";import { usePanels } from "~/components/Layout";+import { RecordAction, RecordHeader } from "~/components/Layout/RecordHeader";import ConfirmDelete from "~/components/Modals/ConfirmDelete";import {usePermissions,diff --cc apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteLineForm.tsxindex 4a525fe726,5226105770..77685b00ad--- a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteLineForm.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteLineForm.tsx@@@ -297,11 -308,26 +308,26 @@@ const SupplierQuoteLineForm = (<Hidden name="supplierQuoteLineType" value={itemType} /><Hiddenname="inventoryUnitOfMeasureCode"- value={itemData?.inventoryUom}+ value={+ isService+ ? EACH_UNIT_OF_MEASURE_CODE+ : itemData?.inventoryUom+ }/>+ {/* A service is always bought in EA, so no unit of+ measure or conversion factor is asked for. */}+ {isService && (+ <>+ <Hidden+ name="purchaseUnitOfMeasureCode"+ value={EACH_UNIT_OF_MEASURE_CODE}+ />+ <Hidden name="conversionFactor" value={1} />+ </>+ )}<VStack><div className="grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-3">- <div className="col-span-2 grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min">+ <div className="col-span-2 max-md:col-span-full grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min"><ItemautoFocusname="itemId"diff --cc apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsxindex 647b753c9d,25689ed411..3427ceb2bf--- a/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsx+++ b/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsx@@@ -171,7 -167,9 +171,10 @@@ const ActionsTable = memo);},meta: {+ mobile: "P2",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/quality/ui/Calibrations/GaugeCalibrationRecordsTable.tsxindex 58db3ead06,46c504fc06..f8b6673956--- a/apps/erp/app/modules/quality/ui/Calibrations/GaugeCalibrationRecordsTable.tsx+++ b/apps/erp/app/modules/quality/ui/Calibrations/GaugeCalibrationRecordsTable.tsx@@@ -127,7 -126,9 +127,10 @@@ const GaugeCalibrationRecordsTable = me<DateTime value={item.getValue<string>()} variant="date" />),meta: {+ mobile: "P2",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/quality/ui/Gauge/GaugesTable.tsxindex d12e767e1a,a1bdaea24a..7d9c7f577d--- a/apps/erp/app/modules/quality/ui/Gauge/GaugesTable.tsx+++ b/apps/erp/app/modules/quality/ui/Gauge/GaugesTable.tsx@@@ -222,7 -218,9 +222,10 @@@ const GaugesTable = memo(({ data, types<DateTime value={row.original.nextCalibrationDate} variant="date" />),meta: {+ mobile: "P2",+ filter: {+ type: "dateRange"+ },icon: <LuCalendar />}},diff --cc apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsxindex 161fb3b7f4,a86f3e9f4e..126a5709b6--- a/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsx+++ b/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsx@@@ -9,13 -9,20 +9,22 @@@ importCardDescription,CardHeader,CardTitle,+ cn,Heading,HStack,+ RadioGroup,+ RadioGroupItem,+ Table,+ Tbody,+ Td,+ Th,+ Thead,+ Tr,TruncatedTooltipText,+ useViewport,VStack} from "@carbon/react";+ import { distinctItemText } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { motion } from "motion/react";@@@ -138,75 -136,6 +146,87 @@@ const LineItems = (}const selectedLine = selectedLines[line.id] || deselectedLine;- const lineTotal = getQuoteLineTotal(selectedLine);++ const lineTotal =++ (selectedLine.convertedNetUnitPrice ?? 0) *++ (selectedLine.quantity ?? 0) +++ (selectedLine.convertedAddOn ?? 0) +++ (selectedLine.convertedShippingCost ?? 0) +++ ((selectedLine.convertedNetUnitPrice ?? 0) *++ (selectedLine.quantity ?? 0) +++ (selectedLine.convertedTaxableAddOn ?? 0) +++ (selectedLine.convertedShippingCost ?? 0)) *++ (selectedLine.taxPercent ?? 0);+ // The quantity-break picker: a tap on the line opens it.+ const pricingOptions = (+ <motion.div+ initial="collapsed"+ animate={openItems.includes(line.id) ? "open" : "collapsed"}+ variants={{+ open: { opacity: 1, height: "auto", marginTop: 16 },+ collapsed: { opacity: 0, height: 0, marginTop: 0 }+ }}+ transition={{ duration: 0.3 }}+ className="w-full overflow-hidden"+ >+ <LinePricingOptions+ formatter={formatter}+ line={line}+ options={pricingByLine[line.id!]}+ quoteCurrency={routeData?.quote.currencyCode ?? "USD"}+ quoteExchangeRate={routeData?.quote.exchangeRate ?? 1}+ shouldConvertCurrency={shouldConvertCurrency}+ locale={locale}+ selectedLine={selectedLine}- setSelectedLines={setSelectedLines}++ onSelectQuantity={onSelectQuantity}+ />+ </motion.div>+ );++ // Phones: a text row (no image or Edit link); the line page opens+ // from the Lines tab.+ if (isPhone) {+ return (+ <div key={line.id} className="w-full">+ <SummaryLineRow+ expanded={openItems.includes(line.id)}+ onClick={() => toggleOpen(line.id!)}+ title={line.itemReadableId}+ value={+ <MotionMoney+ value={lineTotal}+ currency={currencyCode}+ decimalPlaces={currencyDecimals}+ />+ }+ trailing={+ <motion.span+ className="self-center text-muted-foreground"+ animate={{ rotate: openItems.includes(line.id) ? 90 : 0 }}+ transition={{ duration: 0.3 }}+ >+ <LuChevronRight className="size-4" />+ </motion.span>+ }- description={line.description}++ description={distinctItemText(++ line.itemReadableId,++ line.description++ )}+ meta={+ selectedLine.quantity > 0 ? (+ <>+ {selectedLine.quantity} ×{" "}+ {formatter.format(+ selectedLine.convertedNetUnitPrice ?? 0+ )}{" "}+ {line.unitOfMeasureCode}+ </>+ ) : null+ }+ />+ {pricingOptions}+ </div>+ );+ }return (<motion.div@@@ -252,7 -181,18 +272,8 @@@</HStack><HStack spacing={4}><MotionMoney+ className="font-semibold text-xl whitespace-nowrap"- value={- (selectedLine.convertedNetUnitPrice ?? 0) *- (selectedLine.quantity ?? 0) +- (selectedLine.convertedAddOn ?? 0) +- (selectedLine.convertedShippingCost ?? 0) +- ((selectedLine.convertedNetUnitPrice ?? 0) *- (selectedLine.quantity ?? 0) +- (selectedLine.convertedTaxableAddOn ?? 0) +- (selectedLine.convertedShippingCost ?? 0)) *- (selectedLine.taxPercent ?? 0)- }+ value={lineTotal}currency={currencyCode}decimalPlaces={currencyDecimals}/>diff --cc apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderHeader.tsxindex 5acc6b1793,8ec7524af8..0a0441d600--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderHeader.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderHeader.tsx@@@ -35,10 -38,14 +35,11 @@@ importLuCirclePlus,LuCircleStop,LuCreditCard,- LuEllipsisVertical,LuEye,LuFile,+ LuFileText,LuGitCompare,LuLoaderCircle,- LuPanelLeft,- LuPanelRight,LuTrash,LuTruck,LuUndo2@@@ -274,185 -293,191 +289,199 @@@ const SalesOrderHeader = () =>routeData?.salesOrder?.salesOrderId]);+ // Phones lead the action bar with the control the desktop highlights for+ // this status, with Invoice beside Ship when both are due.+ const orderStatus = routeData?.salesOrder?.status ?? "";+ const isDraft = orderStatus === "Draft";+ const isShipStep = ["To Ship", "To Ship and Invoice"].includes(orderStatus);+ const isInvoiceStep = ["To Invoice", "To Ship and Invoice"].includes(+ orderStatus+ );+ const confirmSlot = isDraft ? "primary" : "overflow";+ const shipSlot = isShipStep ? "primary" : "overflow";+ const invoiceSlot = !isInvoiceStep+ ? "overflow"+ : isShipStep+ ? "secondary"+ : "primary";++ const menuItems = (+ <>+ {auditLogTrigger}+ <DropdownMenuSeparator />+ <DropdownMenuItem+ disabled={+ !["To Ship and Invoice", "To Ship"].includes(+ routeData?.salesOrder?.status ?? ""+ ) ||+ !permissions.can("create", "production") ||+ !permissions.is("employee") ||+ !linesRequireJobs+ }+ onClick={salesOrderToJobsModal.onOpen}+ >+ <DropdownMenuIcon icon={<LuGitCompare />} />+ <Trans>Convert Lines to Jobs</Trans>+ </DropdownMenuItem>++ <DropdownMenuItem++ disabled={++ ["Cancelled", "Closed"].includes(++ routeData?.salesOrder?.status ?? ""++ ) ||++ contractEligibleLines.length === 0 ||++ !permissions.can("create", "sales") ||++ !permissions.is("employee")++ }++ onClick={salesOrderToContractModal.onOpen}++ >++ <DropdownMenuIcon icon={<LuFileText />} />++ <Trans>Create Contract</Trans>++ </DropdownMenuItem>+ <DropdownMenuItem asChild>+ <CSVLink+ data={csvExportData}+ filename={`${routeData?.salesOrder?.salesOrderId}.csv`}+ >+ <DropdownMenuIcon icon={<LuFile />} />+ <Trans>Export Lines to CSV</Trans>+ </CSVLink>+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ disabled={+ ["Draft"].includes(routeData?.salesOrder?.status ?? "") ||+ statusFetcher.state !== "idle" ||+ !permissions.can("update", "sales")+ }+ onClick={() => {+ statusFetcher.submit(+ { status: "Draft" },+ {+ method: "post",+ action: path.to.salesOrderStatus(orderId)+ }+ );+ }}+ >+ <DropdownMenuIcon icon={<LuLoaderCircle />} />+ <Trans>Reopen</Trans>+ </DropdownMenuItem>+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.delete}+ destructive+ disabled={+ isLocked ||+ !permissions.can("delete", "sales") ||+ !permissions.is("employee")+ }+ onClick={deleteSalesOrderModal.onOpen}+ >+ <DropdownMenuIcon icon={<LuTrash />} />+ <Trans>Delete Sales Order</Trans>+ </DropdownMenuItem>+ </>+ );+ const statusBadges = (+ <>+ <SalesStatus+ status={routeData?.salesOrder?.status}+ jobs={+ routeData?.salesOrder?.jobs as Array<{+ salesOrderLineId: string;+ productionQuantity: number;+ quantityComplete: number;+ status: string;+ }>+ }+ lines={+ routeData?.salesOrder?.lines as Array<{+ id: string;+ methodType:+ | "Purchase to Order"+ | "Make to Order"+ | "Pull from Inventory";+ saleQuantity: number;+ }>+ }+ />+ </>+ );return (<>- <div className="flex flex-shrink-0 items-center justify-between gap-x-4 p-2 bg-card border-b h-[var(--header-height)] overflow-x-auto scrollbar-hide">- <HStack className="w-full justify-between">- <HStack>- <IconButton- aria-label={t`Toggle Explorer`}- icon={<LuPanelLeft />}- onClick={toggleExplorer}- variant="ghost"- />- <Link to={path.to.salesOrderDetails(orderId)}>- <Heading size="h4" className="flex items-center gap-2">- <span>{routeData?.salesOrder?.salesOrderId}</span>- </Heading>- </Link>- <Copy text={routeData?.salesOrder?.salesOrderId ?? ""} />- <DropdownMenu>- <DropdownMenuTrigger asChild>- <IconButton- aria-label={t`More options`}- icon={<LuEllipsisVertical />}- variant="secondary"- size="sm"- />- </DropdownMenuTrigger>- <DropdownMenuContent>- {auditLogTrigger}- <DropdownMenuSeparator />- <DropdownMenuItem- disabled={- !["To Ship and Invoice", "To Ship"].includes(- routeData?.salesOrder?.status ?? ""- ) ||- !permissions.can("create", "production") ||- !permissions.is("employee") ||- !linesRequireJobs- }- onClick={salesOrderToJobsModal.onOpen}- >- <DropdownMenuIcon icon={<LuGitCompare />} />- <Trans>Convert Lines to Jobs</Trans>- </DropdownMenuItem>- <DropdownMenuItem- disabled={- ["Cancelled", "Closed"].includes(- routeData?.salesOrder?.status ?? ""- ) ||- contractEligibleLines.length === 0 ||- !permissions.can("create", "sales") ||- !permissions.is("employee")- }- onClick={salesOrderToContractModal.onOpen}- >- <DropdownMenuIcon icon={<LuFileText />} />- <Trans>Create Contract</Trans>- </DropdownMenuItem>- <DropdownMenuItem asChild>- <CSVLink- data={csvExportData}- filename={`${routeData?.salesOrder?.salesOrderId}.csv`}- >- <DropdownMenuIcon icon={<LuFile />} />- <Trans>Export Lines to CSV</Trans>- </CSVLink>- </DropdownMenuItem>- <DropdownMenuSeparator />- <DropdownMenuItem- disabled={- ["Draft"].includes(routeData?.salesOrder?.status ?? "") ||- statusFetcher.state !== "idle" ||- !permissions.can("update", "sales")- }- onClick={() => {- statusFetcher.submit(- { status: "Draft" },- {- method: "post",- action: path.to.salesOrderStatus(orderId)- }- );- }}- >- <DropdownMenuIcon icon={<LuLoaderCircle />} />- <Trans>Reopen</Trans>- </DropdownMenuItem>- <DropdownMenuItem- shortcut={MENU_ITEM_SHORTCUTS.delete}- destructive- disabled={- isLocked ||- !permissions.can("delete", "sales") ||- !permissions.is("employee")- }- onClick={deleteSalesOrderModal.onOpen}- >- <DropdownMenuIcon icon={<LuTrash />} />- <Trans>Delete Sales Order</Trans>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- <SalesStatus- status={routeData?.salesOrder?.status}- jobs={- routeData?.salesOrder?.jobs as Array<{- salesOrderLineId: string;- productionQuantity: number;- quantityComplete: number;- status: string;- }>- }- lines={- routeData?.salesOrder?.lines as Array<{- id: string;- methodType:- | "Purchase to Order"- | "Make to Order"- | "Pull from Inventory";- saleQuantity: number;- }>- }- />- </HStack>- <HStack>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button- leftIcon={<LuEye />}- variant="secondary"- rightIcon={<LuChevronDown />}- >- <Trans>Preview</Trans>- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent>- <DropdownMenuItem asChild>- <a- target="_blank"- href={path.to.file.salesOrder(orderId)}- rel="noreferrer"+ <RecordHeader+ title={routeData?.salesOrder?.salesOrderId}+ titleTo={path.to.salesOrderDetails(orderId)}+ copyValue={routeData?.salesOrder?.salesOrderId ?? ""}+ menu={menuItems}+ status={statusBadges}+ subtitle={routeData?.customer?.name ?? undefined}+ onToggleExplorer={toggleExplorer}+ onToggleProperties={toggleProperties}+ actions={+ <>+ <RecordAction slot="icon">+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ leftIcon={<LuEye />}+ variant="secondary"+ rightIcon={<LuChevronDown />}>- <DropdownMenuIcon icon={<LuFile />} />- <Trans>PDF</Trans>- </a>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>+ <Trans>Preview</Trans>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ <DropdownMenuItem asChild>+ <a+ target="_blank"+ href={path.to.file.salesOrder(orderId)}+ rel="noreferrer"+ >+ <DropdownMenuIcon icon={<LuFile />} />+ <Trans>PDF</Trans>+ </a>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </RecordAction>- <Button- leftIcon={<LuCheckCheck />}- variant={- routeData?.salesOrder?.status === "Draft"- ? "primary"- : "secondary"- }- onClick={confirmDisclosure.onOpen}- isDisabled={- !["Draft", "Needs Approval"].includes(- routeData?.salesOrder?.status ?? ""- ) ||- routeData?.lines.length === 0 ||- !permissions.can("update", "sales")- }- >- <Trans>Confirm</Trans>- </Button>+ <RecordAction slot={confirmSlot}>+ <Button+ leftIcon={<LuCheckCheck />}+ variant={isDraft ? "primary" : "secondary"}+ onClick={confirmDisclosure.onOpen}+ isDisabled={+ !["Draft", "Needs Approval"].includes(+ routeData?.salesOrder?.status ?? ""+ ) ||+ routeData?.lines.length === 0 ||+ !permissions.can("update", "sales")+ }+ >+ <Trans>Confirm</Trans>+ </Button>+ </RecordAction>- <Button- variant="secondary"- leftIcon={<LuCircleStop />}- onClick={cancelDisclosure.onOpen}- isDisabled={- ["Cancelled", "Closed", "Completed", "Invoiced"].includes(- routeData?.salesOrder?.status ?? ""- ) ||- statusFetcher.state !== "idle" ||- !permissions.can("update", "sales")- }- isLoading={- statusFetcher.state !== "idle" &&- statusFetcher.formData?.get("status") === "Cancelled"- }- >- <Trans>Cancel</Trans>- </Button>+ <RecordAction slot="overflow">+ <Button+ variant="secondary"+ leftIcon={<LuCircleStop />}+ onClick={cancelDisclosure.onOpen}+ isDisabled={+ ["Cancelled", "Closed", "Completed", "Invoiced"].includes(+ routeData?.salesOrder?.status ?? ""+ ) ||+ statusFetcher.state !== "idle" ||+ !permissions.can("update", "sales")+ }+ isLoading={+ statusFetcher.state !== "idle" &&+ statusFetcher.formData?.get("status") === "Cancelled"+ }+ >+ <Trans>Cancel</Trans>+ </Button>+ </RecordAction><Suspensefallback={diff --cc apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsxindex 75e27daf1b,fc45079db6..31cbff2d8f--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsx@@@ -401,42 -375,6 +405,47 @@@ function LineItems();};+ // Phones: one row per line that opens the line page (its Edit link, the+ // badges and the breakdown stay on desktop).+ if (isPhone) {+ return (+ <div className="flex w-full flex-col divide-y divide-border">+ {lines.map((line) =>+ line.id ? (+ <SummaryLineRow+ key={line.id}+ to={path.to.salesOrderLine(orderId, line.id)}+ title={+ line.salesOrderLineType === "Fixed Asset"+ ? line.assetReadableId || t`Fixed Asset`+ : line.itemReadableId+ }+ value={+ <MotionMoney+ value={getSalesOrderLineTotal(line)}+ currency={currencyCode}+ decimalPlaces={currencyDecimals}+ />+ }- description={line.description}++ description={distinctItemText(++ line.salesOrderLineType === "Fixed Asset"++ ? line.assetReadableId || t`Fixed Asset`++ : line.itemReadableId,++ line.description++ )}+ meta={+ <>+ {line.saleQuantity} × {formatter.format(line.unitPrice ?? 0)}{" "}+ {line.unitOfMeasureCode}+ </>+ }+ />+ ) : null+ )}+ </div>+ );+ }+return (<VStack spacing={8} className="w-full overflow-hidden">{lines.map((line) => {@@@ -481,17 -424,10 +495,13 @@@children need w-full because VStack is items-start, whichsizes each child to its own content and leaves truncateinert no matter how narrow the column gets. */}- <div className="flex items-center justify-between w-full">- <VStack spacing={0} className="flex-1 min-w-0">+ <div className="flex items-center justify-between w-full max-md:flex-wrap max-md:gap-y-2">+ <VStack+ spacing={0}+ className="flex-1 min-w-0 max-md:basis-full"+ ><HStack spacing={2} className="flex min-w-0 w-full">- <Heading className="truncate">- {line.salesOrderLineType === "Fixed Asset"- ? (line as any).assetReadableId || "Fixed Asset"- : line.itemReadableId}- </Heading>+ <Heading className="truncate">{title}</Heading><ButtonasChildvariant="link"@@@ -516,7 -454,15 +528,8 @@@><HStack spacing={4}><MotionMoney+ className="font-semibold text-xl whitespace-nowrap"- value={- ((line?.convertedUnitPrice ?? 0) *- (line?.saleQuantity ?? 0) +- (line?.convertedAddOnCost ?? 0) +- (line?.convertedShippingCost ?? 0)) *- (1 + (line?.taxPercent ?? 0)) +- (line?.convertedNonTaxableAddOnCost ?? 0)- }+ value={getSalesOrderLineTotal(line)}currency={currencyCode}decimalPlaces={currencyDecimals}/>diff --cc apps/erp/app/modules/sales/ui/SalesRFQ/SalesRFQLineForm.tsxindex e0be3fddb3,8ef1f16ad9..0cbde156b5--- a/apps/erp/app/modules/sales/ui/SalesRFQ/SalesRFQLineForm.tsx+++ b/apps/erp/app/modules/sales/ui/SalesRFQ/SalesRFQLineForm.tsx@@@ -264,9 -274,10 +274,10 @@@ const SalesRFQLineForm = (name="modelUploadId"value={itemData.modelUploadId ?? undefined}/>+ {isService && <Hidden name="unitOfMeasureCode" value="EA" />}<VStack><div className="grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-3">- <div className="col-span-2 grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min">+ <div className="col-span-2 max-md:col-span-full grid w-full gap-x-8 gap-y-4 grid-cols-1 lg:grid-cols-2 auto-rows-min"><InputControlledname="customerPartId"label={t`Customer Part Number`}diff --cc apps/erp/app/modules/workflows/ui/Runs/WorkflowRunSteps.tsxindex ad2c27e8e3,97b2cc5004..49a7cdfb60--- a/apps/erp/app/modules/workflows/ui/Runs/WorkflowRunSteps.tsx+++ b/apps/erp/app/modules/workflows/ui/Runs/WorkflowRunSteps.tsx@@@ -176,8 -179,8 +179,8 @@@ function StepRow(<div className="border-b border-border/50"><buttontype="button"- className="w-full flex items-center gap-3 py-3 px-3 hover:bg-muted/50 transition-colors text-left"+ className="w-full flex items-center gap-3 py-3 px-3 hover:bg-muted/50 transition-colors text-left max-md:flex-wrap max-md:gap-y-1"- onClick={() => hasDetail && setExpanded((p) => !p)}+ onClick={() => hasDetail && setToggled(!expanded)}disabled={!hasDetail}>{hasDetail ? (diff --cc apps/erp/app/routes/x+/account+/_layout.tsxindex 065ee6053e,1f6138d846..0b86188332--- a/apps/erp/app/routes/x+/account+/_layout.tsx+++ b/apps/erp/app/routes/x+/account+/_layout.tsx@@@ -2,12 -2,11 +2,12 @@@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.- import { VStack } from "@carbon/react";+ import { RecordOutlet, VStack } from "@carbon/react";import { msg } from "@lingui/core/macro";import type { MetaFunction } from "react-router";- import { Outlet } from "react-router";+import { GroupedContentSidebar } from "~/components/Layout";+import { SettingsPage } from "~/components/SettingsPage";import useAccountSubmodules from "~/modules/account/ui/useAccountSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";@@@ -36,9 -35,9 +36,9 @@@ export default function AccountRoute()spacing={0}className="overflow-y-auto scrollbar-hide h-[calc(100dvh-var(--topbar-height)-var(--content-inset))]">- <VStack spacing={4} className="py-12 px-4 max-w-[60rem] h-full mx-auto">+ <SettingsPage>- <Outlet />+ <RecordOutlet />- </VStack>+ </SettingsPage></VStack>);}diff --cc apps/erp/app/routes/x+/accounting+/asset-classes.tsxindex f8e0a3bfc6,b0688fae05..0a31a3dfcc--- a/apps/erp/app/routes/x+/accounting+/asset-classes.tsx+++ b/apps/erp/app/routes/x+/accounting+/asset-classes.tsx@@@ -3,17 -3,11 +3,13 @@@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";- import { Button, useViewport, VStack } from "@carbon/react";- import { isUnaffectedByNavigation } from "@carbon/utils";-import { Button, RecordOutlet, VStack } from "@carbon/react";++import { Button, RecordOutlet, useViewport, VStack } from "@carbon/react";import { msg } from "@lingui/core/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { LuCirclePlus } from "react-icons/lu";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useNavigate } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useNavigate } from "react-router";+import { New } from "~/components";import { usePermissions } from "~/hooks";import { getFixedAssetClasses } from "~/modules/accounting";import { AssetClassesTable } from "~/modules/accounting/ui/FixedAssets";@@@ -88,12 -71,12 +79,12 @@@ export default function AssetClassesRouvariant="primary"onClick={() => navigate(path.to.newAssetClass)}>- Add Asset Class+ <Trans>Add Asset Class</Trans></Button>- )+ ))}/>- <Outlet />+ <RecordOutlet /></VStack>);}diff --cc apps/erp/app/routes/x+/accounting+/cost-centers.tsxindex 75f39f2bf0,d6ee92abb4..f893de35ce--- a/apps/erp/app/routes/x+/accounting+/cost-centers.tsx+++ b/apps/erp/app/routes/x+/accounting+/cost-centers.tsx@@@ -7,23 -7,21 +7,21 @@@ import { requirePermissions } from "@caimport { flash } from "@carbon/auth/session.server";import { getApprovalRulesForApprover } from "@carbon/ee/approvals.server";import {- Heading,HStack,+ RecordOutlet,Tabs,TabsContent,TabsList,TabsTrigger} from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";-import { useLingui } from "@lingui/react/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { useCallback } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useNavigate } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useNavigate } from "react-router";import { New } from "~/components";+import { SettingsPageHeading } from "~/components/SettingsPage";import { getCostCentersTree } from "~/modules/accounting";import {CostCentersListView,diff --cc apps/erp/app/routes/x+/accounting+/fixed-assets.tsxindex 9a5ece1abc,f640e2c997..38618c8b9a--- a/apps/erp/app/routes/x+/accounting+/fixed-assets.tsx+++ b/apps/erp/app/routes/x+/accounting+/fixed-assets.tsx@@@ -3,17 -3,11 +3,13 @@@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";- import { Button, useViewport, VStack } from "@carbon/react";- import { isUnaffectedByNavigation } from "@carbon/utils";-import { Button, RecordOutlet, VStack } from "@carbon/react";++import { Button, RecordOutlet, useViewport, VStack } from "@carbon/react";import { msg } from "@lingui/core/macro";+import { useLingui } from "@lingui/react/macro";import { LuCirclePlus } from "react-icons/lu";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useNavigate } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useNavigate } from "react-router";+import { New } from "~/components";import { usePermissions } from "~/hooks";import { getFixedAssetClassesList, getFixedAssets } from "~/modules/accounting";import { FixedAssetsTable } from "~/modules/accounting/ui/FixedAssets";@@@ -94,10 -77,10 +85,10 @@@ export default function FixedAssetsRout>Add Fixed Asset</Button>- )+ ))}/>- <Outlet />+ <RecordOutlet /></VStack>);}diff --cc apps/erp/app/routes/x+/accounting+/journals.tsxindex 74e4e63d49,339f0eff38..aa047c3d19--- a/apps/erp/app/routes/x+/accounting+/journals.tsx+++ b/apps/erp/app/routes/x+/accounting+/journals.tsx@@@ -3,17 -3,11 +3,13 @@@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";- import { Button, VStack } from "@carbon/react";- import { isUnaffectedByNavigation } from "@carbon/utils";+ import { Button, RecordOutlet, VStack } from "@carbon/react";import { msg } from "@lingui/core/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { LuCirclePlus } from "react-icons/lu";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useFetcher, useLoaderData } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useFetcher, useLoaderData } from "react-router";+import { NewAction } from "~/components/New";import { usePermissions } from "~/hooks";import { getJournalEntries } from "~/modules/accounting";import { JournalEntriesTable } from "~/modules/accounting/ui/JournalEntries";diff --cc apps/erp/app/routes/x+/consumable+/$itemId.tsxindex 43d05d8a45,ae1a0b0660..04ec84b945--- a/apps/erp/app/routes/x+/consumable+/$itemId.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.tsx@@@ -5,16 -5,12 +5,13 @@@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";- import { useRouteData } from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { RecordOutlet, useRouteData } from "@carbon/react";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Await, Outlet, useLoaderData, useParams } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { Await, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import type { ConsumableSummary, ItemFile } from "~/modules/items";import {diff --cc apps/erp/app/routes/x+/credits+/new.tsxindex 8a51be4713,77fc447c28..253b420fec--- a/apps/erp/app/routes/x+/credits+/new.tsx+++ b/apps/erp/app/routes/x+/credits+/new.tsx@@@ -6,11 -6,18 +6,19 @@@ import { assertIsPost, error, successimport { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+ import {+ Card,+ CardContent,+ CardDescription,+ CardHeader,+ CardTitle+ } from "@carbon/react";import { datetime, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+ import { Trans } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import { useLoaderData } from "react-router";+import { NewRecordPage } from "~/components/NewRecordPage";import { MemoForm, memoValidator, upsertMemo } from "~/modules/invoicing";import { getCompany, getNextSequence } from "~/modules/settings";import { getCompanyTimeZone } from "~/modules/shared/timezone.server";@@@ -120,12 -127,39 +128,39 @@@ export async function action({ requestexport default function NewMemoRoute() {const { initialValues, type } = useLoaderData<typeof loader>();+ const isVendor = type === "supplierCredit";return (- <div className="max-w-4xl w-full p-2 sm:p-0 mx-auto mt-0 md:mt-8">+ <NewRecordPage>- <MemoForm- initialValues={initialValues}- type={type === "supplierCredit" ? "supplierCredit" : "creditMemo"}- />+ <Card>+ <CardHeader>+ <CardTitle>+ {isVendor ? (+ <Trans>New Supplier Credit</Trans>+ ) : (+ <Trans>New Credit Memo</Trans>+ )}+ </CardTitle>+ <CardDescription>+ {isVendor ? (+ <Trans>+ Record a credit from a supplier — it reduces what you owe them.+ Applications to specific invoices are added after it is created.+ </Trans>+ ) : (+ <Trans>+ Record a credit memo for a customer — it reduces what they owe.+ Applications to specific invoices are added after it is created.+ </Trans>+ )}+ </CardDescription>+ </CardHeader>+ <CardContent className="@container">+ <MemoForm+ initialValues={initialValues}+ type={isVendor ? "supplierCredit" : "creditMemo"}+ />+ </CardContent>+ </Card>- </div>+ </NewRecordPage>);}diff --cc apps/erp/app/routes/x+/customer+/$customerId.tsxindex 3bb31595a5,cd9569000b..6806eab08b--- a/apps/erp/app/routes/x+/customer+/$customerId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.tsx@@@ -80,15 -72,12 +72,15 @@@ export default function CustomerRoute(<><CustomerHeader /><div- className={cn("grid grid-cols-1 h-full w-full gap-4", {- "md:grid-cols-[1fr_4fr]": isEmployee- })}+ className={cn(+ "grid grid-cols-1 h-full w-full gap-4 max-md:h-auto max-md:gap-0",+ {+ "md:grid-cols-[1fr_4fr]": isEmployee+ }+ )}>{isEmployee && <CustomerSidebar />}- <Outlet />+ <RecordOutlet /></div></>);diff --cc apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsxindex 521e748a5a,a2caf2d6b9..0a3cecf68e--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsx@@@ -9,20 -10,11 +10,17 @@@ importResizableHandle,ResizablePanel,ScrollArea,+ useViewport,VStack} from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { redirect } from "@carbon/utils";+import { useLingui } from "@lingui/react/macro";+import { useMemo } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData } from "react-router";+import { useSetAppBarOverride } from "~/components/Layout/Mobile";+import { RecordHero } from "~/components/Layout/RecordHeader";+import { useUrlParams } from "~/hooks";import InventoryItemHeader from "~/modules/inventory/ui/Inventory/InventoryItemHeader";import { getItem, getPickMethod, upsertPickMethod } from "~/modules/items";import { resolveLocationId } from "~/modules/shared/location.server";@@@ -138,8 -101,8 +131,8 @@@ export default function ItemInventoryRo// @ts-expect-erroritemType={item.type}/>- <VStack className="p-2">+ <VStack className="p-2 max-md:p-4">- <Outlet />+ <RecordOutlet /></VStack></ScrollArea></ResizablePanel>diff --cc apps/erp/app/routes/x+/items+/change-notice+/$id.tsxindex 6d2b42ac22,84a7df655f..70f40d26ed--- a/apps/erp/app/routes/x+/items+/change-notice+/$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id.tsx@@@ -7,14 -7,11 +7,12 @@@ import { requirePermissions } from "@caimport { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { RecordOutlet } from "@carbon/react";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+import { useLingui } from "@lingui/react/macro";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useParams } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getChangeNotice,diff --cc apps/erp/app/routes/x+/job+/$jobId.tsxindex baede00742,860d644c78..11868587af--- a/apps/erp/app/routes/x+/job+/$jobId.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.tsx@@@ -6,15 -6,13 +6,13 @@@ import { error } from "@carbon/auth"import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { activeJobStatuses } from "@carbon/database";- import { datetime, isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { RecordOutlet } from "@carbon/react";+ import { datetime, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";-import { Trans } from "@lingui/react/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { Suspense, useMemo } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Await, Outlet, useLoaderData, useParams } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { Await, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { ExplorerSkeleton } from "~/components/Skeletons";import { flattenTree } from "~/components/TreeView";diff --cc apps/erp/app/routes/x+/job+/new.tsxindex 739725ff7b,1feaac4197..180ef647b8--- a/apps/erp/app/routes/x+/job+/new.tsx+++ b/apps/erp/app/routes/x+/job+/new.tsx@@@ -9,11 -9,19 +9,20 @@@ import { flash } from "@carbon/auth/sesimport { validationError, validator } from "@carbon/form";import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";- import type { ActionFunctionArgs } from "react-router";+ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";+ import { useLoaderData } from "react-router";+import { NewRecordPage } from "~/components/NewRecordPage";import { useUrlParams, useUser } from "~/hooks";+ import {+ CONSTRUCTION_IN_PROGRESS_ENABLED,+ getFixedAssets+ } from "~/modules/accounting";import { getUnreleasedChangeOrderIssue } from "~/modules/items/items.server";- import { insertJob, jobValidator } from "~/modules/production";+ import {+ insertJob,+ jobValidator,+ makeToAssetItemError+ } from "~/modules/production";import { JobForm } from "~/modules/production/ui/Jobs";import type { MethodItemType } from "~/modules/shared";import { requireCompanyRecord } from "~/modules/shared/shared.server";@@@ -136,8 -222,12 +223,12 @@@ export default function JobNewRoute()};return (- <div className="max-w-4xl w-full p-2 sm:p-0 mx-auto mt-0 md:mt-8">+ <NewRecordPage>- <JobForm initialValues={initialValues} />+ <JobForm+ initialValues={initialValues}+ fixedAssetClasses={fixedAssetClasses}+ underConstructionAssets={underConstructionAssets}+ />- </div>+ </NewRecordPage>);}diff --cc apps/erp/app/routes/x+/maintenance+/$dispatchId.tsxindex 778279683f,847e6990b7..9697143e82--- a/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsx+++ b/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsx@@@ -7,15 -7,11 +7,12 @@@ import { requirePermissions } from "@caimport { flash } from "@carbon/auth/session.server";import { storage } from "@carbon/files";import type { JSONContent } from "@carbon/react";- import { VStack } from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { RecordOutlet, VStack } from "@carbon/react";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+import { useLingui } from "@lingui/react/macro";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useParams } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import RiskRegisterCard from "~/modules/quality/ui/RiskRegister/RiskRegisterCard";import {diff --cc apps/erp/app/routes/x+/material+/$itemId.tsxindex 9efe056cdd,b3b4e83fd4..bd3c2bb3e0--- a/apps/erp/app/routes/x+/material+/$itemId.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.tsx@@@ -5,16 -5,12 +5,13 @@@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";- import { useRouteData } from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { RecordOutlet, useRouteData } from "@carbon/react";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Await, Outlet, useLoaderData, useParams } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { Await, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import type { ItemFile, MaterialSummary } from "~/modules/items";import {diff --cc apps/erp/app/routes/x+/payments+/new.tsxindex 166afa35e8,5c3d66def0..25f944a2f5--- a/apps/erp/app/routes/x+/payments+/new.tsx+++ b/apps/erp/app/routes/x+/payments+/new.tsx@@@ -348,13 -379,31 +380,31 @@@ export async function action({ request}export default function NewPaymentRoute() {- const { initialValues, seedInvoiceIds } = useLoaderData<typeof loader>();+ const { initialValues, seedInvoiceIds, depositDocuments } =+ useLoaderData<typeof loader>();return (- <div className="max-w-4xl w-full p-2 sm:p-0 mx-auto mt-0 md:mt-8">+ <NewRecordPage>- <PaymentForm- initialValues={initialValues}- seedInvoiceIds={seedInvoiceIds}- />+ <Card>+ <CardHeader>+ <CardTitle>+ <Trans>New Payment</Trans>+ </CardTitle>+ <CardDescription>+ <Trans>+ Record a customer payment, supplier payment, refund, or employee+ reimbursement. Applications to invoices, memos or reimbursements+ are added after the payment is created.+ </Trans>+ </CardDescription>+ </CardHeader>+ <CardContent className="@container">+ <PaymentForm+ initialValues={initialValues}+ seedInvoiceIds={seedInvoiceIds}+ depositDocuments={depositDocuments}+ />+ </CardContent>+ </Card>- </div>+ </NewRecordPage>);}diff --cc apps/erp/app/routes/x+/people+/departments.tsxindex 9bf30fc42a,ac3a21fdfd..5727c9d190--- a/apps/erp/app/routes/x+/people+/departments.tsx+++ b/apps/erp/app/routes/x+/people+/departments.tsx@@@ -19,23 -20,18 +20,20 @@@ importTabs,TabsContent,TabsList,- TabsTrigger+ TabsTrigger,+ useViewport} from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useState } from "react";import { BsThreeDotsVertical } from "react-icons/bs";-import { LuDownload } from "react-icons/lu";+import { LuDownload, LuEllipsis } from "react-icons/lu";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useNavigate } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useNavigate } from "react-router";import { New } from "~/components";import { ImportCSVModal } from "~/components/ImportCSVModal";+import { AppBarActions } from "~/components/Layout/Mobile";import { getDepartmentsTree } from "~/modules/people";import {DepartmentsListView,diff --cc apps/erp/app/routes/x+/priority+/_layout.tsxindex 229d34693b,80aeab2aa4..14bd257af6--- a/apps/erp/app/routes/x+/priority+/_layout.tsx+++ b/apps/erp/app/routes/x+/priority+/_layout.tsx@@@ -2,10 -2,10 +2,10 @@@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+ import { RecordOutlet } from "@carbon/react";import { msg } from "@lingui/core/macro";import type { MetaFunction } from "react-router";- import { Outlet } from "react-router";-+import { ProductionSections } from "~/modules/production/ui/useProductionSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --cc apps/erp/app/routes/x+/priority+/dates.tsxindex 95b1cefe3b,eaa52145b0..a4529edb0b--- a/apps/erp/app/routes/x+/priority+/dates.tsx+++ b/apps/erp/app/routes/x+/priority+/dates.tsx@@@ -24,10 -24,9 +24,10 @@@ importSpinner,Switch,useLocalStorage,+ useViewport,VStack} from "@carbon/react";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { redirect } from "@carbon/utils";import {endOfMonth,endOfWeek,@@@ -578,18 -570,15 +571,20 @@@ function DateKanbanSchedule()const [searchParams] = useSearchParams();const [items, setItems] = useState<JobItem[]>(initialItems);+ // Phones keep their own settings and start without the product image, so+ // more than one card fits on a screen; the Thumbnail toggle still applies.+ const { isPhone } = useViewport();const [displaySettings, setDisplaySettings] = useLocalStorage(- DISPLAY_SETTINGS_KEY,- defaultDisplaySettings+ isPhone ? `${DISPLAY_SETTINGS_KEY}-compact` : DISPLAY_SETTINGS_KEY,+ isPhone+ ? { ...defaultDisplaySettings, showThumbnail: false }+ : defaultDisplaySettings);+ // A reload hands over new objects for every card. Keeping the ones that did+ // not change lets their memoized cards skip the render.useEffect(() => {- setItems(initialItems);+ setItems((previous) => replaceEqualDeep(previous, initialItems));}, [initialItems]);const sortItems = useCallback((items: JobItem[]) => {diff --cc apps/erp/app/routes/x+/priority+/operations.tsxindex f1aff6484e,6a91a14d63..509cc3e4ed--- a/apps/erp/app/routes/x+/priority+/operations.tsx+++ b/apps/erp/app/routes/x+/priority+/operations.tsx@@@ -24,10 -24,8 +24,9 @@@ importuseInterval,useLocalStorage,useMount,+ useViewport,VStack} from "@carbon/react";- import { isUnaffectedByNavigation } from "@carbon/utils";import {getLocalTimeZone,now,diff --cc apps/erp/app/routes/x+/procedure+/$id.tsxindex 40259d9047,32267a81a1..ae74bb6fef--- a/apps/erp/app/routes/x+/procedure+/$id.tsx+++ b/apps/erp/app/routes/x+/procedure+/$id.tsx@@@ -7,9 -7,9 +7,14 @@@ import { requirePermissions } from "@caimport { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";- import { generateHTML, useDebounce, useHydrated } from "@carbon/react";-import { generateHTML, RecordOutlet, useDebounce } from "@carbon/react";++import {++ generateHTML,++ RecordOutlet,++ useDebounce,++ useHydrated++} from "@carbon/react";import { Editor } from "@carbon/react/Editor";- import { isUnaffectedByNavigation, redirect } from "@carbon/utils";+ import { redirect } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";diff --cc apps/erp/app/routes/x+/production+/_index.tsxindex 8114821746,fbf7518c69..ece5a49257--- a/apps/erp/app/routes/x+/production+/_index.tsx+++ b/apps/erp/app/routes/x+/production+/_index.tsx@@@ -812,7 -809,10 +812,10 @@@ function WorkCenterCards(return (<Cardkey={workCenter.id}- className="p-0 h-[300px] col-span-6 max-md:col-span-full lg:col-span-3 xl:col-span-2"+ className={cn(- "p-0 h-[300px] col-span-6 lg:col-span-3 xl:col-span-2",++ "p-0 h-[300px] col-span-6 max-md:col-span-full lg:col-span-3 xl:col-span-2",+ isBlocked && "bg-red-100 dark:bg-red-900/50"+ )}><HStackclassName={cn(diff --cc apps/erp/app/routes/x+/production+/planning.tsxindex 17675dbc94,e90eb7be69..c20576bb65--- a/apps/erp/app/routes/x+/production+/planning.tsx+++ b/apps/erp/app/routes/x+/production+/planning.tsx@@@ -25,8 -33,9 +33,10 @@@ import { getGenericQueryFilters } fromconst WEEKS_TO_PLAN = 12 * 4;+ const logger = getLogger("erp", "production", "planning");+export const handle: Handle = {+ appBarSubtitle: msg`Production`,realtime: ["job"],breadcrumb: msg`Material Planning`,to: path.to.productionPlanningdiff --cc apps/erp/app/routes/x+/purchasing+/planning.tsxindex f0477b67f2,d361ac2a55..77cc6d0ac5--- a/apps/erp/app/routes/x+/purchasing+/planning.tsx+++ b/apps/erp/app/routes/x+/purchasing+/planning.tsx@@@ -25,8 -33,9 +33,10 @@@ import { getGenericQueryFilters } fromconst WEEKS_TO_PLAN = 12 * 4;+ const logger = getLogger("erp", "purchasing", "planning");+export const handle: Handle = {+ appBarSubtitle: msg`Purchasing`,breadcrumb: msg`Material Planning`,to: path.to.purchasingPlanning};diff --cc apps/erp/app/routes/x+/scheduling+/_layout.tsxindex f7bd89be0d,87ecbfcea4..bb8c767958--- a/apps/erp/app/routes/x+/scheduling+/_layout.tsx+++ b/apps/erp/app/routes/x+/scheduling+/_layout.tsx@@@ -2,10 -2,10 +2,10 @@@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+ import { RecordOutlet } from "@carbon/react";import { msg } from "@lingui/core/macro";import type { MetaFunction } from "react-router";- import { Outlet } from "react-router";-+import { ProductionSections } from "~/modules/production/ui/useProductionSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --cc apps/erp/app/routes/x+/service+/new.tsxindex 51de251232,5155b65731..21e83fdded--- a/apps/erp/app/routes/x+/service+/new.tsx+++ b/apps/erp/app/routes/x+/service+/new.tsx@@@ -10,9 -10,9 +10,10 @@@ import { redirect } from "@carbon/utilsimport { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";import { data } from "react-router";+import { NewRecordPage } from "~/components/NewRecordPage";import { serviceValidator, upsertService } from "~/modules/items";import { ServiceForm } from "~/modules/items/ui/Services";+ import { getDatabaseClient } from "~/services/database.server";import { setCustomFields } from "~/utils/form";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --cc apps/erp/app/routes/x+/settings+/audit-logs.tsxindex 6de1e78f90,92e7440286..023bcbb5f4--- a/apps/erp/app/routes/x+/settings+/audit-logs.tsx+++ b/apps/erp/app/routes/x+/settings+/audit-logs.tsx@@@ -16,22 -16,19 +16,14 @@@ import} from "@carbon/ee/audit.server";import { requireFeature } from "@carbon/ee/plan.server";import { getLogger } from "@carbon/logger";- import { Button, ScrollArea } from "@carbon/react";--import {- isUnaffectedByNavigation,- redirect,- redirectExternal- } from "@carbon/utils";- Button,- Heading,- RecordOutlet,- ScrollArea,- VStack-} from "@carbon/react";++import { Button, RecordOutlet, ScrollArea } from "@carbon/react";+ import { redirect, redirectExternal } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuHistory } from "react-icons/lu";- import type {- ActionFunctionArgs,- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Link, Outlet, useLoaderData } from "react-router";+ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";+ import { Link, useLoaderData } from "react-router";+import { SettingsPage, SettingsPageHeading } from "~/components/SettingsPage";import { usePlanGate } from "~/hooks/usePlanGate";import { AuditLogSettings, AuditLogUpgradeOverlay } from "~/modules/settings";import type { Handle } from "~/utils/handle";@@@ -232,8 -229,8 +221,8 @@@ export default function AuditLogRoute(archives={archives}controlled={controlled}/>- {enabled && <Outlet />}+ {enabled && <RecordOutlet />}- </VStack>+ </SettingsPage></ScrollArea>);}diff --cc apps/erp/app/routes/x+/settings+/companies.tsxindex d58c834218,57d2f219a9..252b8e0b80--- a/apps/erp/app/routes/x+/settings+/companies.tsx+++ b/apps/erp/app/routes/x+/settings+/companies.tsx@@@ -7,27 -7,21 +7,21 @@@ import { requirePermissions } from "@caimport { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import {- Heading,HStack,+ RecordOutlet,Tabs,TabsContent,TabsList,TabsTrigger} from "@carbon/react";- import {- isInternalEmail,- isUnaffectedByNavigation,- redirect- } from "@carbon/utils";+ import { isInternalEmail, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";-import { useLingui } from "@lingui/react/macro";+import { Trans, useLingui } from "@lingui/react/macro";import { useCallback } from "react";- import type {- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Outlet, useLoaderData, useNavigate } from "react-router";+ import type { LoaderFunctionArgs } from "react-router";+ import { useLoaderData, useNavigate } from "react-router";import { New } from "~/components";+import { SettingsPageHeading } from "~/components/SettingsPage";import { getSubsidiaries } from "~/modules/settings";import {CompaniesListView,diff --cc apps/erp/app/routes/x+/settings+/demo-data.tsxindex 1b3c68e7b9,aa46af0706..f8ffade089--- a/apps/erp/app/routes/x+/settings+/demo-data.tsx+++ b/apps/erp/app/routes/x+/settings+/demo-data.tsx@@@ -7,13 -7,13 +7,14 @@@ import { assertIsPost, error } from "@cimport { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { DATASETS, datasetKeys } from "@carbon/database/datasets";+ import { useRevalidator } from "@carbon/query";-import { Heading, toast, VStack } from "@carbon/react";+import { toast, VStack } from "@carbon/react";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { useEffect, useMemo, useRef, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";- import { data, useFetcher, useLoaderData, useRevalidator } from "react-router";+ import { data, useFetcher, useLoaderData } from "react-router";+import { SettingsPageHeading } from "~/components/SettingsPage";import type { CompanyTemplateRun } from "~/modules/settings";import { getCompanyTemplateRun } from "~/modules/settings";import { purgeCorruptedRows } from "~/modules/settings/backups.server";diff --cc apps/erp/app/routes/x+/settings+/printing.tsxindex 6068a59a88,cb216d550d..62038ac6fd--- a/apps/erp/app/routes/x+/settings+/printing.tsx+++ b/apps/erp/app/routes/x+/settings+/printing.tsx@@@ -16,18 -16,19 +16,14 @@@ importupsertPrinterRoute} from "@carbon/printing";import { invalidatePrinterCache } from "@carbon/printing/printing.server";- import { Button, ScrollArea } from "@carbon/react";- import { isUnaffectedByNavigation, labelSizes, redirect } from "@carbon/utils";-import {- Button,- Heading,- RecordOutlet,- ScrollArea,- VStack-} from "@carbon/react";++import { Button, RecordOutlet, ScrollArea } from "@carbon/react";+ import { labelSizes, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuPrinter } from "react-icons/lu";- import type {- ActionFunctionArgs,- LoaderFunctionArgs,- ShouldRevalidateFunction- } from "react-router";- import { Link, Outlet, useLoaderData } from "react-router";+ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";+ import { Link, useLoaderData } from "react-router";+import { SettingsPage, SettingsPageHeading } from "~/components/SettingsPage";import { getLocationsList, getWorkCentersList } from "~/modules/resources";import { getCompanySettings, printerRouteValidator } from "~/modules/settings";import { AssignmentsCard, PrintersCard } from "~/modules/settings/ui/Printing";@@@ -265,8 -266,8 +258,8 @@@ export default function PrintingSettinglocations={locations}workCenters={workCenters}/>- </VStack>+ </SettingsPage>- <Outlet />+ <RecordOutlet /></ScrollArea>);}diff --cc apps/erp/app/routes/x+/settings+/purchasing.tsxindex f9f75fc92d,80363e616d..90348f4c40--- a/apps/erp/app/routes/x+/settings+/purchasing.tsx+++ b/apps/erp/app/routes/x+/settings+/purchasing.tsx@@@ -38,8 -39,8 +38,9 @@@ import { useFetcher, useLoaderData } frimport CompanyDefaultAttachmentsCard from "~/components/CompanyDefaultAttachmentsCard";import { EmailRecipients, Users } from "~/components/Form";import Country from "~/components/Form/Country";+import { SettingsPage, SettingsPageHeading } from "~/components/SettingsPage";import SettingsSectionHeader from "~/components/SettingsSectionHeader";+ import { useSavedToggle } from "~/hooks/useSavedToggle";import {accountsPayableBillingAddressValidator,defaultSupplierCcValidator,diff --cc apps/erp/app/routes/x+/settings+/quality.tsxindex 146402c7da,44a44397dd..3dc5d113ec--- a/apps/erp/app/routes/x+/settings+/quality.tsx+++ b/apps/erp/app/routes/x+/settings+/quality.tsx@@@ -35,8 -36,8 +35,9 @@@ import type { ActionFunctionArgs, Loadeimport { useFetcher, useLoaderData } from "react-router";import { z } from "zod";import { Users } from "~/components/Form";+import { SettingsPage, SettingsPageHeading } from "~/components/SettingsPage";import SettingsSectionHeader from "~/components/SettingsSectionHeader";+ import { useSavedToggle } from "~/hooks/useSavedToggle";import { getCompanySettings } from "~/modules/settings";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --cc apps/erp/app/routes/x+/settings+/sales.tsxindex b07aa30010,3d5ccf5793..b3f12be97c--- a/apps/erp/app/routes/x+/settings+/sales.tsx+++ b/apps/erp/app/routes/x+/settings+/sales.tsx@@@ -35,15 -34,11 +33,12 @@@ import { Trans, useLingui } from "@lingimport { useCallback, useEffect, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import { useFetcher, useLoaderData } from "react-router";- import { EmailRecipients, Users } from "~/components/Form";- import Country from "~/components/Form/Country";+ import { Users } from "~/components/Form";+import { SettingsPage, SettingsPageHeading } from "~/components/SettingsPage";import SettingsSectionHeader from "~/components/SettingsSectionHeader";+ import { useSavedToggle } from "~/hooks/useSavedToggle";import {- accountsReceivableBillingAddressValidator,- defaultCustomerCcValidator,digitalQuoteValidator,- getAccountsReceivableBillingAddress,getCompanySettings,quoteLineCategoryMarkupsSettingsValidator,rfqReadyValidator,diff --cc apps/erp/app/routes/x+/supplier+/$supplierId.tsxindex af5bd2182d,fe6b398f91..b47f5e215f--- a/apps/erp/app/routes/x+/supplier+/$supplierId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.tsx@@@ -94,9 -87,9 +87,9 @@@ export default function SupplierRoute(return (<><SupplierHeader />- <div className="grid grid-cols-1 md:grid-cols-[1fr_4fr] h-full w-full gap-4">+ <div className="grid grid-cols-1 md:grid-cols-[1fr_4fr] h-full w-full gap-4 max-md:h-auto max-md:gap-0"><SupplierSidebar />- <Outlet />+ <RecordOutlet /></div></>);diff --cc apps/erp/app/routes/x+/traceability+/_layout.tsxindex c8e4fc40e8,022c7b92ad..3344ebd64c--- a/apps/erp/app/routes/x+/traceability+/_layout.tsx+++ b/apps/erp/app/routes/x+/traceability+/_layout.tsx@@@ -2,10 -2,10 +2,10 @@@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+ import { RecordOutlet } from "@carbon/react";import { msg } from "@lingui/core/macro";import type { MetaFunction } from "react-router";- import { Outlet } from "react-router";-+import { InventorySections } from "~/modules/inventory";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --cc apps/erp/app/routes/x+/warehouse-transfer+/new.tsxindex 90bfbab374,8ce6a72fcc..028b10b716--- a/apps/erp/app/routes/x+/warehouse-transfer+/new.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/new.tsx@@@ -6,10 -6,11 +6,12 @@@ import { assertIsPost, error } from "@cimport { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+ import { Card, CardContent, CardHeader, Heading } from "@carbon/react";import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";+ import { Trans } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";+import { NewRecordPage } from "~/components/NewRecordPage";import { useUser } from "~/hooks";import {insertWarehouseTransfer,@@@ -88,8 -89,18 +90,18 @@@ export default function WarehouseTransf};return (- <div className="max-w-4xl w-full p-2 sm:p-0 mx-auto mt-0 md:mt-8">+ <NewRecordPage>- <WarehouseTransferForm initialValues={initialValues} />+ <Card>+ <CardHeader>+ <Heading as="h1" size="h3" className="font-sans">+ <Trans>New Warehouse Transfer</Trans>+ </Heading>+ </CardHeader>+ {/* The form's field grid follows its container's width. */}+ <CardContent className="@container">+ <WarehouseTransferForm initialValues={initialValues} />+ </CardContent>+ </Card>- </div>+ </NewRecordPage>);}diff --cc apps/mes/app/components/AssemblyView.tsxindex 65a9ab096c,876ed27f21..6c5069877d--- a/apps/mes/app/components/AssemblyView.tsx+++ b/apps/mes/app/components/AssemblyView.tsx@@@ -45,10 -45,9 +45,10 @@@ importuseKeyboardWedge,useMode,useRouteData,- useShortcutKeys+ useShortcutKeys,+ useViewport} from "@carbon/react";- import { formatDurationMilliseconds } from "@carbon/utils";+ import { distinctItemText, formatDurationMilliseconds } from "@carbon/utils";import type {AssemblyStep,CameraPose,diff --cc apps/mes/app/components/JobOperation/JobOperation.tsxindex abc3266b7c,d7c3738d5b..17b4ca1acf--- a/apps/mes/app/components/JobOperation/JobOperation.tsx+++ b/apps/mes/app/components/JobOperation/JobOperation.tsx@@@ -720,472 -783,358 +721,483 @@@ export const JobOperation = (/>) : null;- return (- <>- <Tabs- key={`operation-${operation.id}`}- value={tab}- onValueChange={setActiveTab}- // An application shell, not a page: a grid of named areas where each- // pane scrolls on its own, so nothing is positioned or sized by hand.- // Below lg the dock is a bottom action bar; from lg it is a column- // beside the workspace and status bar. The outlet frame is only- // min-height bounded (other MES screens page-scroll), so the shell takes- // the viewport itself, less the frame's md:my-2 inset.- className="grid h-svh md:h-[calc(100svh-1rem)] min-h-0 w-full min-w-0 bg-card grid-cols-[minmax(0,1fr)] grid-rows-[auto_auto_auto_minmax(0,1fr)_auto_auto] [grid-template-areas:'header'_'context'_'sep'_'main'_'status'_'dock'] lg:grid-cols-[minmax(0,1fr)_auto] lg:grid-rows-[auto_auto_auto_minmax(0,1fr)_auto] lg:[grid-template-areas:'header_header'_'context_context'_'sep_sep'_'main_dock'_'status_dock']"+ // Labelled meters: 1 row of up to 4 on a phone, then as many columns as fit.+ // Phones show them in the Details scroll pane, so only 1 bar stays pinned.+ const meters = (+ <div className="grid gap-y-2 max-md:grid-flow-col max-md:auto-cols-[minmax(0,1fr)] max-md:gap-x-2 md:grid-cols-[repeat(auto-fit,minmax(180px,1fr))] md:gap-x-6">+ {(+ [+ {+ type: "setup",+ label: t`Setup`,+ elapsed: progress.setup,+ planned: displayOperation.setupDuration+ },+ {+ type: "labor",+ label: t`Labor`,+ elapsed: progress.labor,+ planned: displayOperation.laborDuration+ },+ {+ type: "machine",+ label: t`Machine`,+ elapsed: progress.machine,+ planned: displayOperation.machineDuration+ }+ ] as const+ )+ .filter((meter) => meter.planned > 0)+ .map((meter) => {+ // A batch with no planned time anywhere carries a 1ms+ // placeholder plan (so ratios never divide by zero). That is+ // not a plan: show elapsed time alone over an empty track.+ const hasPlan = meter.planned > 1;+ const elapsed = formatDurationMilliseconds(meter.elapsed, {+ style: "short"+ });+ return (+ <BarProgress+ key={meter.type}+ label={meter.label}+ value={+ hasPlan+ ? `${elapsed} / ${formatDurationMilliseconds(meter.planned, {+ style: "short"+ })}`+ : elapsed+ }+ gradient+ invertGradient+ stackOnPhone+ progress={hasPlan ? (meter.elapsed / meter.planned) * 100 : 0}+ activeClassName={+ meter.elapsed > meter.planned ? "bg-red-500" : "bg-emerald-500"+ }+ />+ );+ })}+ <BarProgress+ stackOnPhone+ label={isBatched ? t`Batch quantity` : t`Quantity`}+ value={`${quantityProgress.complete} / ${quantityProgress.target}`}+ segments={[+ {+ value: quantityProgress.complete,+ className: "bg-emerald-500"+ },+ {+ value: quantityProgress.reworked,+ className: "bg-yellow-500"+ },+ {+ value: quantityProgress.scrapped,+ className: "bg-red-500"+ }+ ]}+ max={quantityProgress.target || 1}+ progress={+ (quantityProgress.complete / (quantityProgress.target || 1)) * 100+ }+ />+ </div>+ );++ // The job ⋮ menu: in the context row from md, in the app bar on phones.+ const renderJobMenu = ({+ className,+ size,+ align+ }: {+ className?: string;+ size?: "lg";+ align: "start" | "end";+ }) => (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <IconButton+ aria-label={t`More options`}+ variant="ghost"+ size={size}+ className={className}+ icon={<LuEllipsisVertical />}+ />+ </DropdownMenuTrigger>+ <DropdownMenuContent align={align}>+ {scope === "job" && (+ <DropdownMenuItem asChild>+ <a+ href={path.to.file.jobTraveler(operation.jobMakeMethodId)}+ target="_blank"+ rel="noreferrer"+ >+ <DropdownMenuIcon icon={<LuQrCode />} />+ <Trans>Job Traveler</Trans>+ </a>+ </DropdownMenuItem>+ )}+ {scope === "job" && (+ <DropdownMenuItem asChild>- <Link to={path.to.jobDetail(operation.jobId)}>++ <Link++ to={++ // A subassembly's operation opens its own make method,++ // not the job header.++ operation.parentMaterialId++ ? path.to.jobMakeMethodDetail(++ operation.jobId,++ operation.jobMakeMethodId++ )++ : path.to.jobDetail(operation.jobId)++ }++ >+ <DropdownMenuIcon icon={<LuCirclePlay />} />+ <Trans>Job Details</Trans>+ </Link>+ </DropdownMenuItem>+ )}+ {scope === "batch" && batch && (+ <DropdownMenuItem asChild>+ <a+ href={path.to.batchDetail(batch.id as string)}+ target="_blank"+ rel="noreferrer"+ >+ <DropdownMenuIcon icon={<LuLayers />} />+ <Trans>Batch Details</Trans>+ </a>+ </DropdownMenuItem>+ )}+ {scope === "batch" && batch && (+ <DropdownMenuItem asChild>+ <a+ href={path.to.file.batchList(batch.id as string)}+ target="_blank"+ rel="noreferrer"+ >+ <DropdownMenuIcon icon={<LuPrinter />} />+ <Trans>Print batch list</Trans>+ </a>+ </DropdownMenuItem>+ )}+ {item && (scope === "job" || batchFacts?.items.length === 1) && (+ <DropdownMenuItem asChild>+ <Link to={path.to.itemMaster(item?.id, item.type)}>+ <DropdownMenuIcon+ icon={<MethodItemTypeIcon type={item.type} />}+ />+ <Trans>Item Master</Trans>+ </Link>+ </DropdownMenuItem>+ )}+ </DropdownMenuContent>+ </DropdownMenu>+ );++ // The job, customer, status and due row. Phones on the Details tab render+ // it inside the scrolling pane, so it scrolls away with the content.+ const renderContextRow = (className: string) => (+ <div+ className={cn(+ "flex shrink-0 flex-wrap lg:flex-nowrap items-center justify-start px-4 lg:pl-6 py-2 min-h-[var(--header-height)] bg-card gap-x-2 gap-y-1 md:gap-x-4 w-full min-w-0",+ className+ )}+ >+ <HStack+ className={cn(+ "min-w-22 shrink-0 justify-between",+ !batch && "max-md:hidden"+ )}>- <header className="[grid-area:header] flex h-[var(--header-height)] shrink-0 items-center gap-2 border-b px-2">- <HStack className="w-full justify-between">- <div className="flex items-center gap-0">- <SidebarTrigger />-- <Button- variant="ghost"- leftIcon={<LuChevronLeft />}- onClick={() => navigate(path.to.operations)}- className="pl-2"- >- <Trans>Schedule</Trans>- </Button>- </div>- <div className="flex min-w-0 items-center gap-2 overflow-x-auto scrollbar-hide scroll-fade-x">- <TabsList className="ml-auto shrink-0">- <TabsTrigger value="details">- <Trans>Details</Trans>- </TabsTrigger>- <TabsTrigger- disabled={!job.modelPath && !operation.itemModelPath}- value="model"- >- <Trans>Model</Trans>- </TabsTrigger>- <TabsTrigger value="procedure">- <Trans>Instructions</Trans>- </TabsTrigger>- {/* Notes are kept per job operation — on the batch there is no- one thread to show, so Chat opens from a job. */}- <TabsTrigger value="chat" disabled={scope === "batch"}>- <Trans>Chat</Trans>- </TabsTrigger>- </TabsList>- </div>- </HStack>- </header>-- <div className="[grid-area:context] flex shrink-0 flex-wrap lg:flex-nowrap items-center justify-start px-4 lg:pl-6 py-2 min-h-[var(--header-height)] bg-card gap-x-2 gap-y-1 md:gap-x-4 w-full min-w-0">- <HStack className="min-w-22 shrink-0 justify-between">- {batch ? (- // One control for "which part of the batch am I looking at":- // the batch, this job, or (via the chevron) another member job.- <div className="flex shrink-0 items-center rounded-full border bg-card p-0.5 text-sm">+ {batch ? (+ // One control for "which part of the batch am I looking at":+ // the batch, this job, or (via the chevron) another member job.+ <div className="flex shrink-0 items-center rounded-full border bg-card p-0.5 text-sm">+ <button+ type="button"+ aria-pressed={scope === "batch"}+ aria-label={t`Whole batch`}+ onClick={() => setParams({ scope: "" })}+ className={cn(+ "flex items-center gap-1.5 rounded-full px-3 py-1 transition-[background-color,color,transform] active:scale-[0.98]",+ scope === "batch"+ ? "bg-accent text-foreground"+ : "text-muted-foreground hover:text-foreground"+ )}+ >+ <LuLayers className="size-3.5" />+ <span className="font-medium tabular-nums">+ {batch.readableId}+ </span>+ <span className="opacity-60">+ {t`${(batch.operations ?? []).length} jobs`}+ </span>+ {isCompleting && (+ <Badge variant="yellow" className="ml-0.5">+ <Trans>Completing</Trans>+ </Badge>+ )}+ </button>+ <DropdownMenu>+ <DropdownMenuTrigger asChild><buttontype="button"- aria-pressed={scope === "batch"}- aria-label={t`Whole batch`}- onClick={() => setParams({ scope: "" })}+ aria-pressed={scope === "job"}+ aria-label={t`Choose a job`}className={cn(- "flex items-center gap-1.5 rounded-full px-3 py-1 transition-[background-color,color,transform] active:scale-[0.98]",- scope === "batch"+ "flex items-center gap-1 rounded-full py-1 pl-3 pr-2 font-medium transition-[background-color,color,transform] active:scale-[0.98]",+ scope === "job"? "bg-accent text-foreground": "text-muted-foreground hover:text-foreground")}>- <LuLayers className="size-3.5" />- <span className="font-medium tabular-nums">- {batch.readableId}- </span>- <span className="opacity-60">- {t`${(batch.operations ?? []).length} jobs`}- </span>- {isCompleting && (- <Badge variant="yellow" className="ml-0.5">- <Trans>Completing</Trans>- </Badge>+ {scope === "job" ? (+ operation.jobReadableId+ ) : (+ <Trans>Jobs</Trans>)}+ <LuChevronDown className="size-3.5" /></button>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <button- type="button"- aria-pressed={scope === "job"}- aria-label={t`Choose a job`}- className={cn(- "flex items-center gap-1 rounded-full py-1 pl-3 pr-2 font-medium transition-[background-color,color,transform] active:scale-[0.98]",- scope === "job"- ? "bg-accent text-foreground"- : "text-muted-foreground hover:text-foreground"- )}- >- {scope === "job" ? (- operation.jobReadableId- ) : (- <Trans>Jobs</Trans>- )}- <LuChevronDown className="size-3.5" />- </button>- </DropdownMenuTrigger>- <DropdownMenuContent align="start" className="min-w-[240px]">- <DropdownMenuLabel>- <Trans>Open a job in this batch</Trans>- </DropdownMenuLabel>- <DropdownMenuSeparator />- {[...(batch.operations ?? [])]- .sort((a, b) =>- (- (a.job as { jobId?: string | null } | null)?.jobId ??- ""- ).localeCompare(- (b.job as { jobId?: string | null } | null)?.jobId ??- "",- undefined,- { numeric: true }- )- )- .map((member) => {- const isOpen =- scope === "job" && member.id === operation.id;- return (- <DropdownMenuItem key={member.id} asChild>- <Link- to={`${path.to.operation(member.id)}?scope=job`}- >- <DropdownMenuIcon- icon={- isOpen ? (- <LuCheck className="text-emerald-500" />- ) : (- <LuClipboardCheck />- )- }- />- <span className="truncate">- {(- member.job as { jobId?: string | null } | null- )?.jobId ?? member.id}- {member.jobMakeMethod?.item- ?.readableIdWithRevision- ? ` — ${member.jobMakeMethod.item.readableIdWithRevision}`- : ""}- </span>- </Link>- </DropdownMenuItem>- );- })}- </DropdownMenuContent>- </DropdownMenu>- </div>- ) : (- <Heading size="h4">{operation.jobReadableId}</Heading>- )}-- <DropdownMenu>- <DropdownMenuTrigger asChild>- <IconButton- aria-label="More options"- variant="ghost"- icon={<LuEllipsisVertical />}- /></DropdownMenuTrigger>- <DropdownMenuContent align="start">- {scope === "job" && (- <DropdownMenuItem asChild>- <a- href={path.to.file.jobTraveler(operation.jobMakeMethodId)}- target="_blank"- rel="noreferrer"- >- <DropdownMenuIcon icon={<LuQrCode />} />- <Trans>Job Traveler</Trans>- </a>- </DropdownMenuItem>- )}- {scope === "job" && (- <DropdownMenuItem asChild>- <Link- to={- // A subassembly's operation opens its own make method,- // not the job header.- operation.parentMaterialId- ? path.to.jobMakeMethodDetail(- operation.jobId,- operation.jobMakeMethodId- )- : path.to.jobDetail(operation.jobId)- }- >- <DropdownMenuIcon icon={<LuCirclePlay />} />- <Trans>Job Details</Trans>- </Link>- </DropdownMenuItem>- )}- {scope === "batch" && batch && (- <DropdownMenuItem asChild>- <a- href={path.to.batchDetail(batch.id as string)}- target="_blank"- rel="noreferrer"- >- <DropdownMenuIcon icon={<LuLayers />} />- <Trans>Batch Details</Trans>- </a>- </DropdownMenuItem>- )}- {scope === "batch" && batch && (- <DropdownMenuItem asChild>- <a- href={path.to.file.batchList(batch.id as string)}- target="_blank"- rel="noreferrer"- >- <DropdownMenuIcon icon={<LuPrinter />} />- <Trans>Print batch list</Trans>- </a>- </DropdownMenuItem>- )}- {item &&- (scope === "job" || batchFacts?.items.length === 1) && (- <DropdownMenuItem asChild>- <Link to={path.to.itemMaster(item?.id, item.type)}>- <DropdownMenuIcon- icon={<MethodItemTypeIcon type={item.type} />}- />- <Trans>Item Master</Trans>- </Link>- </DropdownMenuItem>- )}+ <DropdownMenuContent align="start" className="min-w-[240px]">+ <DropdownMenuLabel>+ <Trans>Open a job in this batch</Trans>+ </DropdownMenuLabel>+ <DropdownMenuSeparator />+ {[...(batch.operations ?? [])]+ .sort((a, b) =>+ (+ (a.job as { jobId?: string | null } | null)?.jobId ?? ""+ ).localeCompare(+ (b.job as { jobId?: string | null } | null)?.jobId ?? "",+ undefined,+ { numeric: true }+ )+ )+ .map((member) => {+ const isOpen =+ scope === "job" && member.id === operation.id;+ return (+ <DropdownMenuItem key={member.id} asChild>+ <Link to={`${path.to.operation(member.id)}?scope=job`}>+ <DropdownMenuIcon+ icon={+ isOpen ? (+ <LuCheck className="text-emerald-500" />+ ) : (+ <LuClipboardCheck />+ )+ }+ />+ <span className="truncate">+ {(member.job as { jobId?: string | null } | null)+ ?.jobId ?? member.id}+ {member.jobMakeMethod?.item?.readableIdWithRevision+ ? ` — ${member.jobMakeMethod.item.readableIdWithRevision}`+ : ""}+ </span>+ </Link>+ </DropdownMenuItem>+ );+ })}</DropdownMenuContent></DropdownMenu>- </HStack>+ </div>+ ) : (+ <Heading size="h4" className="max-md:hidden">+ {operation.jobReadableId}+ </Heading>+ )}- <HStack className="flex w-full lg:w-auto min-w-0 lg:flex-1 justify-start lg:justify-end items-center gap-3 overflow-x-auto lg:overflow-hidden scrollbar-hide scroll-fade-x [&>*]:shrink-0 lg:[&>*]:shrink">- {scope === "batch" && batchFacts- ? batchFacts.customers.length > 0 && (- <HStack className="min-w-0 justify-start space-x-2">- <LuSquareUser className="text-muted-foreground shrink-0" />- <span className="text-sm truncate">- {batchFacts.customers.length === 1- ? batchFacts.customers[0]- : t`${batchFacts.customers.length} customers`}- </span>- </HStack>- )- : job.customer?.name && (- <HStack className="min-w-0 justify-start space-x-2">- <LuSquareUser className="text-muted-foreground shrink-0" />- <span className="text-sm truncate">- {job.customer.name}- </span>- </HStack>- )}- {operation.description && (- <HStack className="min-w-0 justify-start space-x-2">- <LuClipboardCheck className="text-muted-foreground shrink-0" />+ {renderJobMenu({ className: "max-md:hidden", align: "start" })}+ </HStack>++ <HStack className="flex w-full lg:w-auto min-w-0 lg:flex-1 justify-start lg:justify-end items-center gap-3 overflow-x-auto lg:overflow-hidden scrollbar-hide scroll-fade-x [&>*]:shrink-0 lg:[&>*]:shrink max-md:flex-wrap max-md:overflow-visible max-md:gap-y-1 max-md:mask-none max-md:[&>*]:shrink">+ {scope === "batch" && batchFacts+ ? batchFacts.customers.length > 0 && (+ <HStack className="min-w-0 justify-start space-x-2 max-md:order-3">+ <LuSquareUser className="text-muted-foreground shrink-0" /><span className="text-sm truncate">- {operation.description}+ {batchFacts.customers.length === 1+ ? batchFacts.customers[0]+ : t`${batchFacts.customers.length} customers`}</span></HStack>- )}- {scope === "batch" && batch ? (- <HStack className="min-w-0 shrink-0 justify-start space-x-2">- <LuLayers className="text-muted-foreground shrink-0" />- <span className="text-sm truncate">- {isCompleting ? t`Completing` : t`Released`}- </span>+ )+ : job.customer?.name && (+ <HStack className="min-w-0 justify-start space-x-2 max-md:order-3">+ <LuSquareUser className="text-muted-foreground shrink-0" />+ <span className="text-sm truncate">{job.customer.name}</span></HStack>- ) : (- operation.operationStatus && (- <HStack className="min-w-0 shrink-0 justify-start space-x-2">- <OperationStatusIcon- status={- operation.jobStatus === "Paused"- ? "Paused"- : operation.operationStatus- }- />- <span className="text-sm truncate">- {operation.jobStatus === "Paused"- ? "Paused"- : operation.operationStatus}- </span>- </HStack>- ))}- {/* Batch mode shows the batch's planned total (shared setup +- summed work); a zero plan renders nothing rather than- "0 milliseconds". */}- {typeof displayOperation.duration === "number" &&- displayOperation.duration > 1 && (- <HStack className="min-w-0 shrink-0 justify-start space-x-2">- <LuTimer className="text-muted-foreground shrink-0" />- <span className="text-sm truncate tabular-nums">- {formatDurationMilliseconds(displayOperation.duration)}- </span>- </HStack>+ {operation.description && (+ <HStack className="min-w-0 justify-start space-x-2 max-md:order-4">+ <LuClipboardCheck className="text-muted-foreground shrink-0" />+ <span className="text-sm truncate">{operation.description}</span>+ </HStack>+ )}+ {scope === "batch" && batch ? (+ <HStack className="min-w-0 shrink-0 justify-start space-x-2 max-md:order-1">+ <LuLayers className="text-muted-foreground shrink-0" />+ <span className="text-sm truncate">+ {isCompleting ? t`Completing` : t`Released`}+ </span>+ </HStack>+ ) : (+ operation.operationStatus && (+ <HStack className="min-w-0 shrink-0 justify-start space-x-2 max-md:order-1">+ <OperationStatusIcon+ status={+ operation.jobStatus === "Paused"+ ? "Paused"+ : operation.operationStatus+ }+ />+ <span className="text-sm truncate">+ {operation.jobStatus === "Paused"+ ? "Paused"+ : operation.operationStatus}+ </span>+ </HStack>+ )+ )}+ {/* Batch mode shows the batch's planned total (shared setup ++ summed work); a zero plan renders nothing rather than+ "0 milliseconds". */}+ {typeof displayOperation.duration === "number" &&+ displayOperation.duration > 1 && (+ <HStack className="min-w-0 shrink-0 justify-start space-x-2 max-md:order-5">+ <LuTimer className="text-muted-foreground shrink-0" />+ <span className="text-sm truncate tabular-nums">+ {formatDurationMilliseconds(displayOperation.duration)}+ </span>+ </HStack>+ )}+ {scope === "batch" && batchFacts ? (+ <HStack className="min-w-0 shrink-0 justify-start space-x-2 max-md:order-2">+ <DeadlineIcon+ deadlineType={+ (batchFacts.deadline ??+ "Hard Deadline") as typeof operation.jobDeadlineType+ }+ overdue={batchOverdue}+ />+ <span+ className={cn(+ "text-sm truncate",+ batchOverdue ? "text-red-500" : "")}- {scope === "batch" && batchFacts ? (- <HStack className="min-w-0 shrink-0 justify-start space-x-2">- <DeadlineIcon- deadlineType={- (batchFacts.deadline ??- "Hard Deadline") as typeof operation.jobDeadlineType- }- overdue={batchOverdue}- />- <span- className={cn(- "text-sm truncate",- batchOverdue ? "text-red-500" : ""- )}- >- {batchFacts.dueDate- ? t`First due ${formatRelativeTime(- convertDateStringToIsoString(batchFacts.dueDate)+ >+ {batchFacts.dueDate+ ? t`First due ${formatRelativeTime(+ convertDateStringToIsoString(batchFacts.dueDate)+ )}`+ : batchFacts.deadline}+ </span>+ </HStack>+ ) : (+ operation.jobDeadlineType && (+ <HStack className="min-w-0 shrink-0 justify-start space-x-2 max-md:order-2">+ <DeadlineIcon+ deadlineType={operation.jobDeadlineType}+ overdue={isOverdue}+ />++ <span+ className={cn(+ "text-sm truncate",+ isOverdue ? "text-red-500" : ""+ )}+ >+ {["ASAP", "No Deadline"].includes(operation.jobDeadlineType)+ ? operation.jobDeadlineType- : operation.operationDueDate++ : operation.jobDueDate+ ? t`Due ${formatRelativeTime(- convertDateStringToIsoString(operation.operationDueDate)++ convertDateStringToIsoString(operation.jobDueDate))}`- : batchFacts.deadline}- </span>- </HStack>- ) : (- operation.jobDeadlineType && (- <HStack className="min-w-0 shrink-0 justify-start space-x-2">- <DeadlineIcon- deadlineType={operation.jobDeadlineType}- overdue={isOverdue}- />+ : "–"}+ </span>+ </HStack>+ )+ )}+ </HStack>+ </div>+ );- <span- className={cn(- "text-sm truncate",- isOverdue ? "text-red-500" : ""- )}+ return (+ <>+ <Tabs+ key={`operation-${operation.id}`}+ value={tab}+ onValueChange={setActiveTab}+ // An application shell, not a page: a grid of named areas where each+ // pane scrolls on its own, so nothing is positioned or sized by hand.+ // Below lg the dock is a bottom action bar; from lg it is a column+ // beside the workspace and status bar. The outlet frame is only+ // min-height bounded (other MES screens page-scroll), so the shell takes+ // the viewport itself, less the frame's md:my-2 inset.+ className="grid h-svh md:h-[calc(100svh-1rem)] min-h-0 w-full min-w-0 bg-card grid-cols-[minmax(0,1fr)] grid-rows-[auto_auto_auto_minmax(0,1fr)_auto_auto] [grid-template-areas:'header'_'context'_'sep'_'main'_'status'_'dock'] lg:grid-cols-[minmax(0,1fr)_auto] lg:grid-rows-[auto_auto_auto_minmax(0,1fr)_auto] lg:[grid-template-areas:'header_header'_'context_context'_'sep_sep'_'main_dock'_'status_dock']"+ >+ <div className="[grid-area:header] flex min-w-0 flex-col">+ <MesAppBar+ kind="pushed"+ title={+ scope === "batch" && batch+ ? batch.readableId+ : operation.jobReadableId+ }+ subtitle={origin.label}+ back={{ to: origin.to }}+ actions={renderJobMenu({ size: "lg", align: "end" })}+ desktop={null}+ />+ <header className="flex h-[var(--header-height)] shrink-0 items-center gap-2 border-b px-2 max-md:h-auto max-md:py-0">+ <HStack className="w-full justify-between max-md:flex-wrap max-md:gap-y-1">+ <div className="flex items-center gap-0 max-md:hidden">+ <SidebarTrigger />++ <Button+ variant="ghost"+ leftIcon={<LuChevronLeft />}+ onClick={() => navigate(origin.to)}+ className="pl-2"+ >+ {origin.label}+ </Button>+ </div>+ <div className="flex min-w-0 items-center gap-2 overflow-x-auto scrollbar-hide scroll-fade-x max-md:w-full">+ <TabsList className="ml-auto shrink-0 max-md:ml-0 max-md:w-full max-md:border-b-0 max-md:[&>*]:flex-1">+ <TabsTrigger value="details">+ <Trans>Details</Trans>+ </TabsTrigger>+ <TabsTrigger+ disabled={!job.modelPath && !operation.itemModelPath}+ value="model">- {["ASAP", "No Deadline"].includes(operation.jobDeadlineType)- ? operation.jobDeadlineType- : operation.jobDueDate- ? t`Due ${formatRelativeTime(- convertDateStringToIsoString(operation.jobDueDate)- )}`- : "–"}- </span>- </HStack>- )- )}- </HStack>+ <Trans>Model</Trans>+ </TabsTrigger>+ <TabsTrigger value="procedure">+ <Trans>Instructions</Trans>+ </TabsTrigger>+ {/* Notes are kept per job operation — on the batch there is no+ one thread to show, so Chat opens from a job. */}+ <TabsTrigger value="chat" disabled={scope === "batch"}>+ <Trans>Chat</Trans>+ </TabsTrigger>+ </TabsList>+ </div>+ </HStack>+ </header></div>- <Separator className="[grid-area:sep]" />++ {renderContextRow(+ cn("[grid-area:context]", tab === "details" && "max-md:hidden")+ )}+ <Separator+ className={cn(+ "[grid-area:sep]",+ tab === "details" && "max-md:hidden"+ )}+ /><TabsContentvalue="details"@@@ -1415,93 -1371,6 +1436,102 @@@</CardContent></Card></div>+ <Card className="md:hidden">+ <CardContent className="max-md:rounded-xl max-md:border-0 max-md:py-1">+ <CardAttributes className="divide-y divide-border">+ <CardAttribute>+ <CardAttributeLabel>+ <Trans>Completed</Trans>+ </CardAttributeLabel>+ <CardAttributeValue className="tabular-nums text-2xl font-semibold">+ <Trans>+ {operation.quantityComplete} of{" "}+ {operation.targetQuantity}+ </Trans>+ </CardAttributeValue>+ </CardAttribute>+ <CardAttribute>+ <CardAttributeLabel>+ <Trans>Scrapped</Trans>+ </CardAttributeLabel>+ <CardAttributeValue className="tabular-nums">+ {operation.quantityScrapped}+ </CardAttributeValue>+ </CardAttribute>+ <CardAttribute>+ <CardAttributeLabel>+ <Trans>Due Date</Trans>+ </CardAttributeLabel>+ <CardAttributeValue className="flex flex-col items-end gap-1 text-right">+ <span className="flex flex-wrap items-baseline justify-end gap-x-1 text-sm">- {operation.operationDueDate ? (++ {operation.jobDueDate ? (+ <>+ <span className="text-muted-foreground">+ <DateTime- value={operation.operationDueDate}++ value={operation.jobDueDate}+ variant="date"+ />+ </span>+ <span+ aria-hidden+ className="text-muted-foreground"+ >+ ·+ </span>+ </>+ ) : null}+ <span+ className={cn(+ "font-medium",+ isOverdue && "text-red-500"+ )}+ >+ {["ASAP", "No Deadline"].includes(+ operation.jobDeadlineType+ )+ ? operation.jobDeadlineType- : operation.operationDueDate++ : operation.jobDueDate+ ? t`Due ${formatRelativeTime(+ convertDateStringToIsoString(- operation.operationDueDate++ operation.jobDueDate+ )+ )}`+ : "–"}+ </span>+ </span>++ {operation.operationDueDate &&++ operation.operationDueDate.slice(0, 10) !==++ operation.jobDueDate?.slice(0, 10) && (++ <span className="text-muted-foreground text-sm">++ {t`Operation needed by ${formatDate(++ operation.operationDueDate++ )}`}++ </span>++ )}+ {projectedCompletionDate &&+ (isBehindTarget ? (+ <Tooltip>+ <TooltipTrigger asChild>- <Badge variant="red">- {t`Proj. ${formatDate(- projectedCompletionDate- )}`}++ <Badge variant="red" className="gap-1">++ <LuSquareChartGantt className="size-3.5 shrink-0" />++ {formatDate(projectedCompletionDate)}+ </Badge>+ </TooltipTrigger>+ <TooltipContent>+ {t`Behind target by ${daysBehindTarget} day(s)`}+ </TooltipContent>+ </Tooltip>+ ) : (- <span className="text-sm text-muted-foreground">- {t`Proj. ${formatDate(projectedCompletionDate)}`}++ <span className="inline-flex items-center gap-1 text-sm text-muted-foreground">++ <LuSquareChartGantt className="size-3.5 shrink-0" />++ {formatDate(projectedCompletionDate)}+ </span>+ ))}+ </CardAttributeValue>+ </CardAttribute>+ </CardAttributes>+ </CardContent>+ </Card></div><Suspense key={`non-conformance-actions-${operationId}`}>diff --cc apps/mes/app/components/Kanban/components/ItemCard.tsxindex 460f63b057,288ad59d13..462dfe3059--- a/apps/mes/app/components/Kanban/components/ItemCard.tsx+++ b/apps/mes/app/components/Kanban/components/ItemCard.tsx@@@ -16,7 -17,11 +16,8 @@@ importTooltipTrigger,useRouteData} from "@carbon/react";-import {- convertDateStringToIsoString,- formatDurationMilliseconds-} from "@carbon/utils";+import { convertDateStringToIsoString } from "@carbon/utils";+ import { getLocalTimeZone, today } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { cva } from "class-variance-authority";import {@@@ -30,19 -35,14 +31,20 @@@LuTriangleAlert} from "react-icons/lu";import { RiProgress8Line } from "react-icons/ri";-import { Link } from "react-router";+import { Link, useLocation } from "react-router";import { DateTime, OperationStatusIcon } from "~/components";import Avatar from "~/components/Avatar";-import EmployeeAvatar from "~/components/EmployeeAvatar";import { DeadlineIcon } from "~/components/Icons";+import {+ AssigneeTags,+ OperationDuration,+ PhoneThumbnail,+ QuantityStat+} from "~/components/OperationCardParts";import { useDateFormatter } from "~/hooks";+import { withOrigin } from "~/utils/origin";import { getPrivateUrl, path } from "~/utils/path";+ import { DUE_URGENCY_BORDER, getDueUrgency } from "../dueUrgency";import type { DisplaySettings, Item } from "../types";interface Progress {@@@ -112,8 -118,8 +120,9 @@@ export function ItemCard(? Array.from(progressByItemId[item.id].employees!): undefined;+ const location = useLocation();const isBatch = (item.batchSize ?? 0) > 1 && !!item.batchId;+ const urgency = getDueUrgency({ ...item, status }, scheduleToday);return (<Link@@@ -124,19 -127,16 +133,19 @@@><CardclassName={cn(- "max-w-[330px]",+ "max-w-[330px] max-md:max-w-none",- item.hasConflict && "border-red-500 border-2",cardVariants({status: status- })+ }),+ urgency && DUE_URGENCY_BORDER[urgency])}>- <CardHeader className="flex flex-col justify-between relative gap-2">+ <CardHeader className="flex flex-col justify-between relative gap-2 max-md:pb-1"><div className="flex w-full max-w-full justify-between items-start gap-2">- <div className="flex flex-col space-y-0 min-w-0">+ {showThumbnail && item.thumbnailPath && (+ <PhoneThumbnail path={item.thumbnailPath} alt={item.title} />+ )}+ <div className="flex flex-col space-y-0 min-w-0 max-md:flex-1">{item.itemReadableId && (<span className="text-xs text-muted-foreground line-clamp-1">{isBatch ? item.batchReadableId : item.itemReadableId}diff --cc apps/mes/app/components/SearchFilter.tsxindex 94dca117ae,5fe9e09b29..2bd42b842f--- a/apps/mes/app/components/SearchFilter.tsx+++ b/apps/mes/app/components/SearchFilter.tsx@@@ -16,25 -15,30 +16,38 @@@ import { useUrlParams } from "~/hooks"type SearchFilterProps = InputProps & {param: string;+ /** Classes for the input group (the outer box). */+ groupClassName?: string;};-const SearchFilter = ({ param, size, ...props }: SearchFilterProps) => {+const SearchFilter = ({+ param,+ size,+ className,+ groupClassName,+ ...props+}: SearchFilterProps) => {const [params, setParams] = useUrlParams();- const [query, setQuery] = useState(params.get(param) || "");+ const urlQuery = params.get(param) || "";+ const [query, setQuery] = useState(urlQuery);+ // What this input last wrote to the URL. A different value there came from+ // elsewhere (a saved view, back/forward, a link) and replaces the text; our+ // own write arriving late must not undo what was typed since.+ const written = useRef(urlQuery);const debounceQuery = useDebounce((q: string) => {+ written.current = q.trim();setParams({ [param]: q.trim() });}, 500);+ useEffect(() => {+ if (urlQuery !== written.current) {+ written.current = urlQuery;+ setQuery(urlQuery);+ }+ }, [urlQuery]);+return (- <InputGroup size={size}>+ <InputGroup size={size} className={groupClassName}><InputLeftElement><LuSearch className="text-muted-foreground w-3.5 h-3.5 mt-[-2px]" /></InputLeftElement>diff --cc apps/mes/app/routes/x+/dispatch.$dispatchId.tsxindex 493b835957,69ea65f04e..ec3aca9f22--- a/apps/mes/app/routes/x+/dispatch.$dispatchId.tsx+++ b/apps/mes/app/routes/x+/dispatch.$dispatchId.tsx@@@ -31,9 -21,9 +31,9 @@@ importuseDisclosure,VStack} from "@carbon/react";- import { groupBy, isUnaffectedByNavigation } from "@carbon/utils";+ import { groupBy } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";-import { useMemo } from "react";+import { useMemo, useState } from "react";import { BsExclamationSquareFill } from "react-icons/bs";import { FaCheck, FaPause, FaPlay } from "react-icons/fa6";import { LuArrowLeft, LuCheck, LuCirclePlus, LuX } from "react-icons/lu";diff --cc apps/mes/app/routes/x+/picking.$pickingListId.tsxindex 1178c7d5de,1bd4ca604a..b07cee0999--- a/apps/mes/app/routes/x+/picking.$pickingListId.tsx+++ b/apps/mes/app/routes/x+/picking.$pickingListId.tsx@@@ -41,15 -41,8 +41,14 @@@ importtoast,VStack} from "@carbon/react";- import { isUnaffectedByNavigation } from "@carbon/utils";import { Trans } from "@lingui/react/macro";-import { Suspense, useEffect, useMemo, useState } from "react";+import {+ type ComponentProps,+ Suspense,+ useEffect,+ useMemo,+ useState+} from "react";import {LuCheck,LuChevronDown,diff --cc apps/mes/app/routes/x+/timecard.tsxindex 89815b3a16,afee676727..f5d7819a85--- a/apps/mes/app/routes/x+/timecard.tsx+++ b/apps/mes/app/routes/x+/timecard.tsx@@@ -12,7 -12,7 +12,8 @@@ importCardContent,CardHeader,CardTitle,+ cn,+ DateTimePicker,DropdownMenu,DropdownMenuContent,DropdownMenuIcon,@@@ -34,10 -33,11 +34,12 @@@Td,Th,Thead,- Tr+ Tr,+ useViewport} from "@carbon/react";- import { datetime } from "@carbon/utils";+ import { datetime, fromLocalDateTime, toLocalDateTime } from "@carbon/utils";+ import type { CalendarDateTime } from "@internationalized/date";+ import { toCalendarDateTime } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useEffect, useState } from "react";@@@ -223,448 -211,320 +217,452 @@@ export default function MESTimecardPageclockOut: string | null;}) {setEditingId(entry.id);- setEditClockIn(toLocalDatetimeInput(entry.clockIn));- setEditClockOut(entry.clockOut ? toLocalDatetimeInput(entry.clockOut) : "");+ setEditClockIn(toLocalDateTime(entry.clockIn));+ setEditClockOut(entry.clockOut ? toLocalDateTime(entry.clockOut) : null);}+ const renderClockForm = (size: "md" | "lg", className?: string) =>+ openEntry ? (+ <fetcher.Form method="post" className={className}>+ <input type="hidden" name="intent" value="clockOut" />+ <Button+ variant="destructive"+ type="submit"+ size={size}+ className={className}+ disabled={fetcher.state !== "idle"}+ >+ <Trans>Clock Out</Trans>+ </Button>+ </fetcher.Form>+ ) : (+ <fetcher.Form method="post" className={className}>+ <input type="hidden" name="intent" value="clockIn" />+ <Button+ leftIcon={<LuPlay />}+ type="submit"+ size={size}+ className={className}+ disabled={fetcher.state !== "idle"}+ >+ <Trans>Clock In</Trans>+ </Button>+ </fetcher.Form>+ );++ const renderSaveForm = (entryId: string) => (+ <fetcher.Form method="post">+ <input type="hidden" name="intent" value="updateEntry" />+ <input type="hidden" name="entryId" value={entryId} />+ <input+ type="hidden"+ name="clockIn"- value={- isNaN(new Date(editClockIn).getTime())- ? ""- : new Date(editClockIn).toISOString()- }++ value={editClockIn ? fromLocalDateTime(editClockIn) : ""}+ />- {editClockOut && !isNaN(new Date(editClockOut).getTime()) && (++ {editClockOut && (+ <input+ type="hidden"+ name="clockOut"- value={new Date(editClockOut).toISOString()}++ value={fromLocalDateTime(editClockOut)}+ />+ )}+ <Button+ isLoading={fetcher.state !== "idle"}+ variant="secondary"+ type="submit"- disabled={isNaN(new Date(editClockIn).getTime())}++ disabled={!editClockIn}+ >+ <Trans>Save</Trans>+ </Button>+ </fetcher.Form>+ );++ const renderEntryMenu = (+ entry: { id: string; clockIn: string; clockOut: string | null },+ size: "md" | "lg"+ ) => (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <IconButton+ aria-label={t`More options`}+ variant="ghost"+ size={size}+ icon={<LuEllipsisVertical />}+ />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.edit}+ onClick={() => startEdit(entry)}+ >+ <DropdownMenuIcon icon={<LuPencil />} />+ <Trans>Edit</Trans>+ </DropdownMenuItem>+ <DropdownMenuItem+ shortcut={MENU_ITEM_SHORTCUTS.delete}+ onClick={() =>+ setDeletingEntry({+ id: entry.id,+ clockIn: entry.clockIn+ })+ }+ className="text-destructive"+ >+ <DropdownMenuIcon icon={<LuTrash />} />+ <Trans>Delete</Trans>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ );+return (- <div className="flex flex-col h-full w-full overflow-y-auto p-4 md:p-6">- <div className="max-w-[60rem] mx-auto w-full">- <Card className="overflow-hidden">- <CardHeader>- <HStack className="justify-between items-center">- <CardTitle>- <Trans>My Hours</Trans>- </CardTitle>- <HStack className="gap-1">- {openEntry ? (- <fetcher.Form method="post">- <input type="hidden" name="intent" value="clockOut" />- <Button- variant="destructive"- type="submit"- disabled={fetcher.state !== "idle"}- >- <Trans>Clock Out</Trans>- </Button>- </fetcher.Form>- ) : (- <fetcher.Form method="post">- <input type="hidden" name="intent" value="clockIn" />- <Button- leftIcon={<LuPlay />}- type="submit"- disabled={fetcher.state !== "idle"}- >- <Trans>Clock In</Trans>- </Button>- </fetcher.Form>- )}+ <>+ <MesAppBar kind="root" title={<Trans>My Hours</Trans>} desktop={null} />+ <div className="flex flex-col h-full w-full overflow-y-auto p-4 md:p-6 max-md:h-auto max-md:overflow-visible max-md:pb-24">+ <div className="max-w-[60rem] mx-auto w-full">+ <Card className="overflow-hidden">+ <CardHeader className={cn(!openEntry && "max-md:hidden")}>+ <HStack className="justify-between items-center">+ <CardTitle className="max-md:hidden">+ <Trans>My Hours</Trans>+ </CardTitle>+ <HStack className="gap-1 max-md:hidden">+ {renderClockForm("md")}+ </HStack></HStack>- </HStack>- {openEntry && (- <Badge variant="green" className="w-fit">- <Trans>- Clocked in since{" "}- <DateTime value={openEntry.clockIn} variant="time" />- </Trans>- </Badge>- )}- </CardHeader>- <CardContent>- <HStack className="justify-between items-center mb-4">- <Button variant="outline" asChild leftIcon={<LuChevronLeft />}>- <Link to={`${path.to.timeCardPage}?week=${weekOffset - 1}`}>- <Trans>Prev</Trans>- </Link>- </Button>- <span className="text-sm text-muted-foreground">- <DateTime- value={weekStart}- variant="date"- dateOptions={{ dateStyle: "medium" }}- />{" "}- —{" "}- <DateTime- value={weekEnd}- variant="date"- dateOptions={{ dateStyle: "medium" }}- />- </span>- <Button- variant="outline"- disabled={isCurrentWeek}- asChild={!isCurrentWeek}- rightIcon={<LuChevronRight />}- >- {isCurrentWeek ? (- <span>- <Trans>Next</Trans>- </span>- ) : (- <Link to={`${path.to.timeCardPage}?week=${weekOffset + 1}`}>- <Trans>Next</Trans>+ {openEntry && (+ <Badge variant="green" className="w-fit">+ <Trans>+ Clocked in since{" "}+ <DateTime value={openEntry.clockIn} variant="time" />+ </Trans>+ </Badge>+ )}+ </CardHeader>+ <CardContent>+ <HStack className="justify-between items-center mb-4">+ <Button+ variant="outline"+ asChild+ leftIcon={<LuChevronLeft className="max-md:mr-0" />}+ className="max-md:size-11 max-md:px-0"+ >+ <Link to={`${path.to.timeCardPage}?week=${weekOffset - 1}`}>+ <span className="max-md:sr-only">+ <Trans>Prev</Trans>+ </span></Link>- )}- </Button>- </HStack>+ </Button>+ <span className="text-sm text-muted-foreground max-md:whitespace-nowrap">+ <DateTime+ value={weekStart}+ variant="date"+ dateOptions={{ dateStyle: "medium" }}+ />{" "}+ —{" "}+ <DateTime+ value={weekEnd}+ variant="date"+ dateOptions={{ dateStyle: "medium" }}+ />+ </span>+ <Button+ variant="outline"+ disabled={isCurrentWeek}+ asChild={!isCurrentWeek}+ rightIcon={<LuChevronRight className="max-md:ml-0" />}+ className="max-md:size-11 max-md:px-0"+ >+ {isCurrentWeek ? (+ <span className="max-md:sr-only">+ <Trans>Next</Trans>+ </span>+ ) : (+ <Link to={`${path.to.timeCardPage}?week=${weekOffset + 1}`}>+ <span className="max-md:sr-only">+ <Trans>Next</Trans>+ </span>+ </Link>+ )}+ </Button>+ </HStack>- <TableBase className="table-fixed w-full">- <colgroup>- <col className="w-[16%]" />- <col className="w-[28%]" />- <col className="w-[28%]" />- <col className="w-[12%]" />- <col className="w-[16%]" />- </colgroup>- <Thead>- <Tr>- <Th className="whitespace-nowrap">- <Trans>Date</Trans>- </Th>- <Th>- <Trans>Clock In</Trans>- </Th>- <Th>- <Trans>Clock Out</Trans>- </Th>- <Th className="text-center">- <Trans>Duration</Trans>- </Th>- <Th />- </Tr>- </Thead>- <Tbody>- {entries.length === 0 ? (- <Tr>- <Td- colSpan={5}- className="text-center text-muted-foreground py-8"- >+ {/* One layout mounts: the edit row (its inputs and Save form)+ must not exist twice. */}+ {isPhone ? (+ <>+ {entries.length === 0 ? (+ <p className="py-8 text-center text-sm text-muted-foreground"><Trans>No time entries for this week</Trans>- </Td>- </Tr>- ) : (- entries.map((entry) =>- editingId === entry.id ? (- <Tr key={entry.id}>- <Td className="whitespace-nowrap">- {formatDay(entry.clockIn, locale)}- </Td>- <Td>- <DateTimePicker- aria-label={t`Clock In`}- size="sm"- value={editClockIn}- onChange={(value) =>- setEditClockIn(- value ? toCalendarDateTime(value) : null- )- }- />- </Td>- <Td>- <DateTimePicker- aria-label={t`Clock Out`}- size="sm"- value={editClockOut}- onChange={(value) =>- setEditClockOut(- value ? toCalendarDateTime(value) : null- )- }- />- </Td>- <Td className="text-muted-foreground text-center">—</Td>- <Td className="text-center">- <HStack className="justify-center">- <fetcher.Form method="post">- <input- type="hidden"- name="intent"- value="updateEntry"- />- <input- type="hidden"- name="entryId"- value={entry.id}- />- <input- type="hidden"- name="clockIn"- value={- editClockIn- ? fromLocalDateTime(editClockIn)- : ""- }- />- {editClockOut && (- <input- type="hidden"- name="clockOut"- value={fromLocalDateTime(editClockOut)}- />- )}+ </p>+ ) : (+ <ul className="-mx-4 divide-y divide-border border-y border-border">+ {entries.map((entry) =>+ editingId === entry.id ? (+ <li+ key={entry.id}+ className="flex flex-col gap-2 px-4 py-3"+ >+ <span className="text-sm font-medium">+ {formatDay(entry.clockIn, locale)}+ </span>- <Input- type="datetime-local"++ <DateTimePicker+ aria-label={t`Clock In`}+ value={editClockIn}- onChange={(e) => setEditClockIn(e.target.value)}- className="w-full"++ onChange={(value) =>++ setEditClockIn(++ value ? toCalendarDateTime(value) : null++ )++ }+ />- <Input- type="datetime-local"++ <DateTimePicker+ aria-label={t`Clock Out`}+ value={editClockOut}- onChange={(e) => setEditClockOut(e.target.value)}- className="w-full"++ onChange={(value) =>++ setEditClockOut(++ value ? toCalendarDateTime(value) : null++ )++ }+ />+ <HStack className="justify-end">+ {renderSaveForm(entry.id)}<Button- isLoading={fetcher.state !== "idle"}- variant="secondary"- type="submit"- disabled={!editClockIn}+ variant="ghost"+ onClick={() => setEditingId(null)}>- <Trans>Save</Trans>+ <Trans>Cancel</Trans></Button>- </fetcher.Form>- <Button- variant="ghost"- onClick={() => setEditingId(null)}- >- <Trans>Cancel</Trans>- </Button>- </HStack>- </Td>+ </HStack>+ </li>+ ) : (+ <li+ key={entry.id}+ className="flex items-center gap-2 py-2 pl-4 pr-1"+ >+ <div className="flex min-w-0 flex-1 flex-col gap-0.5">+ <div className="flex items-baseline justify-between gap-2">+ <span className="text-sm font-medium">+ {formatDay(entry.clockIn, locale)}+ </span>+ <span className="text-sm tabular-nums">+ {formatDuration(+ entry.clockIn,+ entry.clockOut+ )}+ </span>+ </div>+ <span className="flex items-center gap-1 text-xs text-muted-foreground">+ <DateTime+ value={entry.clockIn}+ variant="time"+ />+ <span aria-hidden>–</span>+ {entry.clockOut ? (+ <DateTime+ value={entry.clockOut}+ variant="time"+ />+ ) : (+ <Badge variant="green">+ <Trans>Active</Trans>+ </Badge>+ )}+ </span>+ </div>+ {renderEntryMenu(entry, "lg")}+ </li>+ )+ )}+ </ul>+ )}+ </>+ ) : (+ <div>+ <TableBase className="table-fixed w-full">+ <colgroup>+ <col className="w-[16%]" />+ <col className="w-[28%]" />+ <col className="w-[28%]" />+ <col className="w-[12%]" />+ <col className="w-[16%]" />+ </colgroup>+ <Thead>+ <Tr>+ <Th className="whitespace-nowrap">+ <Trans>Date</Trans>+ </Th>+ <Th>+ <Trans>Clock In</Trans>+ </Th>+ <Th>+ <Trans>Clock Out</Trans>+ </Th>+ <Th className="text-center">+ <Trans>Duration</Trans>+ </Th>+ <Th /></Tr>- ) : (- <Tr key={entry.id}>- <Td className="whitespace-nowrap">- {formatDay(entry.clockIn, locale)}- </Td>- <Td>- <DateTime value={entry.clockIn} variant="time" />- </Td>- <Td>- {entry.clockOut ? (- <DateTime value={entry.clockOut} variant="time" />+ </Thead>+ <Tbody>+ {entries.length === 0 ? (+ <Tr>+ <Td+ colSpan={5}+ className="text-center text-muted-foreground py-8"+ >+ <Trans>No time entries for this week</Trans>+ </Td>+ </Tr>+ ) : (+ entries.map((entry) =>+ editingId === entry.id ? (+ <Tr key={entry.id}>+ <Td className="whitespace-nowrap">+ {formatDay(entry.clockIn, locale)}+ </Td>+ <Td>- <Input- type="datetime-local"++ <DateTimePicker++ aria-label={t`Clock In`}++ size="sm"+ value={editClockIn}- onChange={(e) =>- setEditClockIn(e.target.value)++ onChange={(value) =>++ setEditClockIn(++ value ? toCalendarDateTime(value) : null++ )+ }- className="h-8 text-xs w-full [&::-webkit-calendar-picker-indicator]:hidden"+ />+ </Td>+ <Td>- <Input- type="datetime-local"++ <DateTimePicker++ aria-label={t`Clock Out`}++ size="sm"+ value={editClockOut}- onChange={(e) =>- setEditClockOut(e.target.value)++ onChange={(value) =>++ setEditClockOut(++ value ? toCalendarDateTime(value) : null++ )+ }- className="h-8 text-xs w-full [&::-webkit-calendar-picker-indicator]:hidden"+ />+ </Td>+ <Td className="text-muted-foreground text-center">+ —+ </Td>+ <Td className="text-center">+ <HStack className="justify-center">+ {renderSaveForm(entry.id)}+ <Button+ variant="ghost"+ onClick={() => setEditingId(null)}+ >+ <Trans>Cancel</Trans>+ </Button>+ </HStack>+ </Td>+ </Tr>) : (- <Badge variant="green">- <Trans>Active</Trans>- </Badge>- )}- </Td>- <Td className="text-center">- {formatDuration(entry.clockIn, entry.clockOut)}- </Td>- <Td className="text-right">- <DropdownMenu>- <DropdownMenuTrigger asChild>- <IconButton- aria-label={t`More options`}- variant="ghost"- icon={<LuEllipsisVertical />}- />- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem- shortcut={MENU_ITEM_SHORTCUTS.edit}- onClick={() => startEdit(entry)}- >- <DropdownMenuIcon icon={<LuPencil />} />- <Trans>Edit</Trans>- </DropdownMenuItem>- <DropdownMenuItem- shortcut={MENU_ITEM_SHORTCUTS.delete}- onClick={() =>- setDeletingEntry({- id: entry.id,- clockIn: entry.clockIn- })- }- className="text-destructive"- >- <DropdownMenuIcon icon={<LuTrash />} />- <Trans>Delete</Trans>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </Td>- </Tr>- )- )- )}- </Tbody>- </TableBase>+ <Tr key={entry.id}>+ <Td className="whitespace-nowrap">+ {formatDay(entry.clockIn, locale)}+ </Td>+ <Td>+ <DateTime+ value={entry.clockIn}+ variant="time"+ />+ </Td>+ <Td>+ {entry.clockOut ? (+ <DateTime+ value={entry.clockOut}+ variant="time"+ />+ ) : (+ <Badge variant="green">+ <Trans>Active</Trans>+ </Badge>+ )}+ </Td>+ <Td className="text-center">+ {formatDuration(entry.clockIn, entry.clockOut)}+ </Td>+ <Td className="text-right">+ {renderEntryMenu(entry, "md")}+ </Td>+ </Tr>+ )+ )+ )}+ </Tbody>+ </TableBase>+ </div>+ )}- {entries.length > 0 && (- <div className="mt-4 text-right text-sm font-medium">- <Trans>Total: {formatTotalHours(entries)}</Trans>- </div>- )}- </CardContent>- </Card>- </div>- {deletingEntry && (- <Modal- open- onOpenChange={(open) => {- if (!open) setDeletingEntry(null);- }}- >- <ModalOverlay />- <ModalContent>- <ModalHeader>- <ModalTitle>+ {entries.length > 0 && (+ <div className="mt-4 text-right text-sm font-medium">+ <Trans>Total: {formatTotalHours(entries)}</Trans>+ </div>+ )}+ </CardContent>+ </Card>+ </div>+ {deletingEntry && (+ <Modal+ open+ onOpenChange={(open) => {+ if (!open) setDeletingEntry(null);+ }}+ >+ <ModalOverlay />+ <ModalContent>+ <ModalHeader>+ <ModalTitle>+ <Trans>+ Delete Timecard (+ <DateTime+ value={deletingEntry.clockIn}+ variant="absolute"+ />+ )+ </Trans>+ </ModalTitle>+ </ModalHeader>+ <ModalBody><Trans>- Delete Timecard (- <DateTime value={deletingEntry.clockIn} variant="absolute" />)+ Are you sure you want to delete this timecard? This cannot be+ undone.</Trans>- </ModalTitle>- </ModalHeader>- <ModalBody>- <Trans>- Are you sure you want to delete this timecard? This cannot be- undone.- </Trans>- </ModalBody>- <ModalFooter>- <Button- variant="secondary"- onClick={() => setDeletingEntry(null)}- >- <Trans>Cancel</Trans>- </Button>- <Button- variant="destructive"- onClick={() => {- const formData = new FormData();- formData.append("intent", "deleteEntry");- formData.append("entryId", deletingEntry.id);- fetcher.submit(formData, { method: "post" });- setDeletingEntry(null);- }}- >- <Trans>Delete</Trans>- </Button>- </ModalFooter>- </ModalContent>- </Modal>- )}- </div>+ </ModalBody>+ <ModalFooter>+ <Button+ variant="secondary"+ onClick={() => setDeletingEntry(null)}+ >+ <Trans>Cancel</Trans>+ </Button>+ <Button+ variant="destructive"+ onClick={() => {+ const formData = new FormData();+ formData.append("intent", "deleteEntry");+ formData.append("entryId", deletingEntry.id);+ fetcher.submit(formData, { method: "post" });+ setDeletingEntry(null);+ }}+ >+ <Trans>Delete</Trans>+ </Button>+ </ModalFooter>+ </ModalContent>+ </Modal>+ )}+ </div>+ <div+ ref={bottomBarRef}+ data-mes-bottom-bar+ className="fixed inset-x-0 bottom-[calc(54px+env(safe-area-inset-bottom))] z-20 border-t border-border bg-card px-4 py-3 md:hidden"+ >+ {renderClockForm("lg", "w-full h-12")}+ </div>+ </>);}diff --cc packages/jobs/manifests/schema.jsonindex d5dddf2016,7b568f4b1a..38d5e84555--- a/packages/jobs/manifests/schema.json+++ b/packages/jobs/manifests/schema.json@@@ -5,7 -5,7 +5,7 @@@"sourceCompanyId": "schema-baseline","sourceCompanyGroupId": null,"sourceCompanyName": null,- "exportedAt": "2026-10-05T04:22:58.312Z",- "exportedAt": "2026-10-07T18:06:45.508Z",++ "exportedAt": "2026-10-08T09:19:43.493Z","exportedBy": "schema-baseline","label": "schema baseline","includeStorage": "none",diff --cc packages/locale/locales/de/erp.poindex dc7559367c,2d56019f6d..e4b52bd504--- a/packages/locale/locales/de/erp.po+++ b/packages/locale/locales/de/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} muss übereinstimmen �msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} Teile übersprungen — es gibt nichts zu produzieren"+ msgid "{off} off"+ msgstr "{off} Rabatt"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} Rabatt bis {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} wird zur Bearbeitung erneut geöffnet als Revision {0}. Das bereits an den Lieferanten gesendete Dokument bleibt unverändert, bis Sie die Bestellung abschließen und erneut senden."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Notizen zu Ihrer Entscheidung hmsgid "Add Approval Requirement"msgstr "Genehmigungsanforderung hinzufügen"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Fügen Sie mindestens eine Dienstleistung hinzu."++ msgid "Add at least one unit."+ msgstr "Fügen Sie mindestens eine Einheit hinzu."+msgid "Add Authenticator App"msgstr "Authentifikator-App hinzufügen"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Feiertag löschenmsgid "Delete Inspection Plan"msgstr "Prüfplan löschen"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Rechnung löschen"+msgid "Delete Issue"msgstr "Problem löschen"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Webhook bearbeitenmsgid "Edit Work Center"msgstr "Arbeitsplatz bearbeiten"+ msgid "Edited"+ msgstr "Bearbeitet"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Beseitigt"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Hat Arbeitsgänge, die nicht eimsgid "Headers"msgstr "Header"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "fehlerfrei"+ msgid "Healthy"+ msgstr "Fehlerfrei"msgid "Help"msgstr "Hilfe"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Kein Bildmsgid "No inspection plans"msgstr "Keine Prüfpläne"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Nach der Änderung sind keine Rechnungen geplant."++ msgid "No invoices planned."+ msgstr "Keine Rechnungen geplant."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Keine Rechnungen geplant. Fügen Sie eine hinzu, um diese Positionen zu fakturieren."+msgid "No issue types configured"msgstr "Keine Problemtypen konfiguriert"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Offene Fertigungsaufträgemsgid "Open menu"msgstr "Menü öffnen"-msgid "Open navigation"-msgstr "Navigation öffnen"-+ msgid "Open Orders"+ msgstr "Offene Bestellungen"+msgid "Open payables by supplier and age"msgstr "Offene Verbindlichkeiten nach Lieferant und Fälligkeitsdauer"diff --cc packages/locale/locales/de/mes.poindex c5f289ac51,01cd3d283f..6ad8c7a98f--- a/packages/locale/locales/de/mes.po+++ b/packages/locale/locales/de/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Ziehen von {0} storniert.msgid "Due"msgstr "Fällig"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Fällig {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Untergruppe {0} öffnen: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Arbeitsgang benötigt bis {0}"+msgid "Operations"msgstr "Arbeitsgänge"diff --cc packages/locale/locales/en/erp.poindex 292bd5bf77,47d70cc63c..99676a8d22--- a/packages/locale/locales/en/erp.po+++ b/packages/locale/locales/en/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} must match — separatmsgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} parts skipped — nothing to make"+ msgid "{off} off"+ msgstr "{off} off"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} off until {0}"++msgid "{onHand} on hand"+msgstr "{onHand} on hand"+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Add any notes about your decisimsgid "Add Approval Requirement"msgstr "Add Approval Requirement"+msgid "Add Asset Class"+msgstr "Add Asset Class"++ msgid "Add at least one service."+ msgstr "Add at least one service."++ msgid "Add at least one unit."+ msgstr "Add at least one unit."+msgid "Add Authenticator App"msgstr "Add Authenticator App"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Delete Holidaymsgid "Delete Inspection Plan"msgstr "Delete Inspection Plan"+msgid "Delete Instruction"+msgstr "Delete Instruction"++ msgid "Delete Invoice"+ msgstr "Delete Invoice"+msgid "Delete Issue"msgstr "Delete Issue"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Edit Webhookmsgid "Edit Work Center"msgstr "Edit Work Center"+ msgid "Edited"+ msgstr "Edited"++msgid "edited <0/>"+msgstr "edited <0/>"+msgid "Eliminated"msgstr "Eliminated"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Has operations that can't be scmsgid "Headers"msgstr "Headers"+msgid "Heading {level}"+msgstr "Heading {level}"+- msgid "healthy"- msgstr "healthy"+ msgid "Healthy"+ msgstr "Healthy"msgid "Help"msgstr "Help"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "No imagemsgid "No inspection plans"msgstr "No inspection plans"+msgid "No internal notes"+msgstr "No internal notes"++ msgid "No invoices planned after the change."+ msgstr "No invoices planned after the change."++ msgid "No invoices planned."+ msgstr "No invoices planned."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "No invoices planned. Add one to bill these lines."+msgid "No issue types configured"msgstr "No issue types configured"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Open Jobsmsgid "Open menu"msgstr "Open menu"-msgid "Open navigation"-msgstr "Open navigation"-+ msgid "Open Orders"+ msgstr "Open Orders"+msgid "Open payables by supplier and age"msgstr "Open payables by supplier and age"diff --cc packages/locale/locales/en/mes.poindex 189d3cc155,2f32c4d330..6542b241d6--- a/packages/locale/locales/en/mes.po+++ b/packages/locale/locales/en/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Dragging {0} cancelled.msgid "Due"msgstr "Due"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Due {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "Open Jobsmsgid "Open sub-assembly {0}: {1}"msgstr "Open sub-assembly {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operation needed by {0}"+msgid "Operations"msgstr "Operations"diff --cc packages/locale/locales/es/erp.poindex 0465b2d9b4,d111428d81..94f397abd8--- a/packages/locale/locales/es/erp.po+++ b/packages/locale/locales/es/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} debe coincidir — cargmsgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} piezas omitidas — no hay nada que fabricar"+ msgid "{off} off"+ msgstr "{off} descuento"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} descuento hasta {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} se reabrirá para edición como revisión {0}. El documento ya enviado al proveedor permanece sin cambios hasta que finalices y reenvíes la orden."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Agregue notas sobre su decisiómsgid "Add Approval Requirement"msgstr "Agregar Requisito de Aprobación"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Agregue al menos un servicio."++ msgid "Add at least one unit."+ msgstr "Agregar al menos una unidad."+msgid "Add Authenticator App"msgstr "Agregar aplicación de autenticación"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Eliminar Día Festivomsgid "Delete Inspection Plan"msgstr "Eliminar Plan de Inspección"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Eliminar factura"+msgid "Delete Issue"msgstr "Eliminar Problema"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Editar Webhookmsgid "Edit Work Center"msgstr "Editar Centro de Trabajo"+ msgid "Edited"+ msgstr "Editado"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Eliminado"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Tiene operaciones que no puedemsgid "Headers"msgstr "Encabezados"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "saludable"+ msgid "Healthy"+ msgstr "Saludable"msgid "Help"msgstr "Ayuda"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Sin imagenmsgid "No inspection plans"msgstr "Sin planes de inspección"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "No hay facturas planificadas después del cambio."++ msgid "No invoices planned."+ msgstr "No hay facturas planificadas."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Sin facturas planificadas. Agregue una para facturar estas líneas."+msgid "No issue types configured"msgstr "No hay tipos de problemas configurados"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Órdenes de trabajo Abiertasmsgid "Open menu"msgstr "Abrir menú"-msgid "Open navigation"-msgstr "Abrir navegación"-+ msgid "Open Orders"+ msgstr "Órdenes Abiertas"+msgid "Open payables by supplier and age"msgstr "Cuentas por pagar abiertas por proveedor y antigüedad"diff --cc packages/locale/locales/es/mes.poindex cb72661351,f61c3c979f..bd89b03cd4--- a/packages/locale/locales/es/mes.po+++ b/packages/locale/locales/es/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Se canceló el arrastre de {0}.msgid "Due"msgstr "Vencimiento"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Vence {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Abrir subconjunto {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operación necesaria antes del {0}"+msgid "Operations"msgstr "Operaciones"diff --cc packages/locale/locales/fr/erp.poindex 2eab076ece,fce339504b..f234e1fac2--- a/packages/locale/locales/fr/erp.po+++ b/packages/locale/locales/fr/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} doivent correspondre �msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} pièces ignorées — rien à fabriquer"+ msgid "{off} off"+ msgstr "{off} de réduction"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} de réduction jusqu'au {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} sera rouvert pour modification en tant que révision {0}. Le document déjà envoyé au fournisseur reste inchangé jusqu'à ce que vous le finalisiez et le renvoiez."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Ajoutez des notes sur votre démsgid "Add Approval Requirement"msgstr "Ajouter une exigence d'approbation"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Ajouter au moins une prestation."++ msgid "Add at least one unit."+ msgstr "Ajouter au moins une unité."+msgid "Add Authenticator App"msgstr "Ajouter une application d'authentification"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Supprimer le jour fériémsgid "Delete Inspection Plan"msgstr "Supprimer le plan de contrôle"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Supprimer la facture"+msgid "Delete Issue"msgstr "Supprimer le problème"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Modifier le Webhookmsgid "Edit Work Center"msgstr "Modifier le poste de travail"+ msgid "Edited"+ msgstr "Modifié"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Éliminé"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Contient des opérations qui nmsgid "Headers"msgstr "En-têtes"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "sain"+ msgid "Healthy"+ msgstr "Sain"msgid "Help"msgstr "Aide"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Aucune imagemsgid "No inspection plans"msgstr "Aucun plan de contrôle"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Aucune facture planifiée après la modification."++ msgid "No invoices planned."+ msgstr "Aucune facture planifiée."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Aucune facture prévue. Ajouter une pour facturer ces lignes."+msgid "No issue types configured"msgstr "Aucun type de problème configuré"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Ordres de fabrication Ouvertsmsgid "Open menu"msgstr "Ouvrir le menu"-msgid "Open navigation"-msgstr "Ouvrir la navigation"-+ msgid "Open Orders"+ msgstr "Commandes Ouvertes"+msgid "Open payables by supplier and age"msgstr "Dettes fournisseurs ouvertes par fournisseur et ancienneté"diff --cc packages/locale/locales/fr/mes.poindex c5e0f1d10f,29c4fb3f51..672275880d--- a/packages/locale/locales/fr/mes.po+++ b/packages/locale/locales/fr/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Déplacement de {0} annulé.msgid "Due"msgstr "Échéance"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Échéance {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Ouvrir le sous-ensemble {0} : {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Opération requise avant le {0}"+msgid "Operations"msgstr "Opérations"diff --cc packages/locale/locales/hi/erp.poindex a74f7f068f,1bc3f1181c..efc4157658--- a/packages/locale/locales/hi/erp.po+++ b/packages/locale/locales/hi/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{name} लौट गए!msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} पार्ट्स छोड़ा गया — कुछ भी बनाने के लिए नहीं"+ msgid "{off} off"+ msgstr "{off} छूट"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} छूट {0} तक"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} को रिवीजन {0} के रूप में संपादन के लिए फिर से खोला जाएगा। आपूर्तिकर्ता को भेजा गया दस्तावेज़ अपरिवर्तित रहेगा जब तक आप क्रय आदेश को अंतिम रूप न दें और पुनः न भेजें।"@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "अपने निर्ण�msgid "Add Approval Requirement"msgstr "अनुमोदन आवश्यकता जोड़ें"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "कम से कम एक सेवा जोड़ें।"++ msgid "Add at least one unit."+ msgstr "कम से कम एक इकाई जोड़ें।"+msgid "Add Authenticator App"msgstr "ऑथेंटिकेटर ऐप जोड़ें"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "छुट्टी हटाएmsgid "Delete Inspection Plan"msgstr "निरीक्षण योजना हटाएं"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "चालान हटाएँ"+msgid "Delete Issue"msgstr "समस्या हटाएं"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "वेबहुक संपाmsgid "Edit Work Center"msgstr "वर्क सेंटर संपादित करें"+ msgid "Edited"+ msgstr "संपादित"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "समाप्त किया गया"@@@ -8902,10 -9938,7 +10017,10 @@@ msgstr "ऐसे ऑपरेशन �msgid "Headers"msgstr "हेडर"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"+ msgid "Healthy"msgstr "स्वस्थ"msgid "Help"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "कोई छवि नही�msgid "No inspection plans"msgstr "कोई निरीक्षण योजनाएं नहीं"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "परिवर्तन के बाद कोई चालान योजनाबद्ध नहीं।"++ msgid "No invoices planned."+ msgstr "कोई चालान योजनाबद्ध नहीं।"++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "कोई चालान योजनाबद्ध नहीं है। इन पंक्तियों को बिल करने के लिए एक जोड़ें।"+msgid "No issue types configured"msgstr "कोई समस्या प्रकार कॉन्फ़िगर नहीं किया गया"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "खुली जॉब्सmsgid "Open menu"msgstr "मेनू खोलें"-msgid "Open navigation"-msgstr "नेविगेशन खोलें"-+ msgid "Open Orders"+ msgstr "खुले आदेश"+msgid "Open payables by supplier and age"msgstr "आपूर्तिकर्ता और आयु के अनुसार खुली देय राशि"diff --cc packages/locale/locales/hi/mes.poindex 7ae975ed83,1db3b3e8fe..5ab666083c--- a/packages/locale/locales/hi/mes.po+++ b/packages/locale/locales/hi/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "\"{0}\" को ड्रैगmsgid "Due"msgstr "अंतिम तारीख"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Due {0} के लिए"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "सब-असेंबली {0} खोलें: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "ऑपरेशन {0} तक आवश्यक"+msgid "Operations"msgstr "ऑपरेशन"diff --cc packages/locale/locales/it/erp.poindex 04b58084ee,d390932526..ec36bc209c--- a/packages/locale/locales/it/erp.po+++ b/packages/locale/locales/it/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} devono corrispondere �msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} componenti saltati — nulla da produrre"+ msgid "{off} off"+ msgstr "{off} di sconto"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} di sconto fino al {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} verrà riaperto per la modifica come revisione {0}. Il documento già inviato al fornitore rimane invariato fino a quando non si finalizza e si rinvia l'ordine."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Aggiungi qualsiasi nota sulla tmsgid "Add Approval Requirement"msgstr "Aggiungi Requisito di Approvazione"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Aggiungi almeno un servizio."++ msgid "Add at least one unit."+ msgstr "Aggiungi almeno un'unità."+msgid "Add Authenticator App"msgstr "Aggiungi app autenticatore"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Elimina Festivitàmsgid "Delete Inspection Plan"msgstr "Elimina Piano di controllo"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Elimina Fattura"+msgid "Delete Issue"msgstr "Elimina Problema"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Modifica Webhookmsgid "Edit Work Center"msgstr "Modifica Centro di Lavoro"+ msgid "Edited"+ msgstr "Modificato"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Eliminato"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Ha operazioni che non possono emsgid "Headers"msgstr "Intestazioni"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "sano"+ msgid "Healthy"+ msgstr "Sano"msgid "Help"msgstr "Aiuto"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Nessuna immaginemsgid "No inspection plans"msgstr "Nessun piano di controllo"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Nessuna fattura pianificata dopo la modifica."++ msgid "No invoices planned."+ msgstr "Nessuna fattura pianificata."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Nessuna fattura pianificata. Aggiungi una per fatturare queste righe."+msgid "No issue types configured"msgstr "Nessun tipo di problema configurato"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Ordini di produzione apertimsgid "Open menu"msgstr "Apri menu"-msgid "Open navigation"-msgstr "Apri navigazione"-+ msgid "Open Orders"+ msgstr "Ordini aperti"+msgid "Open payables by supplier and age"msgstr "Debiti aperti per fornitore e anzianità"diff --cc packages/locale/locales/it/mes.poindex 7f1e50f990,b98f5685a2..cdab17fe31--- a/packages/locale/locales/it/mes.po+++ b/packages/locale/locales/it/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Trascinamento di {0} annullato.msgid "Due"msgstr "Scadenza"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Scadenza {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Apri sottoassieme {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operazione necessaria entro il {0}"+msgid "Operations"msgstr "Operazioni"diff --cc packages/locale/locales/ja/erp.poindex a05487b070,e422c8ca14..839dfc963c--- a/packages/locale/locales/ja/erp.po+++ b/packages/locale/locales/ja/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names}は一致する必要がmsgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount}個の部品はスキップ済 — 製造する必要がありません"+ msgid "{off} off"+ msgstr "{off} 割引"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} の割引は {0} まで有効"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} はリビジョン {0} として編集のため再度オープンされます。仕入先に送信済みの文書は、ファイナライズして発注書を再送信するまで変更されません。"@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "あなたの決定について�msgid "Add Approval Requirement"msgstr "承認要求事項を追加"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "少なくとも1つの外注サービスを追加してください。"++ msgid "Add at least one unit."+ msgstr "少なくとも1個追加してください。"+msgid "Add Authenticator App"msgstr "認証器アプリを追加"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "休日を削除msgid "Delete Inspection Plan"msgstr "検査計画を削除"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "請求書を削除"+msgid "Delete Issue"msgstr "問題を削除"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Webhookを編集msgid "Edit Work Center"msgstr "作業区を編集"+ msgid "Edited"+ msgstr "編集済み"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "削除済み"@@@ -8902,10 -9938,7 +10017,10 @@@ msgstr "スケジュール化できな�msgid "Headers"msgstr "ヘッダー"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"+ msgid "Healthy"msgstr "正常"msgid "Help"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "画像なしmsgid "No inspection plans"msgstr "検査計画がありません"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "変更後に計画済請求書がありません。"++ msgid "No invoices planned."+ msgstr "計画済請求書がありません。"++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "計画済みの請求書がありません。これらの明細を請求するために1つ追加してください。"+msgid "No issue types configured"msgstr "問題タイプが設定されていません"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "オープン製造指図msgid "Open menu"msgstr "メニューを開く"-msgid "Open navigation"-msgstr "ナビゲーションを開く"-+ msgid "Open Orders"+ msgstr "オープン注文"+msgid "Open payables by supplier and age"msgstr "仕入先・日数別オープン買掛金"diff --cc packages/locale/locales/ja/mes.poindex f71c4e4b6e,36e50034cc..7edc4a6255--- a/packages/locale/locales/ja/mes.po+++ b/packages/locale/locales/ja/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "ドラッグ {0} キャンセ�msgid "Due"msgstr "期日"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "期限 {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "サブアセンブリ {0} を開く: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "工程の必要期日: {0}"+msgid "Operations"msgstr "工程"diff --cc packages/locale/locales/ko/erp.poindex ac26993c4d,54f06767ab..7a47a353cd--- a/packages/locale/locales/ko/erp.po+++ b/packages/locale/locales/ko/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{name}님, 돌아오셨군요!msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount}개 부품이 건너뜀 — 만들 것이 없음"+ msgid "{off} off"+ msgstr "{off} 할인"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{0}까지 {off} 할인"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel}은(는) 리비전 {0}으로 편집하기 위해 다시 열립니다. 이미 공급업체로 전송된 문서는 리비전을 완료하고 다시 전송할 때까지 변경되지 않습니다."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "결정에 대한 메모를 추�msgid "Add Approval Requirement"msgstr "승인 요구사항 추가"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "최소 1개의 서비스를 추가하세요."++ msgid "Add at least one unit."+ msgstr "최소한 하나의 단위를 추가하세요."+msgid "Add Authenticator App"msgstr "인증 앱 추가"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "휴일 삭제msgid "Delete Inspection Plan"msgstr "검사 계획 삭제"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "송장 삭제"+msgid "Delete Issue"msgstr "이슈 삭제"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "웹훅 편집msgid "Edit Work Center"msgstr "작업장 편집"+ msgid "Edited"+ msgstr "수정됨"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "제거됨"@@@ -8902,10 -9938,7 +10017,10 @@@ msgstr "일정을 짤 수 없는 공정msgid "Headers"msgstr "헤더"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"+ msgid "Healthy"msgstr "정상"msgid "Help"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "이미지 없음msgid "No inspection plans"msgstr "검사 계획 없음"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "변경 후 계획된 송장이 없습니다."++ msgid "No invoices planned."+ msgstr "계획된 송장이 없습니다."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "계획된 송장이 없습니다. 이 라인을 청구하려면 추가하세요."+msgid "No issue types configured"msgstr "설정된 이슈 유형이 없습니다"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "미결 작업 지시msgid "Open menu"msgstr "메뉴 열기"-msgid "Open navigation"-msgstr "탐색 열기"-+ msgid "Open Orders"+ msgstr "미결 주문"+msgid "Open payables by supplier and age"msgstr "공급업체 및 기간별 미결 매입채무"diff --cc packages/locale/locales/ko/mes.poindex ed7eff4d36,b843b91d34..273e9a4009--- a/packages/locale/locales/ko/mes.po+++ b/packages/locale/locales/ko/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "{0} 드래그 취소됨.msgid "Due"msgstr "기한"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "기한 {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "하위 조립체 {0} 열기: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "공정 필요일: {0}"+msgid "Operations"msgstr "공정작업"diff --cc packages/locale/locales/pl/erp.poindex ac5165432e,104f51c811..7a08048720--- a/packages/locale/locales/pl/erp.po+++ b/packages/locale/locales/pl/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} muszą się zgadzać �msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} części pominięto — nic do zrobienia"+ msgid "{off} off"+ msgstr "{off} rabatu"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} rabatu do {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} zostanie ponownie otwarty do edycji jako rewizja {0}. Dokument już wysłany do dostawcy pozostaje niezmieniony, aż go sfinalizujesz i ponownie wyślesz zamówienie."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Dodaj dowolne notatki dotyczącmsgid "Add Approval Requirement"msgstr "Dodaj Wymaganie Zatwierdzenia"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Dodaj co najmniej jedną usługę."++ msgid "Add at least one unit."+ msgstr "Dodaj co najmniej jedną sztukę."+msgid "Add Authenticator App"msgstr "Dodaj aplikację Authenticator"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Usuń Świętomsgid "Delete Inspection Plan"msgstr "Usuń plan kontroli"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Usuń Fakturę"+msgid "Delete Issue"msgstr "Usuń Problem"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Edytuj Webhookmsgid "Edit Work Center"msgstr "Edytuj Stanowisko robocze"+ msgid "Edited"+ msgstr "Edytowano"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Wyeliminowane"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Ma operacje, które nie możnamsgid "Headers"msgstr "Nagłówki"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "zdrowy"+ msgid "Healthy"+ msgstr "Zdrowy"msgid "Help"msgstr "Pomoc"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Brak obrazumsgid "No inspection plans"msgstr "Brak planów kontroli"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Po zmianie nie zaplanowano żadnych faktur."++ msgid "No invoices planned."+ msgstr "Nie zaplanowano żadnych faktur."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Brak zaplanowanych faktur. Dodaj jedną, aby wystawić faktury dla tych pozycji."+msgid "No issue types configured"msgstr "Brak skonfigurowanych typów problemów"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Otwarte Zlecenia produkcyjnemsgid "Open menu"msgstr "Otwórz menu"-msgid "Open navigation"-msgstr "Otwórz nawigację"-+ msgid "Open Orders"+ msgstr "Otwarte Zamówienia"+msgid "Open payables by supplier and age"msgstr "Otwarte zobowiązania wg dostawcy i wieku"diff --cc packages/locale/locales/pl/mes.poindex 70b51984ad,05102083fb..44252c6594--- a/packages/locale/locales/pl/mes.po+++ b/packages/locale/locales/pl/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Przeciąganie {0} anulowane.msgid "Due"msgstr "Termin"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Termin {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Otwórz podzestawienie {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operacja potrzebna do {0}"+msgid "Operations"msgstr "Operacje"diff --cc packages/locale/locales/pt/erp.poindex 26cbd274bd,6e30e40234..ae8f140fa4--- a/packages/locale/locales/pt/erp.po+++ b/packages/locale/locales/pt/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} deve coincidir — carrmsgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} peças ignoradas — nada para fabricar"+ msgid "{off} off"+ msgstr "{off} de desconto"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} de desconto até {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} será reaberto para edição como revisão {0}. O documento já enviado ao fornecedor permanece inalterado até que você finalize e reenvie o pedido."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Adicione qualquer observaçãomsgid "Add Approval Requirement"msgstr "Adicionar Requisito de Aprovação"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Adicione pelo menos um serviço."++ msgid "Add at least one unit."+ msgstr "Adicionar pelo menos uma unidade."+msgid "Add Authenticator App"msgstr "Adicionar Aplicação Autenticadora"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Excluir Feriadomsgid "Delete Inspection Plan"msgstr "Excluir plano de inspeção"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Excluir Fatura"+msgid "Delete Issue"msgstr "Excluir requisição"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Editar Webhookmsgid "Edit Work Center"msgstr "Editar Centro de Trabalho"+ msgid "Edited"+ msgstr "Editado"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Eliminado"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Tem operações que não podemmsgid "Headers"msgstr "Cabeçalhos"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "íntegro"+ msgid "Healthy"+ msgstr "Íntegro"msgid "Help"msgstr "Ajuda"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Sem imagemmsgid "No inspection plans"msgstr "Nenhum plano de inspeção"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Nenhuma fatura planejada após a alteração."++ msgid "No invoices planned."+ msgstr "Nenhuma fatura planejada."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Nenhuma fatura planejada. Adicione uma para faturar essas linhas."+msgid "No issue types configured"msgstr "Nenhum tipo de problema configurado"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Ordens de Produção Abertasmsgid "Open menu"msgstr "Abrir menu"-msgid "Open navigation"-msgstr "Abrir navegação"-+ msgid "Open Orders"+ msgstr "Pedidos Abertos"+msgid "Open payables by supplier and age"msgstr "Contas a pagar em aberto por fornecedor e idade"diff --cc packages/locale/locales/pt/mes.poindex ddff69da48,98ce50665b..10af8b3d82--- a/packages/locale/locales/pt/mes.po+++ b/packages/locale/locales/pt/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Arraste de {0} cancelado.msgid "Due"msgstr "Prazo"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Vencimento {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Abrir sub-montagem {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operação necessária até {0}"+msgid "Operations"msgstr "Operações"diff --cc packages/locale/locales/ru/erp.poindex 3ea0d48c62,83854fd9dd..1fc896713d--- a/packages/locale/locales/ru/erp.po+++ b/packages/locale/locales/ru/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{name} возвращаетсяmsgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} деталей пропущено — нечего делать"+ msgid "{off} off"+ msgstr "{off} скидка"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} скидка до {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} будет переоткрыт для редактирования как ревизия {0}. Отправленный поставщику документ останется неизменным, пока вы не завершите и не переотправите заказ."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Добавьте примечаmsgid "Add Approval Requirement"msgstr "Добавить требование утверждения"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "Добавьте хотя бы одну услугу."++ msgid "Add at least one unit."+ msgstr "Добавьте хотя бы одну единицу."+msgid "Add Authenticator App"msgstr "Добавить приложение-аутентификатор"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Удалить праздникmsgid "Delete Inspection Plan"msgstr "Удалить план контроля"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Удалить счет-фактуру"+msgid "Delete Issue"msgstr "Удалить проблему"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Изменить вебхукmsgid "Edit Work Center"msgstr "Изменить рабочий центр"+ msgid "Edited"+ msgstr "Изменено"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Исключено"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Имеет операции, кmsgid "Headers"msgstr "Заголовки"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "здоровый"+ msgid "Healthy"+ msgstr "Здоровый"msgid "Help"msgstr "Справка"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Нет изображенияmsgid "No inspection plans"msgstr "Нет планов контроля"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Нет запланированных счетов-фактур после изменения."++ msgid "No invoices planned."+ msgstr "Нет запланированных счетов-фактур."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Счета не запланированы. Добавьте счет для выставления по этим строкам."+msgid "No issue types configured"msgstr "Типы проблем не настроены"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Открытые произвоmsgid "Open menu"msgstr "Открыть меню"-msgid "Open navigation"-msgstr "Открыть навигацию"-+ msgid "Open Orders"+ msgstr "Открытые заказы"+msgid "Open payables by supplier and age"msgstr "Открытая кредиторская задолженность по поставщикам и срокам"diff --cc packages/locale/locales/ru/mes.poindex 2df2906099,4940175dd0..4e57cee29a--- a/packages/locale/locales/ru/mes.po+++ b/packages/locale/locales/ru/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Перетаскивание {0msgid "Due"msgstr "Срок"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Срок {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Открыть под-узел {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Операция нужна к {0}"+msgid "Operations"msgstr "Операции"diff --cc packages/locale/locales/tr/erp.poindex 3f781fff2e,4be6997c99..0b081dd846--- a/packages/locale/locales/tr/erp.po+++ b/packages/locale/locales/tr/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{name} geri döndü!msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} parça atlandı — yapılacak bir şey yok"+ msgid "{off} off"+ msgstr "{off} indirim"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} indirim {0} tarihine kadar"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} revizyon {0} olarak düzenlenmek üzere yeniden açılacaktır. Tedarikçiye gönderilen belge, siparişi sonlandırıp yeniden gönderene kadar değişmez."@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "Kararınızla ilgili herhangi bmsgid "Add Approval Requirement"msgstr "Onay Gereklilik Ekle"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "En az bir hizmet ekleyin."++ msgid "Add at least one unit."+ msgstr "En az bir adet ekleyin."+msgid "Add Authenticator App"msgstr "Kimlik Doğrulayıcı Uygulaması Ekle"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "Tatili Silmsgid "Delete Inspection Plan"msgstr "Kontrol planını sil"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "Faturayı Sil"+msgid "Delete Issue"msgstr "Sorunu Sil"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "Webhook Düzenlemsgid "Edit Work Center"msgstr "İş Merkezi Düzenle"+ msgid "Edited"+ msgstr "Düzenlendi"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "Ortadan Kaldırılmış"@@@ -8902,11 -9938,8 +10017,11 @@@ msgstr "Planlanmayan operasyonları varmsgid "Headers"msgstr "Başlıklar"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"- msgstr "sağlıklı"+ msgid "Healthy"+ msgstr "Sağlıklı"msgid "Help"msgstr "Yardım"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "Resim yokmsgid "No inspection plans"msgstr "Kontrol planı yok"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "Değişiklikten sonra planlanmış fatura yok."++ msgid "No invoices planned."+ msgstr "Planlanmış fatura yok."++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "Planlanan fatura yok. Bu satırları faturalandırmak için bir tane ekleyin."+msgid "No issue types configured"msgstr "Hiçbir sorun türü yapılandırılmamış"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "Açık İş Emirlerimsgid "Open menu"msgstr "Menüyü aç"-msgid "Open navigation"-msgstr "Gezinmeyi aç"-+ msgid "Open Orders"+ msgstr "Açık Siparişler"+msgid "Open payables by supplier and age"msgstr "Tedarikçi ve yaşa göre açık borçlar"diff --cc packages/locale/locales/tr/mes.poindex a5410885fb,0a99ca1b19..0e63c6b001--- a/packages/locale/locales/tr/mes.po+++ b/packages/locale/locales/tr/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "Taşıma {0} iptal edildi.msgid "Due"msgstr "Vade"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "Süresi dolacak {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "Alt derlemeyi aç {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "Operasyon için gereken tarih: {0}"+msgid "Operations"msgstr "Operasyonlar"diff --cc packages/locale/locales/zh/erp.poindex 8341831d02,d53521dfca..308c4f5384--- a/packages/locale/locales/zh/erp.po+++ b/packages/locale/locales/zh/erp.po@@@ -388,9 -486,13 +490,16 @@@ msgstr "{names} 必须匹配 — 需要msgid "{noDemandItemCount} parts skipped — nothing to make"msgstr "{noDemandItemCount} 个零件已跳过 — 没有需要生产的"+ msgid "{off} off"+ msgstr "{off} 折扣"++ #. placeholder {0}: formatDate(line.discountEndsOn)+ msgid "{off} off until {0}"+ msgstr "{off} 折扣至 {0}"++msgid "{onHand} on hand"+msgstr ""+#. placeholder {0}: (routeData?.purchaseOrder?.revisionId ?? 0) + 1msgid "{orderLabel} will be reopened for editing as revision {0}. The document already sent to the supplier is unchanged until you finalize and resend the order."msgstr "{orderLabel} 将被重新打开以作为修订版本 {0} 进行编辑。已发送给供应商的文件在您完成并重新发送订单前保持不变。"@@@ -1458,9 -1707,12 +1717,15 @@@ msgstr "添加关于您的决定的任�msgid "Add Approval Requirement"msgstr "添加审批要求"+msgid "Add Asset Class"+msgstr ""++ msgid "Add at least one service."+ msgstr "至少添加一项服务。"++ msgid "Add at least one unit."+ msgstr "至少添加一件。"+msgid "Add Authenticator App"msgstr "添加身份验证器应用"@@@ -5963,9 -6707,9 +6765,12 @@@ msgstr "删除假期msgid "Delete Inspection Plan"msgstr "删除检验计划"+msgid "Delete Instruction"+msgstr ""++ msgid "Delete Invoice"+ msgstr "删除发票"+msgid "Delete Issue"msgstr "删除问题"@@@ -7160,9 -8035,9 +8102,12 @@@ msgstr "编辑 Webhookmsgid "Edit Work Center"msgstr "编辑工作中心"+ msgid "Edited"+ msgstr "已编辑"++msgid "edited <0/>"+msgstr ""+msgid "Eliminated"msgstr "已消除"@@@ -8902,10 -9938,7 +10017,10 @@@ msgstr "有无法排程的工序msgid "Headers"msgstr "标头"+msgid "Heading {level}"+msgstr ""+- msgid "healthy"+ msgid "Healthy"msgstr "健康"msgid "Help"@@@ -12023,9 -13349,15 +13465,18 @@@ msgstr "没有图像msgid "No inspection plans"msgstr "无检验计划"+msgid "No internal notes"+msgstr ""++ msgid "No invoices planned after the change."+ msgstr "更改后未计划发票。"++ msgid "No invoices planned."+ msgstr "未计划发票。"++ msgid "No invoices planned. Add one to bill these lines."+ msgstr "未计划任何发票。添加一张发票来对这些行开票。"+msgid "No issue types configured"msgstr "未配置问题类型"@@@ -12829,6 -14221,12 +14349,9 @@@ msgstr "未结工单msgid "Open menu"msgstr "打开菜单"-msgid "Open navigation"-msgstr "打开导航"-+ msgid "Open Orders"+ msgstr "未结订单"+msgid "Open payables by supplier and age"msgstr "按供应商和期限打开应付款项"diff --cc packages/locale/locales/zh/mes.poindex 533e0ee11b,0ab3c590d7..791020d80c--- a/packages/locale/locales/zh/mes.po+++ b/packages/locale/locales/zh/mes.po@@@ -518,9 -509,9 +518,9 @@@ msgstr "拖拽 {0} 已取消。msgid "Due"msgstr "应交期"- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )- #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.operationDueDate ) )++#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )+ #. placeholder {0}: formatRelativeTime( convertDateStringToIsoString( operation.jobDueDate ) )#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(operation.jobDueDate) )-#. placeholder {0}: formatRelativeTime( convertDateStringToIsoString(item.dueDate) )msgid "Due {0}"msgstr "截止 {0}"@@@ -1188,6 -1167,10 +1191,11 @@@ msgstr "msgid "Open sub-assembly {0}: {1}"msgstr "打开子装配体 {0}: {1}"++#. placeholder {0}: formatDate( operation.operationDueDate )+ #. placeholder {0}: formatDate( operation.operationDueDate )+ msgid "Operation needed by {0}"+ msgstr "工序需求日期:{0}"+msgid "Operations"msgstr "工序"diff --cc packages/react/src/Card.tsxindex 614a90dfcd,1c4e7a2870..0b3f147b64--- a/packages/react/src/Card.tsx+++ b/packages/react/src/Card.tsx@@@ -219,7 -216,7 +219,7 @@@ const CardContent = forwardRef<HTMLDivE<divref={ref}className={cn(- "flex flex-col flex-1 p-6 rounded-xl border border-border bg-card dark:bg-muted/40 max-md:p-4 max-md:rounded-t-none max-md:border-x-0 max-md:border-b-0 max-md:[&:is([class~='max-md:hidden']+*)]:rounded-t-xl max-md:[&:is([class~='max-md:hidden']+*)]:border-t-0",- "flex flex-col flex-1 p-6 m-[-1px] rounded-xl border border-border bg-card dark:bg-muted/40",++ "flex flex-col flex-1 p-6 m-[-1px] rounded-xl border border-border bg-card dark:bg-muted/40 max-md:p-4 max-md:rounded-t-none max-md:border-x-0 max-md:border-b-0 max-md:[&:is([class~='max-md:hidden']+*)]:rounded-t-xl max-md:[&:is([class~='max-md:hidden']+*)]:border-t-0",className)}{...props}diff --cc packages/react/src/Combobox.tsxindex c5cd1e0726,51dec1d4cc..9795dba42b--- a/packages/react/src/Combobox.tsx+++ b/packages/react/src/Combobox.tsx@@@ -16,8 -22,7 +16,8 @@@ import { Popover, PopoverContent, Popovimport { Spinner } from "./Spinner";import { TruncatedTooltipText } from "./TruncatedTooltipText";import { cn } from "./utils/cn";- import { reactNodeToString } from "./utils/react";+ import { reactNodeToString, withDistinctHelpers } from "./utils/react";+import { usePhoneOpenAutoFocus } from "./Viewport";export type ComboboxOption = {label: string | JSX.Element;diff --cc packages/react/src/CreateableCombobox.tsxindex fca8c0181b,06c39f2683..e9e904f59f--- a/packages/react/src/CreateableCombobox.tsx+++ b/packages/react/src/CreateableCombobox.tsx@@@ -14,8 -19,7 +14,8 @@@ import { PickerList } from "./PickerLisimport { Popover, PopoverContent, PopoverTrigger } from "./Popover";import { TruncatedTooltipText } from "./TruncatedTooltipText";import { cn } from "./utils/cn";- import { reactNodeToString } from "./utils/react";+ import { reactNodeToString, withDistinctHelpers } from "./utils/react";+import { usePhoneOpenAutoFocus } from "./Viewport";export type CreatableComboboxProps = Omit<ComponentPropsWithoutRef<"button">,diff --cc packages/react/src/Drawer.tsxindex 6dce495b4a,36b9688342..1873a52c54--- a/packages/react/src/Drawer.tsx+++ b/packages/react/src/Drawer.tsx@@@ -31,8 -25,14 +31,14 @@@ const DrawerTrigger = DialogPrimitive.Tconst DrawerCloseButton = DialogPrimitive.Close;+ // Radix keeps a closing dialog mounted only while the element it wraps is+ // animating, and what the portal wraps is this positioning div, not the panel.+ // So the div runs a no-op exit animation for as long as its panel is closing+ // (`animate-out` with no modifiers animates to the element's own state);+ // without it the portal removes the panel before it can slide out. The+ // duration must match the panel's closing duration below.const portalVariants = cva(- "fixed inset-0 z-50 flex p-3 max-md:p-0 max-md:items-end",- "fixed inset-0 z-50 flex p-3 [&:has(>[role=dialog][data-state=closed])]:animate-out [&:has(>[role=dialog][data-state=closed])]:duration-200",++ "fixed inset-0 z-50 flex p-3 max-md:p-0 max-md:items-end [&:has(>[role=dialog][data-state=closed])]:animate-out [&:has(>[role=dialog][data-state=closed])]:duration-200",{variants: {position: {diff --cc packages/react/src/MultiSelect.tsxindex 00ffdbd18a,c44e39dc7d..cac37c5c28--- a/packages/react/src/MultiSelect.tsx+++ b/packages/react/src/MultiSelect.tsx@@@ -3,19 -3,25 +3,19 @@@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useLingui } from "@lingui/react/macro";-import { useVirtualizer } from "@tanstack/react-virtual";import type { ComponentPropsWithoutRef, ReactNode } from "react";- import { forwardRef, useId, useState } from "react";-import { forwardRef, useId, useMemo, useRef, useState } from "react";-import { FaRegSquare, FaSquareCheck } from "react-icons/fa6";++import { forwardRef, useId, useMemo, useState } from "react";import { LuCirclePlus, LuSettings2, LuX } from "react-icons/lu";-import {- Command,- CommandEmpty,- CommandGroup,- CommandInput,- CommandItem,- CommandTrigger-} from "./Command";+import { CommandTrigger } from "./Command";import { HStack } from "./HStack";import { IconButton } from "./IconButton";+import type { PickerListOption } from "./PickerList";+import { PickerList } from "./PickerList";import { Popover, PopoverContent, PopoverTrigger } from "./Popover";import { TruncatedTooltipText } from "./TruncatedTooltipText";import { cn } from "./utils/cn";- import { reactNodeToString } from "./utils/react";+ import { reactNodeToString, withDistinctHelpers } from "./utils/react";+import { usePhoneOpenAutoFocus } from "./Viewport";export type MultiSelectProps = Omit<ComponentPropsWithoutRef<"button">,diff --cc packages/react/src/Tabs.tsxindex 17586f7218,7b83d30278..621f4e3174--- a/packages/react/src/Tabs.tsx+++ b/packages/react/src/Tabs.tsx@@@ -22,9 -22,7 +22,9 @@@ const TabsList = forwardRef// No fixed height and no border — p-1 sizes the box, so the space// around the triggers is uniform on every side (a fixed h-* squeezed// them, and a border-b read as an extra pixel of bottom padding)- "inline-flex items-center justify-center rounded-[0.5rem] bg-muted p-1 text-muted-foreground border border-border",+ "inline-flex items-center justify-center rounded-[0.5rem] bg-muted p-0.5 text-muted-foreground border border-border",+ // Phones: an underline tab row that scrolls sideways, inset 16pt.+ "max-md:flex max-md:w-full max-md:justify-start max-md:gap-5 max-md:overflow-x-auto max-md:scrollbar-hide max-md:rounded-none max-md:border-0 max-md:border-b max-md:bg-transparent max-md:p-0 max-md:px-4",className)}{...props}diff --cc packages/react/src/Tooltip.tsxindex 3cdf946020,d6d195075b..f71daea60f--- a/packages/react/src/Tooltip.tsx+++ b/packages/react/src/Tooltip.tsx@@@ -210,44 -135,34 +216,45 @@@ const TooltipContent = forwardRef<HTMLD...props},ref- ) => (- <TooltipPrimitive.Portal- container={- elevated && typeof document !== "undefined" ? document.body : undefined- }- >- <TooltipPrimitive.Positioner- side={side}- sideOffset={sideOffset}- align={align}- alignOffset={alignOffset}- anchor={anchor}- className={elevated ? "z-[9999]" : "z-50"}+ ) => {+ // Phones have no hover: a tooltip shows only when tapped open (see+ // TapToggleRoot); controlled tooltips stay hidden.+ const { isPhone } = useViewport();+ const tap = useContext(TapToggleContext);+ if (isPhone && !tap) return null;+ return (+ <TooltipPrimitive.Portal+ container={+ elevated && typeof document !== "undefined"+ ? document.body+ : undefined+ }>- <TooltipPrimitive.Popup- ref={ref}- className={cn(- "z-50 w-fit max-w-xs overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md",- "origin-[var(--transform-origin)] transition-[transform,opacity] duration-150",- "data-[starting-style]:scale-95 data-[starting-style]:opacity-0",- "data-[ending-style]:scale-95 data-[ending-style]:opacity-0",- className- )}- {...props}- />- </TooltipPrimitive.Positioner>- </TooltipPrimitive.Portal>- )+ <TooltipPrimitive.Positioner+ side={side}+ sideOffset={sideOffset}+ align={align}+ alignOffset={alignOffset}++ anchor={anchor}+ className={elevated ? "z-[9999]" : "z-50"}+ >+ <TooltipPrimitive.Popup+ ref={ref}+ data-tooltip-tap={tap?.id}+ className={cn(+ "z-50 w-fit max-w-xs overflow-hidden rounded-md border border-border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md",+ "origin-[var(--transform-origin)] transition-[transform,opacity] duration-150",+ "data-[starting-style]:scale-95 data-[starting-style]:opacity-0",+ "data-[ending-style]:scale-95 data-[ending-style]:opacity-0",+ "max-md:max-w-[calc(100vw-32px)] max-md:text-[15px]",+ className+ )}+ {...props}+ />+ </TooltipPrimitive.Positioner>+ </TooltipPrimitive.Portal>+ );+ });TooltipContent.displayName = "TooltipContent";