Skip to content

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.

Merge origin/main into feat/method-import-append

Raul02419b332602
diff --cc apps/erp/app/modules/shared/shared.server.ts
index 1b07bd8f28,520ebb244a..b320bca028
--- a/apps/erp/app/modules/shared/shared.server.ts
+++ b/apps/erp/app/modules/shared/shared.server.ts
@@@ -58,10 -58,9 +58,10 @@@ import
importRequiresCreate,
importSchemas
} from "./imports.models";
- import { assignableTables } from "./shared.models";
+ import { assignableTables, noteFields, noteTables } from "./shared.models";
import * as service from "./shared.service";
import { invokeCreate } from "./shared.service";
+import type { MethodRowsAdded } from "./types";
const logger = getLogger("erp", "shared");
// ── Operations ──────────────────────────────────────────────────────────────
diff --cc apps/erp/app/modules/shared/shared.service.ts
index fcee500fb2,9b50984afc..6fd3060285
--- a/apps/erp/app/modules/shared/shared.service.ts
+++ b/apps/erp/app/modules/shared/shared.service.ts
@@@ -190,14 -185,14 +190,17 @@@ import
setGenericQueryFilters
} from "~/utils/query";
import type { CustomFieldsTableType } from "../settings/types";
-import type {
- assignableTables,
- NoteField,
- NoteTable,
- standardFactorType
+import {
+ type assignableTables,
+ methodItemType,
++ type NoteField,
++ type NoteTable,
+ operationTypes,
++ type standardFactorType,
+ toTiptapDoc
} from "./shared.models";
import { assertMethodHasPullFrom, isStrictBackflush } from "./strict-backflush";
-import type { ItemModelUpload } from "./types";
+import type { ItemModelUpload, MethodRowsAdded } from "./types";
const logger = getLogger("erp", "shared");