@open-mercato/core 0.4.5-develop-3ce83a8b24 → 0.4.5-develop-539cff4960

package/dist/modules/sales/commands/documents.js

@@ -1,9 +1,16 @@
 import { randomUUID } from "crypto";
 import { z } from "zod";
 import { registerCommand } from "@open-mercato/shared/lib/commands";
-import { buildChanges, emitCrudSideEffects, requireId } from "@open-mercato/shared/lib/commands/helpers";
+import {
+  buildChanges,
+  emitCrudSideEffects,
+  requireId
+} from "@open-mercato/shared/lib/commands/helpers";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
-import { deriveResourceFromCommandId, invalidateCrudCache } from "@open-mercato/shared/lib/crud/cache";
+import {
+  deriveResourceFromCommandId,
+  invalidateCrudCache
+} from "@open-mercato/shared/lib/crud/cache";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { resolveNotificationService } from "../../notifications/lib/notificationService.js";
 import { buildFeatureNotificationFromType } from "../../notifications/lib/notificationBuilder.js";
@@ -11,7 +18,7 @@ import { setRecordCustomFields } from "@open-mercato/core/modules/entities/lib/h
 import { loadCustomFieldValues } from "@open-mercato/shared/lib/crud/custom-fields";
 import { normalizeCustomFieldValues } from "@open-mercato/shared/lib/custom-fields/normalize";
 import { E } from "../../../generated/entities.ids.generated.js";
