Accounting v1

apps/erp/app/components/Form/ItemPostingGroup.tsx

@@ -6,8 +6,19 @@ import { useMemo, useRef, useState } from "react";
 import type { getItemPostingGroupsList } from "~/modules/items";
 import ItemPostingGroupForm from "~/modules/items/ui/ItemPostingGroups/ItemPostingGroupForm";
 import { path } from "~/utils/path";
+import { Enumerable } from "../Enumerable";
 
-type ItemPostingGroupSelectProps = Omit<ComboboxProps, "options">;
+type ItemPostingGroupSelectProps = Omit<ComboboxProps, "options" | "inline"> & {
+  inline?: boolean;
+};
+
+const ItemPostingGroupPreview = (
+  value: string,
+  options: { value: string; label: string }[]
+) => {
+  const itemGroup = options.find((o) => o.value === value);
+  return <Enumerable value={itemGroup?.label ?? null} />;
+};
 
 const ItemPostingGroup = (props: ItemPostingGroupSelectProps) => {
   const newItemPostingGroupModal = useDisclosure();
@@ -22,6 +33,7 @@ const ItemPostingGroup = (props: ItemPostingGroupSelectProps) => {
         ref={triggerRef}
         options={options}
         {...props}
+        inline={props.inline ? ItemPostingGroupPreview : undefined}
         label={props?.label ?? "Posting Group"}
         onCreateOption={(option) => {
           newItemPostingGroupModal.onOpen();

apps/erp/app/modules/items/items.models.ts

@@ -81,6 +81,7 @@ export const itemValidator = z.object({
       message: "Part type is required",
     }),
   }),
+  postingGroupId: zfd.text(z.string().optional()),
   unitOfMeasureCode: z
     .string()
     .min(1, { message: "Unit of Measure is required" }),
@@ -339,7 +340,7 @@ export const methodOperationValidator = z
 
 export const itemCostValidator = z.object({
   itemId: z.string().min(1, { message: "Item ID is required" }),
-  // itemPostingGroupId: zfd.text(z.string().optional()),
+  itemPostingGroupId: zfd.text(z.string().optional()),
   // costingMethod: z.enum(itemCostingMethods, {
   //   errorMap: (issue, ctx) => ({
   //     message: "Costing method is required",

apps/erp/app/modules/items/items.service.ts

@@ -2001,14 +2001,27 @@ export async function upsertConsumable(
     if (itemInsert.error) return itemInsert;
     const itemId = itemInsert.data?.id;
 
-    const consumableInsert = await client.from("consumable").upsert({
-      id: consumable.id,
-      companyId: consumable.companyId,
-      createdBy: consumable.createdBy,
-      customFields: consumable.customFields,
-    });
+    const [consumableInsert, itemCostUpdate] = await Promise.all([
+      client.from("consumable").upsert({
+        id: consumable.id,
+        companyId: consumable.companyId,
+        createdBy: consumable.createdBy,
+        customFields: consumable.customFields,
+      }),
+      client
+        .from("itemCost")
+        .update(
+          sanitize({
+            itemPostingGroupId: consumable.postingGroupId,
+          })
+        )
+        .eq("itemId", itemId),
+    ]);
 
     if (consumableInsert.error) return consumableInsert;
+    if (itemCostUpdate.error) {
+      console.error(itemCostUpdate.error);
+    }
 
     const costUpdate = await client
       .from("itemCost")
@@ -2100,14 +2113,27 @@ export async function upsertPart(
     if (itemInsert.error) return itemInsert;
     const itemId = itemInsert.data?.id;
 
-    const partInsert = await client.from("part").upsert({
-      id: part.id,
-      companyId: part.companyId,
-      createdBy: part.createdBy,
-      customFields: part.customFields,
-    });
+    const [partInsert, itemCostUpdate] = await Promise.all([
+      client.from("part").upsert({
+        id: part.id,
+        companyId: part.companyId,
+        createdBy: part.createdBy,
+        customFields: part.customFields,
+      }),
+      client
+        .from("itemCost")
+        .update(
+          sanitize({
+            itemPostingGroupId: part.postingGroupId,
+          })
+        )
+        .eq("itemId", itemId),
+    ]);
 
     if (partInsert.error) return partInsert;
+    if (itemCostUpdate.error) {
+      console.error(itemCostUpdate.error);
+    }
 
     if (part.replenishmentSystem !== "Make") {
       const costUpdate = await client
@@ -2633,15 +2659,21 @@ export async function upsertMaterial(
         const firstError = itemInserts.find((insert) => insert.error);
         return firstError!;
       }
-
-      const itemIds = itemInserts.map((insert) => insert.data!.id);
-
-      await client
-        .from("itemCost")
-        .update({
-          unitCost: material.unitCost,
-        })
-        .in("itemId", itemIds);
+      const itemCostUpdate = await Promise.all(
+        itemInserts.map((insert) =>
+          client
+            .from("itemCost")
+            .update(
+              sanitize({
+                itemPostingGroupId: material.postingGroupId,
+              })
+            )
+            .eq("itemId", insert.data?.id ?? "")
+        )
+      );
+      if (itemCostUpdate.some((update) => update.error)) {
+        console.error(itemCostUpdate.find((update) => update.error));
+      }
     } else {
       const itemInsert = await client
         .from("item")
@@ -2660,13 +2692,18 @@ export async function upsertMaterial(
         .select("id")
         .single();
       if (itemInsert.error) return itemInsert;
-
-      await client
+      const itemId = itemInsert.data?.id;
+      const itemCostUpdate = await client
         .from("itemCost")
-        .update({
-          unitCost: material.unitCost,
-        })
-        .eq("itemId", itemInsert.data!.id);
+        .update(
+          sanitize({
+            itemPostingGroupId: material.postingGroupId,
+          })
+        )
+        .eq("itemId", itemId);
+      if (itemCostUpdate.error) {
+        console.error(itemCostUpdate.error);
+      }
     }
 
     const materialInsert = await client.from("material").upsert({
@@ -3136,14 +3173,27 @@ export async function upsertTool(
     if (itemInsert.error) return itemInsert;
     const itemId = itemInsert.data?.id;
 
-    const toolInsert = await client.from("tool").upsert({
-      id: tool.id,
-      companyId: tool.companyId,
-      createdBy: tool.createdBy,
-      customFields: tool.customFields,
-    });
+    const [toolInsert, itemCostUpdate] = await Promise.all([
+      client.from("tool").upsert({
+        id: tool.id,
+        companyId: tool.companyId,
+        createdBy: tool.createdBy,
+        customFields: tool.customFields,
+      }),
+      client
+        .from("itemCost")
+        .update(
+          sanitize({
+            itemPostingGroupId: tool.postingGroupId,
+          })
+        )
+        .eq("itemId", itemId),
+    ]);
 
     if (toolInsert.error) return toolInsert;
+    if (itemCostUpdate.error) {
+      console.error(itemCostUpdate.error);
+    }
 
     const costUpdate = await client
       .from("itemCost")

apps/erp/app/modules/items/ui/Consumables/ConsumableForm.tsx

@@ -21,6 +21,7 @@ import {
   Hidden,
   Input,
   InputControlled,
+  ItemPostingGroup,
   Number,
   Select,
   Submit,
@@ -156,6 +157,9 @@ const ConsumableForm = ({
                   name="unitOfMeasureCode"
                   label="Unit of Measure"
                 />
+                {!isEditing && (
+                  <ItemPostingGroup name="postingGroupId" label="Item Group" />
+                )}
                 {!isEditing && (
                   <Number
                     name="unitCost"

apps/erp/app/modules/items/ui/Consumables/ConsumableProperties.tsx

@@ -23,7 +23,7 @@ import { z } from 'zod/v3';
 import { zfd } from "zod-form-data";
 import { MethodBadge, MethodIcon, TrackingTypeIcon } from "~/components";
 import { Enumerable } from "~/components/Enumerable";
-import { Boolean, Tags } from "~/components/Form";
+import { Boolean, ItemPostingGroup, Tags } from "~/components/Form";
 import CustomFormInlineFields from "~/components/Form/CustomFormInlineFields";
 import { ItemThumbnailUpload } from "~/components/ItemThumnailUpload";
 import { useRouteData } from "~/hooks";
@@ -83,6 +83,7 @@ const ConsumableProperties = () => {
         | "replenishmentSystem"
         | "defaultMethodType"
         | "itemTrackingType"
+        | "itemPostingGroupId"
         | "consumableId"
         | "active",
       value: string | null
@@ -196,7 +197,8 @@ const ConsumableProperties = () => {
           <ValidatedForm
             defaultValues={{
               consumableId:
-                routeData?.consumableSummary?.readableIdWithRevision ?? undefined,
+                routeData?.consumableSummary?.readableIdWithRevision ??
+                undefined,
             }}
             validator={z.object({
               consumableId: z.string(),
@@ -256,6 +258,26 @@ const ConsumableProperties = () => {
         />
       </VStack> */}
 
+      <ValidatedForm
+        defaultValues={{
+          itemPostingGroupId:
+            routeData?.consumableSummary?.itemPostingGroupId ?? undefined,
+        }}
+        validator={z.object({
+          itemPostingGroupId: z.string().nullable().optional(),
+        })}
+        className="w-full"
+      >
+        <ItemPostingGroup
+          label="Item Group"
+          name="itemPostingGroupId"
+          inline
+          onChange={(value) => {
+            onUpdate("itemPostingGroupId", value?.value ?? null);
+          }}
+        />
+      </ValidatedForm>
+
       <VStack spacing={2}>
         <h3 className="text-xs text-muted-foreground">Tracking Type</h3>
         <DropdownMenu>