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.

fix(items): show custom fields on the supplier part form

Raul7722a95358f7
diff --git a/apps/erp/app/modules/items/ui/Item/SupplierPartForm.tsx b/apps/erp/app/modules/items/ui/Item/SupplierPartForm.tsx
index 4e40e188bb..68b6cba44d 100644
--- a/apps/erp/app/modules/items/ui/Item/SupplierPartForm.tsx
+++ b/apps/erp/app/modules/items/ui/Item/SupplierPartForm.tsx
@@ -220,7 +220,7 @@ const SupplierPartForm = ({
minValue={1}
termId="supplier-part-order-multiple"
/>
- <CustomFormFields table="partSupplier" />
+ <CustomFormFields table="supplierPart" />
</div>
<PriceBreaks
priceBreaks={priceBreaks}
diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx
index 1c0e1a6223..6cc4ab84f2 100644
--- a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx
@@ -14,7 +14,7 @@ import type { ConsumableSummary } from "~/modules/items";
import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";
import { SupplierPartForm } from "~/modules/items/ui/Item";
import { getDatabaseClient } from "~/services/database.server";
-import { setCustomFields } from "~/utils/form";
+import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -166,7 +166,8 @@ export default function EditConsumableSupplierRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (
diff --git a/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.tsx b/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.tsx
index f33af5510c..82b19a0a4a 100644
--- a/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.tsx
@@ -8,6 +8,7 @@ import { useLoaderData, useNavigate, useParams } from "react-router";
import { useRouteData } from "~/hooks";
import type { AffectedItemDraft } from "~/modules/items/ui/ChangeNotice";
import { SupplierPartForm } from "~/modules/items/ui/Item";
+import { getCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -82,7 +83,8 @@ export default function ChangeNoticeEditSupplierPartRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (
diff --git a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx
index d29cc4f1ed..04738458b7 100644
--- a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx
@@ -14,7 +14,7 @@ import type { MaterialSummary } from "~/modules/items";
import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";
import { SupplierPartForm } from "~/modules/items/ui/Item";
import { getDatabaseClient } from "~/services/database.server";
-import { setCustomFields } from "~/utils/form";
+import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -166,7 +166,8 @@ export default function EditMaterialSupplierRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (
diff --git a/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.tsx
index 6740730e6a..e1bf1fccd1 100644
--- a/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.tsx
@@ -13,7 +13,7 @@ import type { PartSummary } from "~/modules/items";
import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";
import { SupplierPartForm } from "~/modules/items/ui/Item";
import { getDatabaseClient } from "~/services/database.server";
-import { setCustomFields } from "~/utils/form";
+import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -165,7 +165,8 @@ export default function EditPartSupplierRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (
diff --git a/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx
index bee24174ae..8788d30d8d 100644
--- a/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx
@@ -14,7 +14,7 @@ import type { ServiceSummary } from "~/modules/items";
import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";
import { SupplierPartForm } from "~/modules/items/ui/Item";
import { getDatabaseClient } from "~/services/database.server";
-import { setCustomFields } from "~/utils/form";
+import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -166,7 +166,8 @@ export default function EditServiceSupplierRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (
diff --git a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx
index f038ca2189..d2fc6eecb8 100644
--- a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx
+++ b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx
@@ -14,7 +14,7 @@ import type { ToolSummary } from "~/modules/items";
import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";
import { SupplierPartForm } from "~/modules/items/ui/Item";
import { getDatabaseClient } from "~/services/database.server";
-import { setCustomFields } from "~/utils/form";
+import { getCustomFields, setCustomFields } from "~/utils/form";
import { path } from "~/utils/path";
export async function loader({ request, params }: LoaderFunctionArgs) {
@@ -166,7 +166,8 @@ export default function EditToolSupplierRoute() {
supplierUnitOfMeasureCode: supplierPart.supplierUnitOfMeasureCode ?? "EA",
minimumOrderQuantity: supplierPart.minimumOrderQuantity ?? 1,
orderMultiple: supplierPart.orderMultiple ?? 1,
- conversionFactor: supplierPart.conversionFactor ?? 1
+ conversionFactor: supplierPart.conversionFactor ?? 1,
+ ...getCustomFields(supplierPart.customFields)
};
return (