@open-mercato/core 0.6.7-develop.6552.1.5208a19369 → 0.6.7-develop.6565.1.1026d85fff

package/src/modules/sales/commands/statuses.ts

@@ -1,6 +1,6 @@
 import { DictionaryEntry } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { registerDictionaryEntryCommands } from '@open-mercato/core/modules/dictionaries/commands/factory'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import {
   ensureSalesDictionary,
   getSalesDictionaryDefinition,
@@ -70,7 +70,7 @@ function registerStatusDictionaryCommands(kind: SalesDictionaryKind): void {
     resolveEntry: async ({ em, ctx, id }) => {
       const entry = await findOneWithDecryption(em, DictionaryEntry, id, { populate: ['dictionary'] })
       if (!entry) {
-        throw new CrudHttpError(404, { error: 'Dictionary entry not found' })
+        throw notFound('Dictionary entry not found')
       }
       if (entry.dictionary.key !== definition.key) {
         throw new CrudHttpError(400, { error: 'Entry does not belong to this dictionary.' })

package/src/modules/sales/commands/tags.ts

@@ -3,7 +3,7 @@
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { SalesDocumentTag, SalesDocumentTagAssignment } from '../data/entities'
 import { ensureTenantScope } from './shared'
 import {
@@ -44,7 +44,7 @@ const updateTagCommand: CommandHandler<SalesTagUpdateInput, { tagId: string }> =
     const parsed = salesTagUpdateSchema.parse(rawInput ?? {})
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const tag = await em.findOne(SalesDocumentTag, { id: parsed.id })
-    if (!tag) throw new CrudHttpError(404, { error: 'Tag not found' })
+    if (!tag) throw notFound('Tag not found')
     ensureTenantScope(ctx, parsed.tenantId ?? tag.tenantId)
     if (parsed.slug && parsed.slug !== tag.slug) {
       const conflict = await em.findOne(SalesDocumentTag, {
@@ -74,7 +74,7 @@ const deleteTagCommand: CommandHandler<{ id?: string }, { tagId: string }> = {
     if (!id) throw new CrudHttpError(400, { error: 'Tag id is required' })
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const tag = await em.findOne(SalesDocumentTag, { id })
-    if (!tag) throw new CrudHttpError(404, { error: 'Tag not found' })
+    if (!tag) throw notFound('Tag not found')
     ensureTenantScope(ctx, tag.tenantId)
     await em.nativeDelete(SalesDocumentTagAssignment, { tag: tag.id })
     em.remove(tag)

package/src/modules/sales/lib/calculations.ts

@@ -208,6 +208,21 @@ function buildBaseDocumentResult(params: {
         }
         break
       default:
+        // `return` (credit) adjustments are handled by the dedicated loop below;
+        // skip them here so an order-scoped return is not counted twice.
+        if (adj.kind === 'return') break
+        // Custom / operator-defined kinds carry an operator-controlled sign
+        // (positive adds, negative credits). Fold the raw signed amount into the
+        // grand total so a persisted adjustment can never be silently dropped
+        // from the headline total while still appearing in the itemized
+        // breakdown (#4052). No abs()/clamp here: unlike the sign-constrained
+        // kinds above, custom kinds are intentionally unconstrained
+        // (see enforceAdjustmentSign).
+        subtotalNet += net
+        subtotalGross += gross
+        if (taxPortion) {
+          taxTotal += taxPortion
+        }
         break
     }
   }