-import { findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import {
   SalesQuote,
   SalesQuoteLine,
@@ -32,6 +39,11 @@ import {
   SalesDocumentTag,
   SalesDocumentTagAssignment
 } from "../data/entities.js";
+import {
+  CatalogProduct,
+  CatalogProductUnitConversion
+} from "../../catalog/data/entities.js";
+import { Dictionary, DictionaryEntry } from "../../dictionaries/data/entities.js";
 import { CustomFieldValue } from "@open-mercato/core/modules/entities/data/entities";
 import {
   CustomerAddress,
@@ -64,6 +76,11 @@ import { resolveDictionaryEntryValue } from "../lib/dictionaries.js";
 import { resolveStatusEntryIdByValue } from "../lib/statusHelpers.js";
 import { loadSalesSettings } from "./settings.js";
 import { notificationTypes } from "../notifications.js";
+import {
+  REFERENCE_UNIT_CODES,
+  canonicalizeUnitCode,
+  toUnitLookupKey
+} from "@open-mercato/shared/lib/units/unitCodes";
 const orderCrudEvents = {
   module: "sales",
   entity: "order",
@@ -85,7 +102,9 @@ const quoteCrudEvents = {
   })
 };
 const currencyCodeSchema = z.string().trim().toUpperCase().regex(/^[A-Z]{3}$/, { message: "currency_code_invalid" });
-const dateOnlySchema = z.string().trim().regex(/^\d{4}-\d{2}-\d{2}$/, { message: "invalid_date" }).refine((value) => !Number.isNaN(new Date(value).getTime()), { message: "invalid_date" });
+const dateOnlySchema = z.string().trim().regex(/^\d{4}-\d{2}-\d{2}$/, { message: "invalid_date" }).refine((value) => !Number.isNaN(new Date(value).getTime()), {
+  message: "invalid_date"
+});
 const addressSnapshotSchema = z.record(z.string(), z.unknown()).nullable().optional();
 const documentUpdateSchema = z.object({
   id: z.string().uuid(),
@@ -259,13 +278,20 @@ function resolveNoteAuthorFromAuth(auth) {
   return uuidRegex.test(sub) ? sub : null;
 }
 function resolveStatusChangeActor(auth, translate) {
-  const unknownLabel = translate("sales.orders.status_change.actor_unknown", "unknown user");
+  const unknownLabel = translate(
+    "sales.orders.status_change.actor_unknown",
+    "unknown user"
+  );
   if (!auth) return unknownLabel;
   if (auth.isApiKey) {
     const keyName = typeof auth.keyName === "string" ? auth.keyName.trim() : "";
     const keyId = typeof auth.keyId === "string" ? auth.keyId.trim() : "";
     const label = keyName || keyId || (typeof auth.sub === "string" ? auth.sub : "");
-    return label ? translate("sales.orders.status_change.actor_api_key", "API key {name}", { name: label }) : unknownLabel;
+    return label ? translate(
+      "sales.orders.status_change.actor_api_key",
+      "API key {name}",
+      { name: label }
+    ) : unknownLabel;
   }
   const email = typeof auth.email === "string" ? auth.email.trim() : "";
   if (email) return email;
@@ -415,17 +441,29 @@ async function applyDocumentUpdate({
         deletedAt: null
       });
       if (!channel) {
-        throw new CrudHttpError(400, { error: translate("sales.documents.detail.channelInvalid", "Selected channel could not be found.") });
+        throw new CrudHttpError(400, {
+          error: translate(
+            "sales.documents.detail.channelInvalid",
+            "Selected channel could not be found."
+          )
+        });
       }
       entity.channelId = channel.id;
     }
   }
   if (input.statusEntryId !== void 0) {
-    const statusValue = await resolveDictionaryEntryValue(em, input.statusEntryId);
+    const statusValue = await resolveDictionaryEntryValue(
+      em,
+      input.statusEntryId
+    );
     if (input.statusEntryId && !statusValue) {
-      throw new CrudHttpError(400, { error: translate("sales.documents.detail.statusInvalid", "Selected status could not be found.") });
+      throw new CrudHttpError(400, {
+        error: translate(
+          "sales.documents.detail.statusInvalid",
+          "Selected status could not be found."
+        )
+      });
     }
-    ;
     entity.statusEntryId = input.statusEntryId ?? null;
     entity.status = statusValue;
   }
@@ -448,13 +486,23 @@ async function applyDocumentUpdate({
   if (input.shippingAddressId !== void 0) {
     entity.shippingAddressId = input.shippingAddressId ?? null;
     if (input.shippingAddressSnapshot === void 0) {
-      entity.shippingAddressSnapshot = await resolveAddressSnapshot(em, organizationId, tenantId, input.shippingAddressId);
+      entity.shippingAddressSnapshot = await resolveAddressSnapshot(
+        em,
+        organizationId,
+        tenantId,
+        input.shippingAddressId
+      );
     }
   }
   if (input.billingAddressId !== void 0) {
     entity.billingAddressId = input.billingAddressId ?? null;
     if (input.billingAddressSnapshot === void 0) {
-      entity.billingAddressSnapshot = await resolveAddressSnapshot(em, organizationId, tenantId, input.billingAddressId);
+      entity.billingAddressSnapshot = await resolveAddressSnapshot(
+        em,
+        organizationId,
+        tenantId,
+        input.billingAddressId
+      );
     }
   }
   if (input.shippingAddressSnapshot !== void 0) {
@@ -473,18 +521,20 @@ async function applyDocumentUpdate({
         deletedAt: null
       });
       if (!shippingMethod) {
-        throw new CrudHttpError(400, { error: translate("sales.documents.detail.shippingMethodInvalid", "Selected shipping method could not be found.") });
+        throw new CrudHttpError(400, {
+          error: translate(
+            "sales.documents.detail.shippingMethodInvalid",
+            "Selected shipping method could not be found."
+          )
+        });
       }
     }
-    ;
     entity.shippingMethodId = input.shippingMethodId ?? null;
     entity.shippingMethod = shippingMethod ?? null;
     entity.shippingMethodCode = input.shippingMethodCode ?? shippingMethod?.code ?? null;
     if (input.shippingMethodSnapshot !== void 0) {
-      ;
       entity.shippingMethodSnapshot = input.shippingMethodSnapshot ?? null;
     } else {
-      ;
       entity.shippingMethodSnapshot = shippingMethod ? {
         id: shippingMethod.id,
         code: shippingMethod.code,
@@ -514,18 +564,20 @@ async function applyDocumentUpdate({
         deletedAt: null
       });
       if (!paymentMethod) {
-        throw new CrudHttpError(400, { error: translate("sales.documents.detail.paymentMethodInvalid", "Selected payment method could not be found.") });
+        throw new CrudHttpError(400, {
+          error: translate(
+            "sales.documents.detail.paymentMethodInvalid",
+            "Selected payment method could not be found."
+          )
+        });
       }
     }
-    ;
     entity.paymentMethodId = input.paymentMethodId ?? null;
     entity.paymentMethod = paymentMethod ?? null;
     entity.paymentMethodCode = input.paymentMethodCode ?? paymentMethod?.code ?? null;
     if (input.paymentMethodSnapshot !== void 0) {
-      ;
       entity.paymentMethodSnapshot = input.paymentMethodSnapshot ?? null;
     } else {
-      ;
       entity.paymentMethodSnapshot = paymentMethod ? {
         id: paymentMethod.id,
         code: paymentMethod.code,
@@ -550,7 +602,6 @@ async function applyDocumentUpdate({
     });
   }
   if (input.customFieldSetId !== void 0) {
-    ;
     entity.customFieldSetId = input.customFieldSetId ?? null;
   }
   if (input.customFields !== void 0) {
@@ -567,9 +618,24 @@ async function applyDocumentUpdate({
 async function loadQuoteSnapshot(em, id) {
   const quote = await em.findOne(SalesQuote, { id, deletedAt: null });
   if (!quote) return null;
-  const lines = await em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } });
-  const adjustments = await em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } });
-  const [addresses, notes, tags, quoteCustomFields, lineCustomFields, adjustmentCustomFields] = await Promise.all([
+  const lines = await em.find(
+    SalesQuoteLine,
+    { quote },
+    { orderBy: { lineNumber: "asc" } }
+  );
+  const adjustments = await em.find(
+    SalesQuoteAdjustment,
+    { quote },
+    { orderBy: { position: "asc" } }
+  );
+  const [
+    addresses,
+    notes,
+    tags,
+    quoteCustomFields,
+    lineCustomFields,
+    adjustmentCustomFields
+  ] = await Promise.all([
     em.find(SalesDocumentAddress, { documentId: id, documentKind: "quote" }),
     em.find(SalesNote, { contextType: "quote", contextId: id }),
     findWithDecryption(
@@ -590,38 +656,48 @@ async function loadQuoteSnapshot(em, id) {
       em,
       entityId: E.sales.sales_quote_line,
       recordIds: lines.map((line) => line.id),
-      tenantIdByRecord: Object.fromEntries(lines.map((line) => [line.id, quote.tenantId])),
-      organizationIdByRecord: Object.fromEntries(lines.map((line) => [line.id, quote.organizationId]))
+      tenantIdByRecord: Object.fromEntries(
+        lines.map((line) => [line.id, quote.tenantId])
+      ),
+      organizationIdByRecord: Object.fromEntries(
+        lines.map((line) => [line.id, quote.organizationId])
+      )
     }) : Promise.resolve({}),
     adjustments.length ? loadCustomFieldValues({
       em,
       entityId: E.sales.sales_quote_adjustment,
       recordIds: adjustments.map((adj) => adj.id),
-      tenantIdByRecord: Object.fromEntries(adjustments.map((adj) => [adj.id, quote.tenantId])),
-      organizationIdByRecord: Object.fromEntries(adjustments.map((adj) => [adj.id, quote.organizationId]))
+      tenantIdByRecord: Object.fromEntries(
+        adjustments.map((adj) => [adj.id, quote.tenantId])
+      ),
+      organizationIdByRecord: Object.fromEntries(
+        adjustments.map((adj) => [adj.id, quote.organizationId])
+      )
     }) : Promise.resolve({})
   ]);
-  const addressSnapshots = addresses.map((entry) => ({
-    id: entry.id,
-    organizationId: entry.organizationId,
-    tenantId: entry.tenantId,
-    documentId: entry.documentId,
-    documentKind: "quote",
-    customerAddressId: entry.customerAddressId ?? null,
-    name: entry.name ?? null,
-    purpose: entry.purpose ?? null,
-    companyName: entry.companyName ?? null,
-    addressLine1: entry.addressLine1,
-    addressLine2: entry.addressLine2 ?? null,
-    city: entry.city ?? null,
-    region: entry.region ?? null,
-    postalCode: entry.postalCode ?? null,
-    country: entry.country ?? null,
-    buildingNumber: entry.buildingNumber ?? null,
-    flatNumber: entry.flatNumber ?? null,
-    latitude: entry.latitude ?? null,
-    longitude: entry.longitude ?? null
-  }));
+  const addressSnapshots = addresses.map(
+    (entry) => ({
+      id: entry.id,
+      organizationId: entry.organizationId,
+      tenantId: entry.tenantId,
+      documentId: entry.documentId,
+      documentKind: "quote",
+      customerAddressId: entry.customerAddressId ?? null,
+      name: entry.name ?? null,
+      purpose: entry.purpose ?? null,
+      companyName: entry.companyName ?? null,
+      addressLine1: entry.addressLine1,
+      addressLine2: entry.addressLine2 ?? null,
+      city: entry.city ?? null,
+      region: entry.region ?? null,
+      postalCode: entry.postalCode ?? null,
+      country: entry.country ?? null,
+      buildingNumber: entry.buildingNumber ?? null,
+      flatNumber: entry.flatNumber ?? null,
+      latitude: entry.latitude ?? null,
+      longitude: entry.longitude ?? null
+    })
+  );
   const noteSnapshots = notes.map((entry) => ({
     id: entry.id,
     organizationId: entry.organizationId,
@@ -703,6 +779,9 @@ async function loadQuoteSnapshot(em, id) {
       comment: line.comment ?? null,
       quantity: line.quantity,
       quantityUnit: line.quantityUnit ?? null,
+      normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+      normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+      uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
       currencyCode: line.currencyCode,
       unitPriceNet: line.unitPriceNet,
       unitPriceGross: line.unitPriceGross,
@@ -744,9 +823,26 @@ async function loadQuoteSnapshot(em, id) {
 async function loadOrderSnapshot(em, id) {
   const order = await em.findOne(SalesOrder, { id, deletedAt: null });
   if (!order) return null;
-  const lines = await em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } });
-  const adjustments = await em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } });
-  const [addresses, notes, tags, shipments, payments, orderCustomFields, lineCustomFields, adjustmentCustomFields] = await Promise.all([
+  const lines = await em.find(
+    SalesOrderLine,
+    { order },
+    { orderBy: { lineNumber: "asc" } }
+  );
+  const adjustments = await em.find(
+    SalesOrderAdjustment,
+    { order },
+    { orderBy: { position: "asc" } }
+  );
+  const [
+    addresses,
+    notes,
+    tags,
+    shipments,
+    payments,
+    orderCustomFields,
+    lineCustomFields,
+    adjustmentCustomFields
+  ] = await Promise.all([
     em.find(SalesDocumentAddress, { documentId: id, documentKind: "order" }),
     em.find(SalesNote, { contextType: "order", contextId: id }),
     findWithDecryption(
@@ -769,40 +865,54 @@ async function loadOrderSnapshot(em, id) {
       em,
       entityId: E.sales.sales_order_line,
       recordIds: lines.map((line) => line.id),
-      tenantIdByRecord: Object.fromEntries(lines.map((line) => [line.id, order.tenantId])),
-      organizationIdByRecord: Object.fromEntries(lines.map((line) => [line.id, order.organizationId]))
+      tenantIdByRecord: Object.fromEntries(
+        lines.map((line) => [line.id, order.tenantId])
+      ),
+      organizationIdByRecord: Object.fromEntries(
+        lines.map((line) => [line.id, order.organizationId])
+      )
     }) : Promise.resolve({}),
     adjustments.length ? loadCustomFieldValues({
       em,
       entityId: E.sales.sales_order_adjustment,
       recordIds: adjustments.map((adj) => adj.id),
-      tenantIdByRecord: Object.fromEntries(adjustments.map((adj) => [adj.id, order.tenantId])),
-      organizationIdByRecord: Object.fromEntries(adjustments.map((adj) => [adj.id, order.organizationId]))
+      tenantIdByRecord: Object.fromEntries(
+        adjustments.map((adj) => [adj.id, order.tenantId])
+      ),
+      organizationIdByRecord: Object.fromEntries(
+        adjustments.map((adj) => [adj.id, order.organizationId])
+      )
     }) : Promise.resolve({})
   ]);
-  const shipmentSnapshots = (await Promise.all(shipments.map((entry) => loadShipmentSnapshot(em, entry.id)))).filter((entry) => !!entry);
-  const paymentSnapshots = (await Promise.all(payments.map((entry) => loadPaymentSnapshot(em, entry.id)))).filter((entry) => !!entry);
-  const addressSnapshots = addresses.map((entry) => ({
-    id: entry.id,
-    organizationId: entry.organizationId,
-    tenantId: entry.tenantId,
-    documentId: entry.documentId,
-    documentKind: "order",
-    customerAddressId: entry.customerAddressId ?? null,
-    name: entry.name ?? null,
-    purpose: entry.purpose ?? null,
-    companyName: entry.companyName ?? null,
-    addressLine1: entry.addressLine1,
-    addressLine2: entry.addressLine2 ?? null,
-    city: entry.city ?? null,
-    region: entry.region ?? null,
-    postalCode: entry.postalCode ?? null,
-    country: entry.country ?? null,
-    buildingNumber: entry.buildingNumber ?? null,
-    flatNumber: entry.flatNumber ?? null,
-    latitude: entry.latitude ?? null,
-    longitude: entry.longitude ?? null
-  }));
+  const shipmentSnapshots = (await Promise.all(
+    shipments.map((entry) => loadShipmentSnapshot(em, entry.id))
+  )).filter((entry) => !!entry);
+  const paymentSnapshots = (await Promise.all(
+    payments.map((entry) => loadPaymentSnapshot(em, entry.id))
+  )).filter((entry) => !!entry);
+  const addressSnapshots = addresses.map(
+    (entry) => ({
+      id: entry.id,
+      organizationId: entry.organizationId,
+      tenantId: entry.tenantId,
+      documentId: entry.documentId,
+      documentKind: "order",
+      customerAddressId: entry.customerAddressId ?? null,
+      name: entry.name ?? null,
+      purpose: entry.purpose ?? null,
+      companyName: entry.companyName ?? null,
+      addressLine1: entry.addressLine1,
+      addressLine2: entry.addressLine2 ?? null,
+      city: entry.city ?? null,
+      region: entry.region ?? null,
+      postalCode: entry.postalCode ?? null,
+      country: entry.country ?? null,
+      buildingNumber: entry.buildingNumber ?? null,
+      flatNumber: entry.flatNumber ?? null,
+      latitude: entry.latitude ?? null,
+      longitude: entry.longitude ?? null
+    })
+  );
   const noteSnapshots = notes.map((entry) => ({
     id: entry.id,
     organizationId: entry.organizationId,
@@ -899,6 +1009,9 @@ async function loadOrderSnapshot(em, id) {
       comment: line.comment ?? null,
       quantity: line.quantity,
       quantityUnit: line.quantityUnit ?? null,
+      normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+      normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+      uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
       reservedQuantity: line.reservedQuantity,
       fulfilledQuantity: line.fulfilledQuantity,
       invoicedQuantity: line.invoicedQuantity,
@@ -975,6 +1088,391 @@ function toNumeric(value) {
   }
   return 0;
 }
+const UNIT_DICTIONARY_KEYS = ["unit", "units", "measurement_units"];
+const UOM_REFERENCE_UNITS = new Set(REFERENCE_UNIT_CODES);
+const UOM_NORMALIZED_SCALE = 6;
+const UOM_NORMALIZED_MAX = 1e12;
+const UNIT_PRICE_AUTOCONVERT_SCALE = 4;
+function createUomResolver() {
+  return {
+    dictionaryPromise: null,
+    unitExistsCache: /* @__PURE__ */ new Map(),
+    productCache: /* @__PURE__ */ new Map()
+  };
+}
+function normalizeUnitCode(value) {
+  return canonicalizeUnitCode(value);
+}
+function unitLookupKey(value) {
+  return toUnitLookupKey(value);
+}
+function roundNormalizedQuantity(value) {
+  const factor = 10 ** UOM_NORMALIZED_SCALE;
+  if (!Number.isFinite(value)) return 0;
+  return Math.round(value * factor) / factor;
+}
+function assertNormalizedPrecision(value) {
+  if (!Number.isFinite(value) || Math.abs(value) >= UOM_NORMALIZED_MAX) {
+    throw new CrudHttpError(422, { error: "uom.precision_overflow" });
+  }
+}
+function toOptionalNumber(value) {
+  if (value === null || value === void 0) return null;
+  if (typeof value === "number") return Number.isFinite(value) ? value : null;
+  if (typeof value === "string" && value.trim().length) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function resolveSnapshotToBaseFactor(snapshot) {
+  if (!snapshot || typeof snapshot !== "object") return 1;
+  const payload = snapshot;
+  const factor = toOptionalNumber(payload.toBaseFactor ?? payload.to_base_factor);
+  if (!Number.isFinite(factor) || !factor || factor <= 0) return 1;
+  return factor;
+}
+function roundAutoConvertedUnitPrice(value) {
+  if (!Number.isFinite(value) || value < 0) return null;
+  const factor = 10 ** UNIT_PRICE_AUTOCONVERT_SCALE;
+  const rounded = Math.round((value + Number.EPSILON) * factor) / factor;
+  return Number.isFinite(rounded) ? rounded : null;
+}
+function convertLineUnitPricesOnUnitChange(params) {
+  if (!params.existingSnapshot) {
+    return {
+      unitPriceNet: params.unitPriceNet,
+      unitPriceGross: params.unitPriceGross,
+      didConvert: false
+    };
+  }
+  const existingUnitPriceNet = typeof params.existingSnapshot.unitPriceNet === "number" && Number.isFinite(params.existingSnapshot.unitPriceNet) ? params.existingSnapshot.unitPriceNet : null;
+  const existingUnitPriceGross = typeof params.existingSnapshot.unitPriceGross === "number" && Number.isFinite(params.existingSnapshot.unitPriceGross) ? params.existingSnapshot.unitPriceGross : null;
+  const sameNumber = (left, right) => {
+    if (left === null || right === null) return left === right;
+    return Math.abs(left - right) < 1e-6;
+  };
+  const shouldConvertNet = params.unitPriceNet === null || sameNumber(params.unitPriceNet, existingUnitPriceNet);
+  const shouldConvertGross = params.unitPriceGross === null || sameNumber(params.unitPriceGross, existingUnitPriceGross);
+  if (!shouldConvertNet && !shouldConvertGross) {
+    return {
+      unitPriceNet: params.unitPriceNet,
+      unitPriceGross: params.unitPriceGross,
+      didConvert: false
+    };
+  }
+  const previousUnit = normalizeUnitCode(params.existingSnapshot?.quantityUnit ?? null);
+  const nextUnit = normalizeUnitCode(params.nextQuantityUnit);
+  if (!previousUnit || !nextUnit || previousUnit === nextUnit) {
+    return {
+      unitPriceNet: params.unitPriceNet,
+      unitPriceGross: params.unitPriceGross,
+      didConvert: false
+    };
+  }
+  const previousFactor = resolveSnapshotToBaseFactor(
+    params.existingSnapshot?.uomSnapshot ?? null
+  );
+  const nextFactor = resolveSnapshotToBaseFactor(params.nextUomSnapshot);
+  if (!Number.isFinite(previousFactor) || previousFactor <= 0 || !Number.isFinite(nextFactor) || nextFactor <= 0) {
+    return {
+      unitPriceNet: params.unitPriceNet,
+      unitPriceGross: params.unitPriceGross,
+      didConvert: false
+    };
+  }
+  const convertAmount = (value, shouldConvert) => {
+    if (!shouldConvert) return value;
+    if (value === null || !Number.isFinite(value)) return value;
+    const converted = roundAutoConvertedUnitPrice(value / previousFactor * nextFactor);
+    return converted ?? value;
+  };
+  const nextUnitPriceNet = convertAmount(params.unitPriceNet, shouldConvertNet);
+  const nextUnitPriceGross = convertAmount(
+    params.unitPriceGross,
+    shouldConvertGross
+  );
+  const didConvert = nextUnitPriceNet !== params.unitPriceNet || nextUnitPriceGross !== params.unitPriceGross;
+  return {
+    unitPriceNet: nextUnitPriceNet,
+    unitPriceGross: nextUnitPriceGross,
+    didConvert
+  };
+}
+function resolveReferenceUnit(value) {
+  const normalized = toUnitLookupKey(value);
+  if (!normalized) return null;
+  if (!UOM_REFERENCE_UNITS.has(normalized)) return null;
+  return normalized;
+}
+async function resolveUnitDictionaryScoped(em, organizationId, tenantId) {
+  return findOneWithDecryption(
+    em,
+    Dictionary,
+    {
+      organizationId,
+      tenantId,
+      key: { $in: [...UNIT_DICTIONARY_KEYS] },
+      deletedAt: null,
+      isActive: true
+    },
+    { orderBy: { createdAt: "asc" } }
+  );
+}
+async function assertUnitExists(em, resolver, organizationId, tenantId, unitCode) {
+  const normalizedCode = unitLookupKey(unitCode);
+  if (!normalizedCode) return;
+  const rawUnitCode = unitCode.trim();
+  if (!resolver.dictionaryPromise) {
+    resolver.dictionaryPromise = resolveUnitDictionaryScoped(
+      em,
+      organizationId,
+      tenantId
+    );
+  }
+  const dictionary = await resolver.dictionaryPromise;
+  if (!dictionary) {
+    throw new CrudHttpError(400, { error: "uom.unit_not_found" });
+  }
+  const cacheKey = `${dictionary.id}:${normalizedCode}`;
+  if (resolver.unitExistsCache.has(cacheKey)) {
+    if (!resolver.unitExistsCache.get(cacheKey)) {
+      throw new CrudHttpError(400, { error: "uom.unit_not_found" });
+    }
+    return;
+  }
+  const entry = await findOneWithDecryption(em, DictionaryEntry, {
+    dictionary,
+    organizationId: dictionary.organizationId,
+    tenantId: dictionary.tenantId,
+    $or: [{ normalizedValue: normalizedCode }, { value: rawUnitCode }]
+  });
+  const exists = !!entry;
+  resolver.unitExistsCache.set(cacheKey, exists);
+  if (!exists) {
+    throw new CrudHttpError(400, { error: "uom.unit_not_found" });
+  }
+}
+async function resolveProductUomState(em, resolver, organizationId, tenantId, productId) {
+  if (resolver.productCache.has(productId)) {
+    return resolver.productCache.get(productId) ?? null;
+  }
+  const product = await findOneWithDecryption(em, CatalogProduct, {
+    id: productId,
+    organizationId,
+    tenantId,
+    deletedAt: null
+  });
+  if (!product) {
+    resolver.productCache.set(productId, null);
+    return null;
+  }
+  const conversions = await findWithDecryption(em, CatalogProductUnitConversion, {
+    product: product.id,
+    organizationId,
+    tenantId,
+    deletedAt: null,
+    isActive: true
+  });
+  const conversionsByUnitKey = /* @__PURE__ */ new Map();
+  for (const conversion of conversions) {
+    const key = unitLookupKey(conversion.unitCode);
+    if (!key) continue;
+    conversionsByUnitKey.set(key, conversion);
+  }
+  const state = {
+    productId: product.id,
+    baseUnitCode: normalizeUnitCode(product.defaultUnit ?? null),
+    defaultSalesUnit: normalizeUnitCode(product.defaultSalesUnit ?? null),
+    unitPriceEnabled: Boolean(product.unitPriceEnabled),
+    unitPriceReferenceUnit: resolveReferenceUnit(
+      product.unitPriceReferenceUnit
+    ),
+    unitPriceBaseQuantity: product.unitPriceBaseQuantity ?? null,
+    conversionsByUnitKey
+  };
+  resolver.productCache.set(productId, state);
+  return state;
+}
+function buildUnitPriceReferenceSnapshot(params) {
+  if (!params.product.unitPriceEnabled) return void 0;
+  const baseQuantityNumber = toNumeric(params.product.unitPriceBaseQuantity);
+  const output = {
+    enabled: true,
+    referenceUnitCode: params.product.unitPriceReferenceUnit ?? null,
+    baseQuantity: params.product.unitPriceBaseQuantity ?? null
+  };
+  if (!params.product.unitPriceReferenceUnit || params.toBaseFactor <= 0 || baseQuantityNumber <= 0) {
+    return output;
+  }
+  if (typeof params.unitPriceGross === "number" && Number.isFinite(params.unitPriceGross)) {
+    output.grossPerReference = toNumericString(
+      params.unitPriceGross / params.toBaseFactor * baseQuantityNumber
+    );
+  }
+  if (typeof params.unitPriceNet === "number" && Number.isFinite(params.unitPriceNet)) {
+    output.netPerReference = toNumericString(
+      params.unitPriceNet / params.toBaseFactor * baseQuantityNumber
+    );
+  }
+  return output;
+}
+async function normalizeLineUom(input) {
+  const quantity = toNumeric(input.line.quantity);
+  const existingSnapshot = input.line.uomSnapshot && typeof input.line.uomSnapshot === "object" ? cloneJson(input.line.uomSnapshot) : null;
+  const productId = typeof input.line.productId === "string" ? input.line.productId : null;
+  const variantId = typeof input.line.productVariantId === "string" ? input.line.productVariantId : null;
+  const enteredUnitInput = normalizeUnitCode(input.line.quantityUnit);
+  if (!productId) {
+    if (enteredUnitInput) {
+      await assertUnitExists(
+        input.em,
+        input.resolver,
+        input.organizationId,
+        input.tenantId,
+        enteredUnitInput
+      );
+    }
+    const normalizedQuantity2 = toNumeric(
+      input.line.normalizedQuantity ?? quantity
+    );
+    assertNormalizedPrecision(normalizedQuantity2);
+    return {
+      quantity,
+      quantityUnit: enteredUnitInput ?? null,
+      normalizedQuantity: normalizedQuantity2,
+      normalizedUnit: normalizeUnitCode(input.line.normalizedUnit) ?? enteredUnitInput ?? null,
+      uomSnapshot: existingSnapshot ?? {
+        version: 1,
+        productId: null,
+        productVariantId: variantId,
+        baseUnitCode: normalizeUnitCode(input.line.normalizedUnit) ?? enteredUnitInput ?? null,
+        enteredUnitCode: enteredUnitInput,
+        enteredQuantity: toNumericString(quantity) ?? "0",
+        toBaseFactor: "1",
+        normalizedQuantity: toNumericString(normalizedQuantity2) ?? "0",
+        rounding: { mode: "half_up", scale: UOM_NORMALIZED_SCALE },
+        source: { conversionId: null, resolvedAt: (/* @__PURE__ */ new Date()).toISOString() }
+      }
+    };
+  }
+  const productState = await resolveProductUomState(
+    input.em,
+    input.resolver,
+    input.organizationId,
+    input.tenantId,
+    productId
+  );
+  if (!productState) {
+    if (enteredUnitInput) {
+      await assertUnitExists(
+        input.em,
+        input.resolver,
+        input.organizationId,
+        input.tenantId,
+        enteredUnitInput
+      );
+    }
+    const normalizedQuantity2 = toNumeric(
+      input.line.normalizedQuantity ?? quantity
+    );
+    assertNormalizedPrecision(normalizedQuantity2);
+    return {
+      quantity,
+      quantityUnit: enteredUnitInput ?? null,
+      normalizedQuantity: normalizedQuantity2,
+      normalizedUnit: normalizeUnitCode(input.line.normalizedUnit) ?? enteredUnitInput ?? null,
+      uomSnapshot: existingSnapshot
+    };
+  }
+  const baseUnitCode = productState.baseUnitCode;
+  const enteredUnitCode = enteredUnitInput ?? productState.defaultSalesUnit ?? baseUnitCode ?? normalizeUnitCode(input.line.normalizedUnit);
+  if (enteredUnitCode) {
+    await assertUnitExists(
+      input.em,
+      input.resolver,
+      input.organizationId,
+      input.tenantId,
+      enteredUnitCode
+    );
+  }
+  if (baseUnitCode) {
+    await assertUnitExists(
+      input.em,
+      input.resolver,
+      input.organizationId,
+      input.tenantId,
+      baseUnitCode
+    );
+  }
+  if (!baseUnitCode) {
+    const requiresBase = Boolean(enteredUnitCode) || productState.conversionsByUnitKey.size > 0 || Boolean(productState.defaultSalesUnit);
+    if (requiresBase) {
+      throw new CrudHttpError(400, { error: "uom.default_unit_missing" });
+    }
+    const normalizedQuantity2 = toNumeric(
+      input.line.normalizedQuantity ?? quantity
+    );
+    assertNormalizedPrecision(normalizedQuantity2);
+    return {
+      quantity,
+      quantityUnit: enteredUnitCode ?? null,
+      normalizedQuantity: normalizedQuantity2,
+      normalizedUnit: normalizeUnitCode(input.line.normalizedUnit) ?? enteredUnitCode ?? null,
+      uomSnapshot: existingSnapshot
+    };
+  }
+  const resolvedEnteredUnit = enteredUnitCode ?? baseUnitCode;
+  const enteredKey = unitLookupKey(resolvedEnteredUnit);
+  const baseKey = unitLookupKey(baseUnitCode);
+  let toBaseFactor = 1;
+  let conversionId = null;
+  if (enteredKey && baseKey && enteredKey !== baseKey) {
+    const conversion = productState.conversionsByUnitKey.get(enteredKey);
+    if (!conversion) {
+      throw new CrudHttpError(400, { error: "uom.conversion_not_found" });
+    }
+    toBaseFactor = toNumeric(conversion.toBaseFactor);
+    conversionId = conversion.id;
+  }
+  if (!Number.isFinite(toBaseFactor) || toBaseFactor <= 0) {
+    throw new CrudHttpError(400, { error: "uom.invalid_factor" });
+  }
+  const normalizedQuantity = roundNormalizedQuantity(quantity * toBaseFactor);
+  assertNormalizedPrecision(normalizedQuantity);
+  const unitPriceReference = buildUnitPriceReferenceSnapshot({
+    product: productState,
+    toBaseFactor,
+    unitPriceNet: toOptionalNumber(input.line.unitPriceNet),
+    unitPriceGross: toOptionalNumber(input.line.unitPriceGross)
+  });
+  const snapshot = {
+    version: 1,
+    productId,
+    productVariantId: variantId,
+    baseUnitCode,
+    enteredUnitCode: resolvedEnteredUnit,
+    enteredQuantity: toNumericString(quantity) ?? "0",
+    toBaseFactor: toNumericString(toBaseFactor) ?? "1",
+    normalizedQuantity: toNumericString(normalizedQuantity) ?? "0",
+    rounding: {
+      mode: "half_up",
+      scale: UOM_NORMALIZED_SCALE
+    },
+    source: {
+      conversionId,
+      resolvedAt: (/* @__PURE__ */ new Date()).toISOString()
+    },
+    ...unitPriceReference ? { unitPriceReference } : {}
+  };
+  return {
+    quantity,
+    quantityUnit: resolvedEnteredUnit,
+    normalizedQuantity,
+    normalizedUnit: baseUnitCode,
+    uomSnapshot: snapshot
+  };
+}
 function normalizeShippingMethodContext(snapshot, id, code, currencyCode) {
   if (!snapshot || typeof snapshot !== "object") return null;
   const metadata = snapshot.metadata;
@@ -1052,6 +1550,9 @@ function mapOrderLineEntityToSnapshot(line) {
     comment: line.comment ?? null,
     quantity: toNumeric(line.quantity),
     quantityUnit: line.quantityUnit ?? null,
+    normalizedQuantity: toNumeric(line.normalizedQuantity ?? line.quantity),
+    normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+    uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
     currencyCode: line.currencyCode,
     unitPriceNet: toNumeric(line.unitPriceNet),
     unitPriceGross: toNumeric(line.unitPriceGross),
@@ -1079,6 +1580,9 @@ function mapQuoteLineEntityToSnapshot(line) {
     comment: line.comment ?? null,
     quantity: toNumeric(line.quantity),
     quantityUnit: line.quantityUnit ?? null,
+    normalizedQuantity: toNumeric(line.normalizedQuantity ?? line.quantity),
+    normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+    uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
     currencyCode: line.currencyCode,
     unitPriceNet: toNumeric(line.unitPriceNet),
     unitPriceGross: toNumeric(line.unitPriceGross),
@@ -1133,6 +1637,10 @@ async function emitTotalsCalculated(eventBus, payload) {
   await eventBus.emitEvent("sales.document.totals.calculated", payload);
 }
 function createLineSnapshotFromInput(line, lineNumber) {
+  const quantity = Number(line.quantity ?? 0);
+  const normalizedQuantity = toNumeric(
+    line.normalizedQuantity ?? quantity
+  );
   return {
     lineNumber,
     kind: line.kind ?? "product",
@@ -1141,8 +1649,11 @@ function createLineSnapshotFromInput(line, lineNumber) {
     name: line.name ?? null,
     description: line.description ?? null,
     comment: line.comment ?? null,
-    quantity: Number(line.quantity ?? 0),
+    quantity,
     quantityUnit: line.quantityUnit ?? null,
+    normalizedQuantity,
+    normalizedUnit: typeof line.normalizedUnit === "string" ? line.normalizedUnit : line.quantityUnit ?? null,
+    uomSnapshot: line.uomSnapshot && typeof line.uomSnapshot === "object" ? cloneJson(line.uomSnapshot) : null,
     currencyCode: line.currencyCode,
     unitPriceNet: line.unitPriceNet ?? null,
     unitPriceGross: line.unitPriceGross ?? null,
@@ -1162,7 +1673,9 @@ function createLineSnapshotFromInput(line, lineNumber) {
 function createAdjustmentDraftFromInput(adjustment) {
   const lineRef = "quoteLineId" in adjustment ? adjustment.quoteLineId : adjustment.orderLineId;
   if (adjustment.scope === "line" && lineRef) {
-    throw new CrudHttpError(400, { error: "Line-scoped adjustments are not supported yet." });
+    throw new CrudHttpError(400, {
+      error: "Line-scoped adjustments are not supported yet."
+    });
   }
   return {
     id: typeof adjustment.id === "string" ? adjustment.id : void 0,
@@ -1194,8 +1707,13 @@ function convertLineCalculationToEntityInput(lineResult, sourceLine, document, i
     comment: line.comment ?? null,
     quantity: toNumericString(line.quantity) ?? "0",
     quantityUnit: line.quantityUnit ?? null,
+    normalizedQuantity: toNumericString(line.normalizedQuantity ?? line.quantity) ?? "0",
+    normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+    uomSnapshot: line.uomSnapshot && typeof line.uomSnapshot === "object" ? cloneJson(line.uomSnapshot) : null,
     currencyCode: line.currencyCode,
-    unitPriceNet: toNumericString(line.unitPriceNet ?? lineResult.netAmount / Math.max(line.quantity || 1, 1)) ?? "0",
+    unitPriceNet: toNumericString(
+      line.unitPriceNet ?? lineResult.netAmount / Math.max(line.quantity || 1, 1)
+    ) ?? "0",
     unitPriceGross: toNumericString(
       line.unitPriceGross ?? lineResult.grossAmount / Math.max(line.quantity || 1, 1)
     ) ?? "0",
@@ -1251,7 +1769,12 @@ async function applyOrderLineResults(params) {
     const sourceLine = sourceLines[index];
     const statusEntryId = sourceLine.statusEntryId ?? null;
     const statusValue = await resolveStatus(statusEntryId ?? null);
-    const payload = convertLineCalculationToEntityInput(lineResult, sourceLine, order, index);
+    const payload = convertLineCalculationToEntityInput(
+      lineResult,
+      sourceLine,
+      order,
+      index
+    );
     const existing = sourceLine.id ? existingMap.get(sourceLine.id) ?? null : null;
     const lineEntity = existing ?? em.create(SalesOrderLine, {
       order,
@@ -1306,7 +1829,12 @@ async function applyQuoteLineResults(params) {
     const sourceLine = sourceLines[index];
     const statusEntryId = sourceLine.statusEntryId ?? null;
     const statusValue = await resolveStatus(statusEntryId ?? null);
-    const payload = convertLineCalculationToEntityInput(lineResult, sourceLine, quote, index);
+    const payload = convertLineCalculationToEntityInput(
+      lineResult,
+      sourceLine,
+      quote,
+      index
+    );
     const existing = sourceLine.id ? existingMap.get(sourceLine.id) ?? null : null;
     const lineEntity = existing ?? em.create(SalesQuoteLine, {
       quote,
@@ -1353,7 +1881,12 @@ async function replaceQuoteLines(em, quote, calculation, lineInputs) {
   for (let index = 0; index < calculation.lines.length; index += 1) {
     const lineResult = calculation.lines[index];
     const sourceLine = lineInputs[index];
-    const entityInput = convertLineCalculationToEntityInput(lineResult, sourceLine, quote, index);
+    const entityInput = convertLineCalculationToEntityInput(
+      lineResult,
+      sourceLine,
+      quote,
+      index
+    );
     const statusValue = await resolveStatus(sourceLine.statusEntryId ?? null);
     const lineEntity = em.create(SalesQuoteLine, {
       quote,
@@ -1377,7 +1910,11 @@ async function replaceQuoteLines(em, quote, calculation, lineInputs) {
   }
 }
 async function replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs) {
-  const existing = await em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } });
+  const existing = await em.find(
+    SalesQuoteAdjustment,
+    { quote },
+    { orderBy: { position: "asc" } }
+  );
   const existingMap = /* @__PURE__ */ new Map();
   existing.forEach((adj) => existingMap.set(adj.id, adj));
   const seen = /* @__PURE__ */ new Set();
@@ -1386,7 +1923,12 @@ async function replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs)
     const draft = adjustmentDrafts[index];
     const sourceById = adjustmentInputs?.find((adj) => adj.id === draft.id) ?? null;
     const source = sourceById ?? (adjustmentInputs ? adjustmentInputs[index] ?? null : null);
-    const entityInput = convertAdjustmentResultToEntityInput(draft, source, quote, index);
+    const entityInput = convertAdjustmentResultToEntityInput(
+      draft,
+      source,
+      quote,
+      index
+    );
     const adjustmentId = draft.id ?? source?.id ?? randomUUID();
     const existingEntity = existingMap.get(adjustmentId);
     const entity = existingEntity ?? em.create(SalesQuoteAdjustment, {
@@ -1441,7 +1983,12 @@ async function replaceOrderLines(em, order, calculation, lineInputs) {
   for (let index = 0; index < calculation.lines.length; index += 1) {
     const lineResult = calculation.lines[index];
     const sourceLine = lineInputs[index];
-    const entityInput = convertLineCalculationToEntityInput(lineResult, sourceLine, order, index);
+    const entityInput = convertLineCalculationToEntityInput(
+      lineResult,
+      sourceLine,
+      order,
+      index
+    );
     const statusValue = await resolveStatus(sourceLine.statusEntryId ?? null);
     const lineEntity = em.create(SalesOrderLine, {
       order,
@@ -1469,7 +2016,11 @@ async function replaceOrderLines(em, order, calculation, lineInputs) {
   }
 }
 async function replaceOrderAdjustments(em, order, calculation, adjustmentInputs) {
-  const existing = await em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } });
+  const existing = await em.find(
+    SalesOrderAdjustment,
+    { order },
+    { orderBy: { position: "asc" } }
+  );
   const existingMap = /* @__PURE__ */ new Map();
   existing.forEach((adj) => existingMap.set(adj.id, adj));
   const seen = /* @__PURE__ */ new Set();
@@ -1478,7 +2029,12 @@ async function replaceOrderAdjustments(em, order, calculation, adjustmentInputs)
     const draft = adjustmentDrafts[index];
     const sourceById = adjustmentInputs?.find((adj) => adj.id === draft.id) ?? null;
     const source = sourceById ?? (adjustmentInputs ? adjustmentInputs[index] ?? null : null);
-    const entityInput = convertAdjustmentResultToEntityInput(draft, source, order, index);
+    const entityInput = convertAdjustmentResultToEntityInput(
+      draft,
+      source,
+      order,
+      index
+    );
     const adjustmentId = draft.id ?? source?.id ?? randomUUID();
     const existingEntity = existingMap.get(adjustmentId);
     const entity = existingEntity ?? em.create(SalesOrderAdjustment, {
@@ -1547,7 +2103,8 @@ function applyOrderTotals(order, totals, lineCount) {
   order.lineItemCount = lineCount;
 }
 function normalizePaymentTotal(value) {
-  if (typeof value === "number" && Number.isFinite(value)) return Math.max(value, 0);
+  if (typeof value === "number" && Number.isFinite(value))
+    return Math.max(value, 0);
   if (typeof value === "string" && value.trim().length) {
     const parsed = Number(value);
     return Number.isFinite(parsed) ? Math.max(parsed, 0) : 0;
@@ -1645,7 +2202,10 @@ async function syncSalesDocumentTags(em, params) {
   if (params.tagIds === void 0) return;
   const tagIds = normalizeTagIds(params.tagIds);
   if (tagIds.length === 0) {
-    await em.nativeDelete(SalesDocumentTagAssignment, { documentId: params.documentId, documentKind: params.kind });
+    await em.nativeDelete(SalesDocumentTagAssignment, {
+      documentId: params.documentId,
+      documentKind: params.kind
+    });
     return;
   }
   const tagsInScope = await em.find(SalesDocumentTag, {
@@ -1654,10 +2214,15 @@ async function syncSalesDocumentTags(em, params) {
     tenantId: params.tenantId
   });
   if (tagsInScope.length !== tagIds.length) {
-    throw new CrudHttpError(400, { error: "One or more tags not found for this scope" });
+    throw new CrudHttpError(400, {
+      error: "One or more tags not found for this scope"
+    });
   }
   const byId = new Map(tagsInScope.map((tag) => [tag.id, tag]));
-  await em.nativeDelete(SalesDocumentTagAssignment, { documentId: params.documentId, documentKind: params.kind });
+  await em.nativeDelete(SalesDocumentTagAssignment, {
+    documentId: params.documentId,
+    documentKind: params.kind
+  });
   for (const tagId of tagIds) {
     const tag = byId.get(tagId);
     if (!tag) continue;
@@ -1815,9 +2380,20 @@ async function restoreQuoteGraph(em, snapshot) {
   }
   applyQuoteSnapshot(quote, snapshot.quote);
   await em.flush();
-  const existingLines = await em.find(SalesQuoteLine, { quote: quote.id }, { fields: ["id"] });
-  const existingAdjustments = await em.find(SalesQuoteAdjustment, { quote: quote.id }, { fields: ["id"] });
-  await em.nativeDelete(CustomFieldValue, { entityId: E.sales.sales_quote, recordId: quote.id });
+  const existingLines = await em.find(
+    SalesQuoteLine,
+    { quote: quote.id },
+    { fields: ["id"] }
+  );
+  const existingAdjustments = await em.find(
+    SalesQuoteAdjustment,
+    { quote: quote.id },
+    { fields: ["id"] }
+  );
+  await em.nativeDelete(CustomFieldValue, {
+    entityId: E.sales.sales_quote,
+    recordId: quote.id
+  });
   if (existingLines.length) {
     await em.nativeDelete(CustomFieldValue, {
       entityId: E.sales.sales_quote_line,
@@ -1833,13 +2409,24 @@ async function restoreQuoteGraph(em, snapshot) {
   const addressSnapshots = Array.isArray(snapshot.addresses) ? snapshot.addresses : [];
   const noteSnapshots = Array.isArray(snapshot.notes) ? snapshot.notes : [];
   const tagSnapshots = Array.isArray(snapshot.tags) ? snapshot.tags : [];
-  await em.nativeDelete(SalesDocumentAddress, { documentId: quote.id, documentKind: "quote" });
-  await em.nativeDelete(SalesNote, { contextType: "quote", contextId: quote.id });
-  await em.nativeDelete(SalesDocumentTagAssignment, { documentId: quote.id, documentKind: "quote" });
+  await em.nativeDelete(SalesDocumentAddress, {
+    documentId: quote.id,
+    documentKind: "quote"
+  });
+  await em.nativeDelete(SalesNote, {
+    contextType: "quote",
+    contextId: quote.id
+  });
+  await em.nativeDelete(SalesDocumentTagAssignment, {
+    documentId: quote.id,
+    documentKind: "quote"
+  });
   await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
   await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
   existingLines.forEach((entry) => em.getUnitOfWork().unsetIdentity(entry));
-  existingAdjustments.forEach((entry) => em.getUnitOfWork().unsetIdentity(entry));
+  existingAdjustments.forEach(
+    (entry) => em.getUnitOfWork().unsetIdentity(entry)
+  );
   snapshot.lines.forEach((line) => {
     const lineEntity = em.create(SalesQuoteLine, {
       id: line.id,
@@ -1858,6 +2445,9 @@ async function restoreQuoteGraph(em, snapshot) {
       comment: line.comment ?? null,
       quantity: line.quantity,
       quantityUnit: line.quantityUnit ?? null,
+      normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+      normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+      uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
       currencyCode: line.currencyCode,
       unitPriceNet: line.unitPriceNet,
       unitPriceGross: line.unitPriceGross,
@@ -2056,9 +2646,20 @@ async function restoreOrderGraph(em, snapshot) {
   }
   applyOrderSnapshot(order, snapshot.order);
   await em.flush();
-  const existingLines = await em.find(SalesOrderLine, { order: order.id }, { fields: ["id"] });
-  const existingAdjustments = await em.find(SalesOrderAdjustment, { order: order.id }, { fields: ["id"] });
-  await em.nativeDelete(CustomFieldValue, { entityId: E.sales.sales_order, recordId: order.id });
+  const existingLines = await em.find(
+    SalesOrderLine,
+    { order: order.id },
+    { fields: ["id"] }
+  );
+  const existingAdjustments = await em.find(
+    SalesOrderAdjustment,
+    { order: order.id },
+    { fields: ["id"] }
+  );
+  await em.nativeDelete(CustomFieldValue, {
+    entityId: E.sales.sales_order,
+    recordId: order.id
+  });
   if (existingLines.length) {
     await em.nativeDelete(CustomFieldValue, {
       entityId: E.sales.sales_order_line,
@@ -2079,19 +2680,34 @@ async function restoreOrderGraph(em, snapshot) {
   const existingShipments = await em.find(SalesShipment, { order: order.id });
   const shipmentIds = existingShipments.map((entry) => entry.id);
   if (shipmentIds.length) {
-    await em.nativeDelete(SalesShipmentItem, { shipment: { $in: shipmentIds } });
+    await em.nativeDelete(SalesShipmentItem, {
+      shipment: { $in: shipmentIds }
+    });
     await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
-    existingShipments.forEach((entry) => em.getUnitOfWork().unsetIdentity(entry));
+    existingShipments.forEach(
+      (entry) => em.getUnitOfWork().unsetIdentity(entry)
+    );
   }
   await em.nativeDelete(SalesPaymentAllocation, { order: order.id });
   await em.nativeDelete(SalesPayment, { order: order.id });
-  await em.nativeDelete(SalesDocumentAddress, { documentId: order.id, documentKind: "order" });
-  await em.nativeDelete(SalesNote, { contextType: "order", contextId: order.id });
-  await em.nativeDelete(SalesDocumentTagAssignment, { documentId: order.id, documentKind: "order" });
+  await em.nativeDelete(SalesDocumentAddress, {
+    documentId: order.id,
+    documentKind: "order"
+  });
+  await em.nativeDelete(SalesNote, {
+    contextType: "order",
+    contextId: order.id
+  });
+  await em.nativeDelete(SalesDocumentTagAssignment, {
+    documentId: order.id,
+    documentKind: "order"
+  });
   await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
   await em.nativeDelete(SalesOrderLine, { order: order.id });
   existingLines.forEach((entry) => em.getUnitOfWork().unsetIdentity(entry));
-  existingAdjustments.forEach((entry) => em.getUnitOfWork().unsetIdentity(entry));
+  existingAdjustments.forEach(
+    (entry) => em.getUnitOfWork().unsetIdentity(entry)
+  );
   snapshot.lines.forEach((line) => {
     const lineEntity = em.create(SalesOrderLine, {
       id: line.id,
@@ -2110,6 +2726,9 @@ async function restoreOrderGraph(em, snapshot) {
       comment: line.comment ?? null,
       quantity: line.quantity,
       quantityUnit: line.quantityUnit ?? null,
+      normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+      normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+      uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
       reservedQuantity: line.reservedQuantity,
       fulfilledQuantity: line.fulfilledQuantity,
       invoicedQuantity: line.invoicedQuantity,
@@ -2257,7 +2876,9 @@ async function restoreOrderGraph(em, snapshot) {
 const createQuoteCommand = {
   id: "sales.quotes.create",
   async execute(rawInput, ctx) {
-    const generator = ctx.container.resolve("salesDocumentNumberGenerator");
+    const generator = ctx.container.resolve(
+      "salesDocumentNumberGenerator"
+    );
     const initial = quoteCreateSchema.parse(rawInput ?? {});
     const quoteNumber = typeof initial.quoteNumber === "string" && initial.quoteNumber.trim().length ? initial.quoteNumber.trim() : (await generator.generate({
       kind: "quote",
@@ -2279,7 +2900,10 @@ const createQuoteCommand = {
       deliveryWindow,
       paymentMethod
     } = await resolveDocumentReferences(em, parsed);
-    const quoteStatus = await resolveDictionaryEntryValue(em, parsed.statusEntryId ?? null);
+    const quoteStatus = await resolveDictionaryEntryValue(
+      em,
+      parsed.statusEntryId ?? null
+    );
     const quoteId = randomUUID();
     const quote = em.create(SalesQuote, {
       id: quoteId,
@@ -2370,6 +2994,26 @@ const createQuoteCommand = {
         lineNumber: line.lineNumber ?? index + 1
       })
     );
+    const uomResolver = createUomResolver();
+    const normalizedLineInputs = await Promise.all(
+      lineInputs.map(async (line) => {
+        const normalized = await normalizeLineUom({
+          em,
+          resolver: uomResolver,
+          organizationId: parsed.organizationId,
+          tenantId: parsed.tenantId,
+          line
+        });
+        return {
+          ...line,
+          quantity: normalized.quantity,
+          quantityUnit: normalized.quantityUnit,
+          normalizedQuantity: normalized.normalizedQuantity,
+          normalizedUnit: normalized.normalizedUnit,
+          uomSnapshot: normalized.uomSnapshot
+        };
+      })
+    );
     const adjustmentInputs = parsed.adjustments ? parsed.adjustments.map(
       (adj) => quoteAdjustmentCreateSchema.parse({
         ...adj,
@@ -2378,7 +3022,7 @@ const createQuoteCommand = {
         quoteId: quote.id
       })
     ) : null;
-    const lineSnapshots = lineInputs.map(
+    const lineSnapshots = normalizedLineInputs.map(
       (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
     );
     const adjustmentDrafts = adjustmentInputs ? adjustmentInputs.map((adj) => createAdjustmentDraftFromInput(adj)) : [];
@@ -2400,7 +3044,7 @@ const createQuoteCommand = {
       adjustments: adjustmentDrafts,
       context: calculationContext
     });
-    await replaceQuoteLines(em, quote, calculation, lineInputs);
+    await replaceQuoteLines(em, quote, calculation, normalizedLineInputs);
     await replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs);
     applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
     let eventBus = null;
@@ -2428,7 +3072,9 @@ const createQuoteCommand = {
     await em.flush();
     try {
       const notificationService = resolveNotificationService(ctx.container);
-      const typeDef = notificationTypes.find((type) => type.type === "sales.quote.created");
+      const typeDef = notificationTypes.find(
+        (type) => type.type === "sales.quote.created"
+      );
       if (typeDef) {
         const totalAmount = quote.grandTotalGrossAmount && quote.currencyCode ? `${quote.grandTotalGrossAmount} ${quote.currencyCode}` : "";
         const totalDisplay = totalAmount ? ` (${totalAmount})` : "";
@@ -2449,7 +3095,10 @@ const createQuoteCommand = {
         });
       }
     } catch (err) {
-      console.error("[sales.quotes.create] Failed to create notification:", err);
+      console.error(
+        "[sales.quotes.create] Failed to create notification:",
+        err
+      );
     }
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -2468,7 +3117,11 @@ const createQuoteCommand = {
     await invalidateCrudCache(
       ctx.container,
       resourceKind,
-      { id: quote.id, organizationId: quote.organizationId, tenantId: quote.tenantId },
+      {
+        id: quote.id,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId
+      },
       ctx.auth?.tenantId ?? null,
       "created"
     );
@@ -2517,7 +3170,11 @@ const deleteQuoteCommand = {
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, id);
     if (snapshot) {
-      ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     }
     return snapshot ? { before: snapshot } : {};
   },
@@ -2525,18 +3182,34 @@ const deleteQuoteCommand = {
     const id = requireId(input, "Quote id is required");
     const em = ctx.container.resolve("em").fork();
     const quote = await em.findOne(SalesQuote, { id });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const [addresses, notes, tags, adjustments, lines] = await Promise.all([
-      em.find(SalesDocumentAddress, { documentId: quote.id, documentKind: "quote" }),
+      em.find(SalesDocumentAddress, {
+        documentId: quote.id,
+        documentKind: "quote"
+      }),
       em.find(SalesNote, { contextType: "quote", contextId: quote.id }),
-      em.find(SalesDocumentTagAssignment, { documentId: quote.id, documentKind: "quote" }),
+      em.find(SalesDocumentTagAssignment, {
+        documentId: quote.id,
+        documentKind: "quote"
+      }),
       em.find(SalesQuoteAdjustment, { quote: quote.id }),
       em.find(SalesQuoteLine, { quote: quote.id })
     ]);
-    await em.nativeDelete(SalesDocumentAddress, { documentId: quote.id, documentKind: "quote" });
-    await em.nativeDelete(SalesNote, { contextType: "quote", contextId: quote.id });
-    await em.nativeDelete(SalesDocumentTagAssignment, { documentId: quote.id, documentKind: "quote" });
+    await em.nativeDelete(SalesDocumentAddress, {
+      documentId: quote.id,
+      documentKind: "quote"
+    });
+    await em.nativeDelete(SalesNote, {
+      contextType: "quote",
+      contextId: quote.id
+    });
+    await em.nativeDelete(SalesDocumentTagAssignment, {
+      documentId: quote.id,
+      documentKind: "quote"
+    });
     await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
     await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
     em.remove(quote);
@@ -2545,10 +3218,22 @@ const deleteQuoteCommand = {
     await Promise.all([
       queueDeletionSideEffects(dataEngine, quote, E.sales.sales_quote),
       queueDeletionSideEffects(dataEngine, lines, E.sales.sales_quote_line),
-      queueDeletionSideEffects(dataEngine, adjustments, E.sales.sales_quote_adjustment),
-      queueDeletionSideEffects(dataEngine, addresses, E.sales.sales_document_address),
+      queueDeletionSideEffects(
+        dataEngine,
+        adjustments,
+        E.sales.sales_quote_adjustment
+      ),
+      queueDeletionSideEffects(
+        dataEngine,
+        addresses,
+        E.sales.sales_document_address
+      ),
       queueDeletionSideEffects(dataEngine, notes, E.sales.sales_note),
-      queueDeletionSideEffects(dataEngine, tags, E.sales.sales_document_tag_assignment)
+      queueDeletionSideEffects(
+        dataEngine,
+        tags,
+        E.sales.sales_document_tag_assignment
+      )
     ]);
     return { quoteId: id };
   },
@@ -2587,15 +3272,23 @@ const updateQuoteCommand = {
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, parsed.id);
     if (snapshot) {
-      ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     }
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
     const parsed = documentUpdateSchema.parse(rawInput ?? {});
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: parsed.id, deletedAt: null });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    const quote = await em.findOne(SalesQuote, {
+      id: parsed.id,
+      deletedAt: null
+    });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const shouldInvalidateSentToken = (quote.status ?? null) === "sent";
     if (shouldInvalidateSentToken) {
@@ -2603,7 +3296,12 @@ const updateQuoteCommand = {
       quote.sentAt = null;
     }
     const shouldRecalculateTotals = parsed.shippingMethodId !== void 0 || parsed.shippingMethodSnapshot !== void 0 || parsed.shippingMethodCode !== void 0 || parsed.paymentMethodId !== void 0 || parsed.paymentMethodSnapshot !== void 0 || parsed.paymentMethodCode !== void 0 || parsed.currencyCode !== void 0;
-    await applyDocumentUpdate({ kind: "quote", entity: quote, input: parsed, em });
+    await applyDocumentUpdate({
+      kind: "quote",
+      entity: quote,
+      input: parsed,
+      em
+    });
     await em.flush();
     if (shouldInvalidateSentToken) {
       quote.status = "draft";
@@ -2616,7 +3314,11 @@ const updateQuoteCommand = {
     if (shouldRecalculateTotals) {
       const [existingLines, adjustments] = await Promise.all([
         em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-        em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } })
+        em.find(
+          SalesQuoteAdjustment,
+          { quote },
+          { orderBy: { position: "asc" } }
+        )
       ]);
       const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
       const calcLines = lineSnapshots.map(
@@ -2635,7 +3337,9 @@ const updateQuoteCommand = {
         )
       );
       const adjustmentDrafts = adjustments.map(mapQuoteAdjustmentToDraft);
-      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const salesCalculationService = ctx.container.resolve(
+        "salesCalculationService"
+      );
       const calculationContext = buildCalculationContext({
         tenantId: quote.tenantId,
         organizationId: quote.organizationId,
@@ -2647,12 +3351,14 @@ const updateQuoteCommand = {
         shippingMethodCode: quote.shippingMethodCode ?? null,
         paymentMethodCode: quote.paymentMethodCode ?? null
       });
-      const calculation = await salesCalculationService.calculateDocumentTotals({
-        documentKind: "quote",
-        lines: calcLines,
-        adjustments: adjustmentDrafts,
-        context: calculationContext
-      });
+      const calculation = await salesCalculationService.calculateDocumentTotals(
+        {
+          documentKind: "quote",
+          lines: calcLines,
+          adjustments: adjustmentDrafts,
+          context: calculationContext
+        }
+      );
       const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
         organizationId: quote.organizationId,
         tenantId: quote.tenantId,
@@ -2694,7 +3400,11 @@ const updateQuoteCommand = {
     await invalidateCrudCache(
       ctx.container,
       resourceKind,
-      { id: quote.id, organizationId: quote.organizationId, tenantId: quote.tenantId },
+      {
+        id: quote.id,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId
+      },
       ctx.auth?.tenantId ?? null,
       "updated"
     );
@@ -2753,25 +3463,42 @@ const updateOrderCommand = {
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, parsed.id);
     if (snapshot) {
-      ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     }
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
     const parsed = documentUpdateSchema.parse(rawInput ?? {});
     const em = ctx.container.resolve("em").fork();
-    const order = await em.findOne(SalesOrder, { id: parsed.id, deletedAt: null });
-    if (!order) throw new CrudHttpError(404, { error: "Sales order not found" });
+    const order = await em.findOne(SalesOrder, {
+      id: parsed.id,
+      deletedAt: null
+    });
+    if (!order)
+      throw new CrudHttpError(404, { error: "Sales order not found" });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const previousStatus = normalizeStatusValue(order.status);
     let statusChangeNote = null;
     const shouldRecalculateTotals = parsed.shippingMethodId !== void 0 || parsed.shippingMethodSnapshot !== void 0 || parsed.shippingMethodCode !== void 0 || parsed.paymentMethodId !== void 0 || parsed.paymentMethodSnapshot !== void 0 || parsed.paymentMethodCode !== void 0 || parsed.currencyCode !== void 0;
-    await applyDocumentUpdate({ kind: "order", entity: order, input: parsed, em });
+    await applyDocumentUpdate({
+      kind: "order",
+      entity: order,
+      input: parsed,
+      em
+    });
     await em.flush();
     if (shouldRecalculateTotals) {
       const [existingLines, adjustments] = await Promise.all([
         em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-        em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } })
+        em.find(
+          SalesOrderAdjustment,
+          { order },
+          { orderBy: { position: "asc" } }
+        )
       ]);
       const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
       const calcLines = lineSnapshots.map(
@@ -2790,7 +3517,9 @@ const updateOrderCommand = {
         )
       );
       const adjustmentDrafts = adjustments.map(mapOrderAdjustmentToDraft);
-      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const salesCalculationService = ctx.container.resolve(
+        "salesCalculationService"
+      );
       const calculationContext = buildCalculationContext({
         tenantId: order.tenantId,
         organizationId: order.organizationId,
@@ -2802,13 +3531,15 @@ const updateOrderCommand = {
         shippingMethodCode: order.shippingMethodCode ?? null,
         paymentMethodCode: order.paymentMethodCode ?? null
       });
-      const calculation = await salesCalculationService.calculateDocumentTotals({
-        documentKind: "order",
-        lines: calcLines,
-        adjustments: adjustmentDrafts,
-        context: calculationContext,
-        existingTotals: resolveExistingPaymentTotals(order)
-      });
+      const calculation = await salesCalculationService.calculateDocumentTotals(
+        {
+          documentKind: "order",
+          lines: calcLines,
+          adjustments: adjustmentDrafts,
+          context: calculationContext,
+          existingTotals: resolveExistingPaymentTotals(order)
+        }
+      );
       const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
         organizationId: order.organizationId,
         tenantId: order.tenantId,
@@ -2870,7 +3601,11 @@ const updateOrderCommand = {
     await invalidateCrudCache(
       ctx.container,
       resourceKind,
-      { id: order.id, organizationId: order.organizationId, tenantId: order.tenantId },
+      {
+        id: order.id,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId
+      },
       ctx.auth?.tenantId ?? null,
       "updated"
     );
@@ -2925,7 +3660,9 @@ const updateOrderCommand = {
 const createOrderCommand = {
   id: "sales.orders.create",
   async execute(rawInput, ctx) {
-    const generator = ctx.container.resolve("salesDocumentNumberGenerator");
+    const generator = ctx.container.resolve(
+      "salesDocumentNumberGenerator"
+    );
     const initial = orderCreateSchema.parse(rawInput ?? {});
     const orderNumber = typeof initial.orderNumber === "string" && initial.orderNumber.trim().length ? initial.orderNumber.trim() : (await generator.generate({
       kind: "order",
@@ -3059,6 +3796,26 @@ const createOrderCommand = {
         lineNumber: line.lineNumber ?? index + 1
       })
     );
+    const uomResolver = createUomResolver();
+    const normalizedLineInputs = await Promise.all(
+      lineInputs.map(async (line) => {
+        const normalized = await normalizeLineUom({
+          em,
+          resolver: uomResolver,
+          organizationId: parsed.organizationId,
+          tenantId: parsed.tenantId,
+          line
+        });
+        return {
+          ...line,
+          quantity: normalized.quantity,
+          quantityUnit: normalized.quantityUnit,
+          normalizedQuantity: normalized.normalizedQuantity,
+          normalizedUnit: normalized.normalizedUnit,
+          uomSnapshot: normalized.uomSnapshot
+        };
+      })
+    );
     const adjustmentInputs = parsed.adjustments ? parsed.adjustments.map(
       (adj) => orderAdjustmentCreateSchema.parse({
         ...adj,
@@ -3067,7 +3824,7 @@ const createOrderCommand = {
         orderId: order.id
       })
     ) : null;
-    const lineSnapshots = lineInputs.map(
+    const lineSnapshots = normalizedLineInputs.map(
       (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
     );
     const adjustmentDrafts = adjustmentInputs ? adjustmentInputs.map((adj) => createAdjustmentDraftFromInput(adj)) : [];
@@ -3090,7 +3847,7 @@ const createOrderCommand = {
       context: calculationContext,
       existingTotals: resolveExistingPaymentTotals(order)
     });
-    await replaceOrderLines(em, order, calculation, lineInputs);
+    await replaceOrderLines(em, order, calculation, normalizedLineInputs);
     await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
     applyOrderTotals(order, calculation.totals, calculation.lines.length);
     let eventBus = null;
@@ -3118,7 +3875,9 @@ const createOrderCommand = {
     await em.flush();
     try {
       const notificationService = resolveNotificationService(ctx.container);
-      const typeDef = notificationTypes.find((type) => type.type === "sales.order.created");
+      const typeDef = notificationTypes.find(
+        (type) => type.type === "sales.order.created"
+      );
       if (typeDef) {
         const totalAmount = order.grandTotalGrossAmount && order.currencyCode ? `${order.grandTotalGrossAmount} ${order.currencyCode}` : "";
         const totalDisplay = totalAmount ? ` (${totalAmount})` : "";
@@ -3139,7 +3898,10 @@ const createOrderCommand = {
         });
       }
     } catch (err) {
-      console.error("[sales.orders.create] Failed to create notification:", err);
+      console.error(
+        "[sales.orders.create] Failed to create notification:",
+        err
+      );
     }
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -3158,7 +3920,11 @@ const createOrderCommand = {
     await invalidateCrudCache(
       ctx.container,
       resourceKind,
-      { id: order.id, organizationId: order.organizationId, tenantId: order.tenantId },
+      {
+        id: order.id,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId
+      },
       ctx.auth?.tenantId ?? null,
       "created"
     );
@@ -3207,7 +3973,11 @@ const deleteOrderCommand = {
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, id);
     if (snapshot) {
-      ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     }
     return snapshot ? { before: snapshot } : {};
   },
@@ -3215,29 +3985,56 @@ const deleteOrderCommand = {
     const id = requireId(input, "Order id is required");
     const em = ctx.container.resolve("em").fork();
     const order = await em.findOne(SalesOrder, { id });
-    if (!order) throw new CrudHttpError(404, { error: "Sales order not found" });
+    if (!order)
+      throw new CrudHttpError(404, { error: "Sales order not found" });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const shipments = await em.find(SalesShipment, { order: order.id });
     const shipmentIds = shipments.map((entry) => entry.id);
-    const [shipmentItems, payments, paymentAllocations, addresses, notes, tags, adjustments, lines] = await Promise.all([
+    const [
+      shipmentItems,
+      payments,
+      paymentAllocations,
+      addresses,
+      notes,
+      tags,
+      adjustments,
+      lines
+    ] = await Promise.all([
       shipmentIds.length ? em.find(SalesShipmentItem, { shipment: { $in: shipmentIds } }) : Promise.resolve([]),
       em.find(SalesPayment, { order: order.id }),
       em.find(SalesPaymentAllocation, { order: order.id }),
-      em.find(SalesDocumentAddress, { documentId: order.id, documentKind: "order" }),
+      em.find(SalesDocumentAddress, {
+        documentId: order.id,
+        documentKind: "order"
+      }),
       em.find(SalesNote, { contextType: "order", contextId: order.id }),
-      em.find(SalesDocumentTagAssignment, { documentId: order.id, documentKind: "order" }),
+      em.find(SalesDocumentTagAssignment, {
+        documentId: order.id,
+        documentKind: "order"
+      }),
       em.find(SalesOrderAdjustment, { order: order.id }),
       em.find(SalesOrderLine, { order: order.id })
     ]);
     if (shipmentIds.length) {
-      await em.nativeDelete(SalesShipmentItem, { shipment: { $in: shipmentIds } });
+      await em.nativeDelete(SalesShipmentItem, {
+        shipment: { $in: shipmentIds }
+      });
       await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
     }
     await em.nativeDelete(SalesPaymentAllocation, { order: order.id });
     await em.nativeDelete(SalesPayment, { order: order.id });
-    await em.nativeDelete(SalesDocumentAddress, { documentId: order.id, documentKind: "order" });
-    await em.nativeDelete(SalesNote, { contextType: "order", contextId: order.id });
-    await em.nativeDelete(SalesDocumentTagAssignment, { documentId: order.id, documentKind: "order" });
+    await em.nativeDelete(SalesDocumentAddress, {
+      documentId: order.id,
+      documentKind: "order"
+    });
+    await em.nativeDelete(SalesNote, {
+      contextType: "order",
+      contextId: order.id
+    });
+    await em.nativeDelete(SalesDocumentTagAssignment, {
+      documentId: order.id,
+      documentKind: "order"
+    });
     await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
     await em.nativeDelete(SalesOrderLine, { order: order.id });
     em.remove(order);
@@ -3246,14 +4043,34 @@ const deleteOrderCommand = {
     await Promise.all([
       queueDeletionSideEffects(dataEngine, order, E.sales.sales_order),
       queueDeletionSideEffects(dataEngine, lines, E.sales.sales_order_line),
-      queueDeletionSideEffects(dataEngine, adjustments, E.sales.sales_order_adjustment),
+      queueDeletionSideEffects(
+        dataEngine,
+        adjustments,
+        E.sales.sales_order_adjustment
+      ),
       queueDeletionSideEffects(dataEngine, shipments, E.sales.sales_shipment),
-      queueDeletionSideEffects(dataEngine, shipmentItems, E.sales.sales_shipment_item),
+      queueDeletionSideEffects(
+        dataEngine,
+        shipmentItems,
+        E.sales.sales_shipment_item
+      ),
       queueDeletionSideEffects(dataEngine, payments, E.sales.sales_payment),
-      queueDeletionSideEffects(dataEngine, paymentAllocations, E.sales.sales_payment_allocation),
-      queueDeletionSideEffects(dataEngine, addresses, E.sales.sales_document_address),
+      queueDeletionSideEffects(
+        dataEngine,
+        paymentAllocations,
+        E.sales.sales_payment_allocation
+      ),
+      queueDeletionSideEffects(
+        dataEngine,
+        addresses,
+        E.sales.sales_document_address
+      ),
       queueDeletionSideEffects(dataEngine, notes, E.sales.sales_note),
-      queueDeletionSideEffects(dataEngine, tags, E.sales.sales_document_tag_assignment)
+      queueDeletionSideEffects(
+        dataEngine,
+        tags,
+        E.sales.sales_document_tag_assignment
+      )
     ]);
     return { orderId: id };
   },
@@ -3298,24 +4115,54 @@ const convertQuoteToOrderCommand = {
     if (!quoteId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot) ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+    if (snapshot)
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
     const payload = quoteConvertToOrderSchema.parse(rawInput ?? {});
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: payload.quoteId, deletedAt: null });
+    const quote = await em.findOne(SalesQuote, {
+      id: payload.quoteId,
+      deletedAt: null
+    });
     const { translate } = await resolveTranslations();
-    if (!quote) throw new CrudHttpError(404, { error: translate("sales.documents.detail.error", "Document not found or inaccessible.") });
+    if (!quote)
+      throw new CrudHttpError(404, {
+        error: translate(
+          "sales.documents.detail.error",
+          "Document not found or inaccessible."
+        )
+      });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const snapshot = await loadQuoteSnapshot(em, payload.quoteId);
-    if (!snapshot) throw new CrudHttpError(404, { error: translate("sales.documents.detail.error", "Document not found or inaccessible.") });
+    if (!snapshot)
+      throw new CrudHttpError(404, {
+        error: translate(
+          "sales.documents.detail.error",
+          "Document not found or inaccessible."
+        )
+      });
     const orderId = payload.orderId ?? quote.id;
-    const existingOrder = await em.findOne(SalesOrder, { id: orderId, deletedAt: null });
+    const existingOrder = await em.findOne(SalesOrder, {
+      id: orderId,
+      deletedAt: null
+    });
     if (existingOrder) {
-      throw new CrudHttpError(409, { error: translate("sales.documents.detail.convertExists", "Order already exists for this quote.") });
+      throw new CrudHttpError(409, {
+        error: translate(
+          "sales.documents.detail.convertExists",
+          "Order already exists for this quote."
+        )
+      });
     }
-    const generator = ctx.container.resolve("salesDocumentNumberGenerator");
+    const generator = ctx.container.resolve(
+      "salesDocumentNumberGenerator"
+    );
     const generatedNumber = snapshot.quote.quoteNumber && snapshot.quote.quoteNumber.trim().length ? snapshot.quote.quoteNumber : (await generator.generate({
       kind: "order",
       organizationId: snapshot.quote.organizationId,
@@ -3328,14 +4175,23 @@ const convertQuoteToOrderCommand = {
         entityId: E.sales.sales_quote,
         recordIds: [snapshot.quote.id],
         tenantIdByRecord: { [snapshot.quote.id]: snapshot.quote.tenantId },
-        organizationIdByRecord: { [snapshot.quote.id]: snapshot.quote.organizationId }
+        organizationIdByRecord: {
+          [snapshot.quote.id]: snapshot.quote.organizationId
+        }
       }),
       snapshot.lines.length ? loadCustomFieldValues({
         em,
         entityId: E.sales.sales_quote_line,
         recordIds: snapshot.lines.map((line) => line.id),
-        tenantIdByRecord: Object.fromEntries(snapshot.lines.map((line) => [line.id, snapshot.quote.tenantId])),
-        organizationIdByRecord: Object.fromEntries(snapshot.lines.map((line) => [line.id, snapshot.quote.organizationId]))
+        tenantIdByRecord: Object.fromEntries(
+          snapshot.lines.map((line) => [line.id, snapshot.quote.tenantId])
+        ),
+        organizationIdByRecord: Object.fromEntries(
+          snapshot.lines.map((line) => [
+            line.id,
+            snapshot.quote.organizationId
+          ])
+        )
       }) : Promise.resolve({})
     ]);
     const order = em.create(SalesOrder, {
@@ -3415,6 +4271,9 @@ const convertQuoteToOrderCommand = {
         comment: line.comment ?? null,
         quantity: line.quantity,
         quantityUnit: line.quantityUnit ?? null,
+        normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+        normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
+        uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
         reservedQuantity: "0",
         fulfilledQuantity: "0",
         invoicedQuantity: "0",
@@ -3466,9 +4325,18 @@ const convertQuoteToOrderCommand = {
       em.persist(entity);
     });
     const [addresses, notes, tags] = await Promise.all([
-      em.find(SalesDocumentAddress, { documentId: snapshot.quote.id, documentKind: "quote" }),
-      em.find(SalesNote, { contextType: "quote", contextId: snapshot.quote.id }),
-      em.find(SalesDocumentTagAssignment, { documentId: snapshot.quote.id, documentKind: "quote" })
+      em.find(SalesDocumentAddress, {
+        documentId: snapshot.quote.id,
+        documentKind: "quote"
+      }),
+      em.find(SalesNote, {
+        contextType: "quote",
+        contextId: snapshot.quote.id
+      }),
+      em.find(SalesDocumentTagAssignment, {
+        documentId: snapshot.quote.id,
+        documentKind: "quote"
+      })
     ]);
     addresses.forEach((entry) => {
       entry.documentKind = "order";
@@ -3531,7 +4399,10 @@ const convertQuoteToOrderCommand = {
     if (!before) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.quotes.convert", "Convert quote to order"),
+      actionLabel: translate(
+        "sales.audit.quotes.convert",
+        "Convert quote to order"
+      ),
       resourceKind: "sales.order",
       resourceId: result.orderId,
       tenantId: before.quote.tenantId,
@@ -3539,7 +4410,10 @@ const convertQuoteToOrderCommand = {
       snapshotBefore: before,
       snapshotAfter: after ?? null,
       payload: {
-        undo: { quote: before, order: after ?? null }
+        undo: {
+          quote: before,
+          order: after ?? null
+        }
       }
     };
   },
@@ -3549,7 +4423,11 @@ const convertQuoteToOrderCommand = {
     const orderSnapshot = payload?.order;
     if (!quoteSnapshot) return;
     const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, quoteSnapshot.quote.organizationId, quoteSnapshot.quote.tenantId);
+    ensureQuoteScope(
+      ctx,
+      quoteSnapshot.quote.organizationId,
+      quoteSnapshot.quote.tenantId
+    );
     if (orderSnapshot) {
       const orderId = orderSnapshot.order.id;
       const orderLineIds = orderSnapshot.lines.map((line) => line.id);
@@ -3558,20 +4436,34 @@ const convertQuoteToOrderCommand = {
         const shipments = await em.find(SalesShipment, { order: orderId });
         const shipmentIds = shipments.map((entry) => entry.id);
         if (shipmentIds.length) {
-          await em.nativeDelete(SalesShipmentItem, { shipment: { $in: shipmentIds } });
+          await em.nativeDelete(SalesShipmentItem, {
+            shipment: { $in: shipmentIds }
+          });
           await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
         }
         await em.nativeDelete(SalesPaymentAllocation, { order: orderId });
         await em.nativeDelete(SalesPayment, { order: orderId });
-        await em.nativeDelete(SalesDocumentAddress, { documentId: orderId, documentKind: "order" });
-        await em.nativeDelete(SalesDocumentTagAssignment, { documentId: orderId, documentKind: "order" });
+        await em.nativeDelete(SalesDocumentAddress, {
+          documentId: orderId,
+          documentKind: "order"
+        });
+        await em.nativeDelete(SalesDocumentTagAssignment, {
+          documentId: orderId,
+          documentKind: "order"
+        });
         await em.nativeDelete(SalesOrderAdjustment, { order: orderId });
         await em.nativeDelete(SalesOrderLine, { order: orderId });
         em.remove(existingOrder);
       }
-      await em.nativeDelete(CustomFieldValue, { entityId: E.sales.sales_order, recordId: orderId });
+      await em.nativeDelete(CustomFieldValue, {
+        entityId: E.sales.sales_order,
+        recordId: orderId
+      });
       if (orderLineIds.length) {
-        await em.nativeDelete(CustomFieldValue, { entityId: E.sales.sales_order_line, recordId: { $in: orderLineIds } });
+        await em.nativeDelete(CustomFieldValue, {
+          entityId: E.sales.sales_order_line,
+          recordId: { $in: orderLineIds }
+        });
       }
     }
     const noteIds = quoteSnapshot.notes.map((note) => note.id);
@@ -3582,22 +4474,30 @@ const convertQuoteToOrderCommand = {
     await em.flush();
   }
 };
-const orderLineUpsertSchema = orderLineCreateSchema.extend({ id: z.string().uuid().optional() });
+const orderLineUpsertSchema = orderLineCreateSchema.extend({
+  id: z.string().uuid().optional()
+});
 const orderLineDeleteSchema = z.object({
   id: z.string().uuid(),
   orderId: z.string().uuid()
 });
-const quoteLineUpsertSchema = quoteLineCreateSchema.extend({ id: z.string().uuid().optional() });
+const quoteLineUpsertSchema = quoteLineCreateSchema.extend({
+  id: z.string().uuid().optional()
+});
 const quoteLineDeleteSchema = z.object({
   id: z.string().uuid(),
   quoteId: z.string().uuid()
 });
-const orderAdjustmentUpsertSchema = orderAdjustmentCreateSchema.extend({ id: z.string().uuid().optional() });
+const orderAdjustmentUpsertSchema = orderAdjustmentCreateSchema.extend({
+  id: z.string().uuid().optional()
+});
 const orderAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),
   orderId: z.string().uuid()
 });
-const quoteAdjustmentUpsertSchema = quoteAdjustmentCreateSchema.extend({ id: z.string().uuid().optional() });
+const quoteAdjustmentUpsertSchema = quoteAdjustmentCreateSchema.extend({
+  id: z.string().uuid().optional()
+});
 const quoteAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),
   quoteId: z.string().uuid()
@@ -3610,18 +4510,32 @@ const orderLineUpsertCommand = {
     if (!orderId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot) ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+    if (snapshot)
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = orderLineUpsertSchema.parse(input?.body ?? {});
+    const rawBody = input?.body ?? {};
+    const parsed = orderLineUpsertSchema.parse(rawBody);
     const em = ctx.container.resolve("em").fork();
-    const order = await em.findOne(SalesOrder, { id: parsed.orderId, deletedAt: null });
-    if (!order) throw new CrudHttpError(404, { error: "Sales order not found" });
+    const order = await em.findOne(SalesOrder, {
+      id: parsed.orderId,
+      deletedAt: null
+    });
+    if (!order)
+      throw new CrudHttpError(404, { error: "Sales order not found" });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const [existingLines, adjustments] = await Promise.all([
       em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesOrderAdjustment,
+        { order },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
     const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
@@ -3632,7 +4546,9 @@ const orderLineUpsertCommand = {
     if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
       let taxService = null;
       try {
-        taxService = ctx.container.resolve("taxCalculationService");
+        taxService = ctx.container.resolve(
+          "taxCalculationService"
+        );
       } catch {
         taxService = null;
       }
@@ -3655,6 +4571,49 @@ const orderLineUpsertCommand = {
     if (priceMode) metadata.priceMode = priceMode;
     const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
     const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+    const lineUomInput = {
+      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+      quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
+      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+      normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
+      normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
+      uomSnapshot: existingSnapshot?.uomSnapshot ?? null
+    };
+    const uomResolver = createUomResolver();
+    let normalizedUom = await normalizeLineUom({
+      em,
+      resolver: uomResolver,
+      organizationId: order.organizationId,
+      tenantId: order.tenantId,
+      line: {
+        ...lineUomInput,
+        unitPriceNet: unitPriceNet ?? 0,
+        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+      }
+    });
+    const convertedPrices = convertLineUnitPricesOnUnitChange({
+      existingSnapshot,
+      nextQuantityUnit: normalizedUom.quantityUnit,
+      nextUomSnapshot: normalizedUom.uomSnapshot,
+      unitPriceNet,
+      unitPriceGross
+    });
+    if (convertedPrices.didConvert) {
+      unitPriceNet = convertedPrices.unitPriceNet;
+      unitPriceGross = convertedPrices.unitPriceGross;
+      normalizedUom = await normalizeLineUom({
+        em,
+        resolver: uomResolver,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        line: {
+          ...lineUomInput,
+          unitPriceNet: unitPriceNet ?? 0,
+          unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+        }
+      });
+    }
     const updatedSnapshot = {
       id: lineId,
       lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
@@ -3664,8 +4623,11 @@ const orderLineUpsertCommand = {
       name: parsed.name ?? existingSnapshot?.name ?? null,
       description: parsed.description ?? existingSnapshot?.description ?? null,
       comment: parsed.comment ?? existingSnapshot?.comment ?? null,
-      quantity: Number(parsed.quantity ?? existingSnapshot?.quantity ?? 0),
-      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+      quantity: normalizedUom.quantity,
+      quantityUnit: normalizedUom.quantityUnit,
+      normalizedQuantity: normalizedUom.normalizedQuantity,
+      normalizedUnit: normalizedUom.normalizedUnit,
+      uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
       currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? order.currencyCode,
       unitPriceNet: unitPriceNet ?? 0,
       unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
@@ -3684,7 +4646,9 @@ const orderLineUpsertCommand = {
     updatedSnapshot.statusEntryId = statusEntryId;
     updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
     updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
-    let nextLines = parsed.id ? lineSnapshots.map((line) => line.id === parsed.id ? updatedSnapshot : line) : [...lineSnapshots, updatedSnapshot];
+    let nextLines = parsed.id ? lineSnapshots.map(
+      (line) => line.id === parsed.id ? updatedSnapshot : line
+    ) : [...lineSnapshots, updatedSnapshot];
     nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
     const sourceInputs = nextLines.map((line, index) => ({
       ...line,
@@ -3755,7 +4719,10 @@ const orderLineUpsertCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.orders.lines.upsert", "Upsert order line"),
+      actionLabel: translate(
+        "sales.audit.orders.lines.upsert",
+        "Upsert order line"
+      ),
       resourceKind: "sales.order",
       resourceId: result.orderId,
       tenantId: after.order.tenantId,
@@ -3785,15 +4752,31 @@ const orderLineDeleteCommand = {
     if (!orderId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot) ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+    if (snapshot)
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
     const { translate } = await resolveTranslations();
-    const parsed = orderLineDeleteSchema.parse(input?.body ?? {});
+    const parsed = orderLineDeleteSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const order = await em.findOne(SalesOrder, { id: parsed.orderId, deletedAt: null });
-    if (!order) throw new CrudHttpError(404, { error: translate("sales.documents.detail.error", "Document not found or inaccessible.") });
+    const order = await em.findOne(SalesOrder, {
+      id: parsed.orderId,
+      deletedAt: null
+    });
+    if (!order)
+      throw new CrudHttpError(404, {
+        error: translate(
+          "sales.documents.detail.error",
+          "Document not found or inaccessible."
+        )
+      });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const shipmentCount = await em.count(SalesShipmentItem, {
       orderLine: parsed.id,
@@ -3807,11 +4790,24 @@ const orderLineDeleteCommand = {
         )
       });
     }
-    const existingLines = await em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } });
-    const adjustments = await em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } });
+    const existingLines = await em.find(
+      SalesOrderLine,
+      { order },
+      { orderBy: { lineNumber: "asc" } }
+    );
+    const adjustments = await em.find(
+      SalesOrderAdjustment,
+      { order },
+      { orderBy: { position: "asc" } }
+    );
     const filtered = existingLines.filter((line) => line.id !== parsed.id);
     if (filtered.length === existingLines.length) {
-      throw new CrudHttpError(404, { error: translate("sales.documents.detail.error", "Document not found or inaccessible.") });
+      throw new CrudHttpError(404, {
+        error: translate(
+          "sales.documents.detail.error",
+          "Document not found or inaccessible."
+        )
+      });
     }
     const sourceInputs = filtered.map((line, index) => ({
       ...mapOrderLineEntityToSnapshot(line),
@@ -3882,7 +4878,10 @@ const orderLineDeleteCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.orders.lines.delete", "Delete order line"),
+      actionLabel: translate(
+        "sales.audit.orders.lines.delete",
+        "Delete order line"
+      ),
       resourceKind: "sales.order",
       resourceId: result.orderId,
       tenantId: after.order.tenantId,
@@ -3912,18 +4911,32 @@ const quoteLineUpsertCommand = {
     if (!quoteId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot) ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+    if (snapshot)
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = quoteLineUpsertSchema.parse(input?.body ?? {});
+    const rawBody = input?.body ?? {};
+    const parsed = quoteLineUpsertSchema.parse(rawBody);
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: parsed.quoteId, deletedAt: null });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    const quote = await em.findOne(SalesQuote, {
+      id: parsed.quoteId,
+      deletedAt: null
+    });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const [existingLines, adjustments] = await Promise.all([
       em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesQuoteAdjustment,
+        { quote },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
     const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
@@ -3934,7 +4947,9 @@ const quoteLineUpsertCommand = {
     if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
       let taxService = null;
       try {
-        taxService = ctx.container.resolve("taxCalculationService");
+        taxService = ctx.container.resolve(
+          "taxCalculationService"
+        );
       } catch {
         taxService = null;
       }
@@ -3957,6 +4972,49 @@ const quoteLineUpsertCommand = {
     if (priceMode) metadata.priceMode = priceMode;
     const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
     const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+    const lineUomInput = {
+      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+      quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
+      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+      normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
+      normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
+      uomSnapshot: existingSnapshot?.uomSnapshot ?? null
+    };
+    const uomResolver = createUomResolver();
+    let normalizedUom = await normalizeLineUom({
+      em,
+      resolver: uomResolver,
+      organizationId: quote.organizationId,
+      tenantId: quote.tenantId,
+      line: {
+        ...lineUomInput,
+        unitPriceNet: unitPriceNet ?? 0,
+        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+      }
+    });
+    const convertedPrices = convertLineUnitPricesOnUnitChange({
+      existingSnapshot,
+      nextQuantityUnit: normalizedUom.quantityUnit,
+      nextUomSnapshot: normalizedUom.uomSnapshot,
+      unitPriceNet,
+      unitPriceGross
+    });
+    if (convertedPrices.didConvert) {
+      unitPriceNet = convertedPrices.unitPriceNet;
+      unitPriceGross = convertedPrices.unitPriceGross;
+      normalizedUom = await normalizeLineUom({
+        em,
+        resolver: uomResolver,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        line: {
+          ...lineUomInput,
+          unitPriceNet: unitPriceNet ?? 0,
+          unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+        }
+      });
+    }
     const updatedSnapshot = {
       id: lineId,
       lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
@@ -3966,8 +5024,11 @@ const quoteLineUpsertCommand = {
       name: parsed.name ?? existingSnapshot?.name ?? null,
       description: parsed.description ?? existingSnapshot?.description ?? null,
       comment: parsed.comment ?? existingSnapshot?.comment ?? null,
-      quantity: Number(parsed.quantity ?? existingSnapshot?.quantity ?? 0),
-      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+      quantity: normalizedUom.quantity,
+      quantityUnit: normalizedUom.quantityUnit,
+      normalizedQuantity: normalizedUom.normalizedQuantity,
+      normalizedUnit: normalizedUom.normalizedUnit,
+      uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
       currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? quote.currencyCode,
       unitPriceNet: unitPriceNet ?? 0,
       unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
@@ -3986,7 +5047,9 @@ const quoteLineUpsertCommand = {
     updatedSnapshot.statusEntryId = statusEntryId;
     updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
     updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
-    let nextLines = parsed.id ? lineSnapshots.map((line) => line.id === parsed.id ? updatedSnapshot : line) : [...lineSnapshots, updatedSnapshot];
+    let nextLines = parsed.id ? lineSnapshots.map(
+      (line) => line.id === parsed.id ? updatedSnapshot : line
+    ) : [...lineSnapshots, updatedSnapshot];
     nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
     const sourceInputs = nextLines.map((line, index) => ({
       ...line,
@@ -4056,7 +5119,10 @@ const quoteLineUpsertCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.quotes.lines.upsert", "Upsert quote line"),
+      actionLabel: translate(
+        "sales.audit.quotes.lines.upsert",
+        "Upsert quote line"
+      ),
       resourceKind: "sales.quote",
       resourceId: result.quoteId,
       tenantId: after.quote.tenantId,
@@ -4086,17 +5152,36 @@ const quoteLineDeleteCommand = {
     if (!quoteId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot) ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+    if (snapshot)
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = quoteLineDeleteSchema.parse(input?.body ?? {});
+    const parsed = quoteLineDeleteSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: parsed.quoteId, deletedAt: null });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    const quote = await em.findOne(SalesQuote, {
+      id: parsed.quoteId,
+      deletedAt: null
+    });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    const existingLines = await em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } });
-    const adjustments = await em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } });
+    const existingLines = await em.find(
+      SalesQuoteLine,
+      { quote },
+      { orderBy: { lineNumber: "asc" } }
+    );
+    const adjustments = await em.find(
+      SalesQuoteAdjustment,
+      { quote },
+      { orderBy: { position: "asc" } }
+    );
     const filtered = existingLines.filter((line) => line.id !== parsed.id);
     if (filtered.length === existingLines.length) {
       throw new CrudHttpError(404, { error: "Quote line not found" });
@@ -4169,7 +5254,10 @@ const quoteLineDeleteCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.quotes.lines.delete", "Delete quote line"),
+      actionLabel: translate(
+        "sales.audit.quotes.lines.delete",
+        "Delete quote line"
+      ),
       resourceKind: "sales.quote",
       resourceId: result.quoteId,
       tenantId: after.quote.tenantId,
@@ -4199,21 +5287,38 @@ const orderAdjustmentUpsertCommand = {
     if (!orderId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot) ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+    if (snapshot)
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = orderAdjustmentUpsertSchema.parse(input?.body ?? {});
+    const parsed = orderAdjustmentUpsertSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const order = await em.findOne(SalesOrder, { id: parsed.orderId, deletedAt: null });
-    if (!order) throw new CrudHttpError(404, { error: "Sales order not found" });
+    const order = await em.findOne(SalesOrder, {
+      id: parsed.orderId,
+      deletedAt: null
+    });
+    if (!order)
+      throw new CrudHttpError(404, { error: "Sales order not found" });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     if (parsed.scope === "line") {
-      throw new CrudHttpError(400, { error: "Line-scoped adjustments are not supported yet." });
+      throw new CrudHttpError(400, {
+        error: "Line-scoped adjustments are not supported yet."
+      });
     }
     const [existingLines, existingAdjustments] = await Promise.all([
       em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesOrderAdjustment,
+        { order },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
     const adjustmentDrafts = existingAdjustments.map(mapOrderAdjustmentToDraft);
@@ -4343,7 +5448,10 @@ const orderAdjustmentUpsertCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.orders.adjustments.upsert", "Upsert order adjustment"),
+      actionLabel: translate(
+        "sales.audit.orders.adjustments.upsert",
+        "Upsert order adjustment"
+      ),
       resourceKind: "sales.order",
       resourceId: result.orderId,
       tenantId: after.order.tenantId,
@@ -4373,18 +5481,33 @@ const orderAdjustmentDeleteCommand = {
     if (!orderId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot) ensureOrderScope(ctx, snapshot.order.organizationId, snapshot.order.tenantId);
+    if (snapshot)
+      ensureOrderScope(
+        ctx,
+        snapshot.order.organizationId,
+        snapshot.order.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = orderAdjustmentDeleteSchema.parse(input?.body ?? {});
+    const parsed = orderAdjustmentDeleteSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const order = await em.findOne(SalesOrder, { id: parsed.orderId, deletedAt: null });
-    if (!order) throw new CrudHttpError(404, { error: "Sales order not found" });
+    const order = await em.findOne(SalesOrder, {
+      id: parsed.orderId,
+      deletedAt: null
+    });
+    if (!order)
+      throw new CrudHttpError(404, { error: "Sales order not found" });
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const [existingLines, adjustments] = await Promise.all([
       em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesOrderAdjustment, { order }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesOrderAdjustment,
+        { order },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
     if (filtered.length === adjustments.length) {
@@ -4474,7 +5597,10 @@ const orderAdjustmentDeleteCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.orders.adjustments.delete", "Delete order adjustment"),
+      actionLabel: translate(
+        "sales.audit.orders.adjustments.delete",
+        "Delete order adjustment"
+      ),
       resourceKind: "sales.order",
       resourceId: result.orderId,
       tenantId: after.order.tenantId,
@@ -4504,21 +5630,38 @@ const quoteAdjustmentUpsertCommand = {
     if (!quoteId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot) ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+    if (snapshot)
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = quoteAdjustmentUpsertSchema.parse(input?.body ?? {});
+    const parsed = quoteAdjustmentUpsertSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: parsed.quoteId, deletedAt: null });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    const quote = await em.findOne(SalesQuote, {
+      id: parsed.quoteId,
+      deletedAt: null
+    });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     if (parsed.scope === "line") {
-      throw new CrudHttpError(400, { error: "Line-scoped adjustments are not supported yet." });
+      throw new CrudHttpError(400, {
+        error: "Line-scoped adjustments are not supported yet."
+      });
     }
     const [existingLines, existingAdjustments] = await Promise.all([
       em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesQuoteAdjustment,
+        { quote },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
     const adjustmentDrafts = existingAdjustments.map(mapQuoteAdjustmentToDraft);
@@ -4647,7 +5790,10 @@ const quoteAdjustmentUpsertCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.quotes.adjustments.upsert", "Upsert quote adjustment"),
+      actionLabel: translate(
+        "sales.audit.quotes.adjustments.upsert",
+        "Upsert quote adjustment"
+      ),
       resourceKind: "sales.quote",
       resourceId: result.quoteId,
       tenantId: after.quote.tenantId,
@@ -4677,18 +5823,33 @@ const quoteAdjustmentDeleteCommand = {
     if (!quoteId) return {};
     const em = ctx.container.resolve("em");
     const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot) ensureQuoteScope(ctx, snapshot.quote.organizationId, snapshot.quote.tenantId);
+    if (snapshot)
+      ensureQuoteScope(
+        ctx,
+        snapshot.quote.organizationId,
+        snapshot.quote.tenantId
+      );
     return snapshot ? { before: snapshot } : {};
   },
   async execute(input, ctx) {
-    const parsed = quoteAdjustmentDeleteSchema.parse(input?.body ?? {});
+    const parsed = quoteAdjustmentDeleteSchema.parse(
+      input?.body ?? {}
+    );
     const em = ctx.container.resolve("em").fork();
-    const quote = await em.findOne(SalesQuote, { id: parsed.quoteId, deletedAt: null });
-    if (!quote) throw new CrudHttpError(404, { error: "Sales quote not found" });
+    const quote = await em.findOne(SalesQuote, {
+      id: parsed.quoteId,
+      deletedAt: null
+    });
+    if (!quote)
+      throw new CrudHttpError(404, { error: "Sales quote not found" });
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const [existingLines, adjustments] = await Promise.all([
       em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(SalesQuoteAdjustment, { quote }, { orderBy: { position: "asc" } })
+      em.find(
+        SalesQuoteAdjustment,
+        { quote },
+        { orderBy: { position: "asc" } }
+      )
     ]);
     const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
     if (filtered.length === adjustments.length) {
@@ -4777,7 +5938,10 @@ const quoteAdjustmentDeleteCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("sales.audit.quotes.adjustments.delete", "Delete quote adjustment"),
+      actionLabel: translate(
+        "sales.audit.quotes.adjustments.delete",
+        "Delete quote adjustment"
+      ),
       resourceKind: "sales.quote",
       resourceId: result.quoteId,
       tenantId: after.quote.tenantId,