@open-mercato/core 0.6.6-develop.6246.1.85fd30c705 → 0.6.6-develop.6255.1.a6ee4a57c1

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

@@ -24,6 +24,37 @@ function toNumericString(value) {
   if (value === void 0 || value === null) return null;
   return value.toString();
 }
+const LINE_AMOUNT_SCALE = 4;
+function parseLineAmount(value) {
+  if (typeof value === "number") return Number.isFinite(value) ? value : 0;
+  if (typeof value === "string" && value.trim().length) {
+    const parsed = Number(value);
+    if (!Number.isNaN(parsed)) return parsed;
+  }
+  return 0;
+}
+function roundLineAmount(value) {
+  const factor = 10 ** LINE_AMOUNT_SCALE;
+  return Math.round((value + Number.EPSILON) * factor) / factor;
+}
+function deriveLineNetFromGross(net, gross, taxRate) {
+  const netValue = parseLineAmount(net);
+  const grossValue = parseLineAmount(gross);
+  if (grossValue > 0 && netValue <= 0) {
+    const rate = parseLineAmount(taxRate);
+    const fraction = rate > 0 ? rate / 100 : 0;
+    return roundLineAmount(fraction > 0 ? grossValue / (1 + fraction) : grossValue);
+  }
+  return netValue;
+}
+function reconcileLinePersistedTotals(payload) {
+  const gross = parseLineAmount(payload.totalGrossAmount);
+  const net = parseLineAmount(payload.totalNetAmount);
+  if (gross <= 0 || net > 0) return payload;
+  const derivedNet = toNumericString(deriveLineNetFromGross(net, gross, payload.taxRate));
+  if (derivedNet == null) return payload;
+  return { ...payload, totalNetAmount: derivedNet };
+}
 async function requireScopedEntity(em, entityClass, id, message, scope = { organizationId: null, tenantId: null }) {
   const where = { id, deletedAt: null };
   if (scope.organizationId) where.organizationId = scope.organizationId;
@@ -38,11 +69,13 @@ export {
   SALES_RESOURCE_KIND_RETURN,
   assertFound,
   cloneJson,
+  deriveLineNetFromGross,
   enforceSalesDocumentOptimisticLock,
   ensureOrganizationScope,
   ensureSameScope,
   ensureTenantScope,
   extractUndoPayload,
+  reconcileLinePersistedTotals,
   requireScopedEntity,
   toNumericString
 };

package/dist/modules/sales/commands/shared.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/sales/commands/shared.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nexport { assertFound } from '@open-mercato/shared/lib/crud/errors'\nexport { ensureOrganizationScope, ensureSameScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nexport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\n\n/** Resource kinds used by the document-aggregate optimistic-lock check. */\nexport const SALES_RESOURCE_KIND_ORDER = 'sales.order'\nexport const SALES_RESOURCE_KIND_QUOTE = 'sales.quote'\nexport const SALES_RESOURCE_KIND_RETURN = 'sales.return'\n\n/**\n * Enforce the document-aggregate OSS optimistic lock for a sales sub-resource\n * command (lines, adjustments, shipments, payments, returns, quote\n * conversion). The client sends the parent order/quote's expected `updated_at`\n * via the optimistic-lock extension header; this compares it against the\n * already-loaded document and throws the structured 409 on mismatch.\n *\n * The parent document is the consistency boundary: sub-resource mutations\n * recalculate document totals (or transition the document), which dirties the\n * parent so its `updated_at` advances on flush \u2014 meaning concurrent sub-edits\n * observe each other and conflict. Call this AFTER loading + scope-checking the\n * document and BEFORE mutating, so `document.updatedAt` is the pre-mutation\n * version.\n *\n * Strictly additive: when the client sends no header the check is a no-op, so\n * existing API consumers are unaffected. Respects `OM_OPTIMISTIC_LOCK`.\n */\nexport function enforceSalesDocumentOptimisticLock(\n  ctx: CommandRuntimeContext,\n  document: { id: string; updatedAt?: Date | string | null } | null | undefined,\n  resourceKind: string,\n): void {\n  if (!document) return\n  enforceCommandOptimisticLock({\n    resourceKind,\n    resourceId: document.id,\n    current: document.updatedAt ?? null,\n    request: ctx.request ?? null,\n  })\n}\n\nexport function cloneJson<T>(value: T): T {\n  if (value === null || value === undefined) return value\n  return JSON.parse(JSON.stringify(value)) as T\n}\n\nexport function toNumericString(value: number | null | undefined): string | null {\n  if (value === undefined || value === null) return null\n  return value.toString()\n}\n\nexport async function requireScopedEntity<T extends { id: string; deletedAt?: Date | null }>(\n  em: EntityManager,\n  entityClass: { new (): T },\n  id: string,\n  message: string,\n  scope: { organizationId: string | null; tenantId: string | null } = { organizationId: null, tenantId: null },\n): Promise<T> {\n  const where: Record<string, unknown> = { id, deletedAt: null }\n  if (scope.organizationId) where.organizationId = scope.organizationId\n  if (scope.tenantId) where.tenantId = scope.tenantId\n  const entity = await findOneWithDecryption(em, entityClass, where, {}, scope)\n  if (!entity) throw new CrudHttpError(404, { error: message })\n  return entity\n}\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AAEtC,SAAS,oCAAoC;AAC7C,SAAS,mBAAmB;AAC5B,SAAS,yBAAyB,iBAAiB,yBAAyB;AAC5E,SAAS,0BAA0B;AAG5B,MAAM,4BAA4B;AAClC,MAAM,4BAA4B;AAClC,MAAM,6BAA6B;AAmBnC,SAAS,mCACd,KACA,UACA,cACM;AACN,MAAI,CAAC,SAAU;AACf,+BAA6B;AAAA,IAC3B;AAAA,IACA,YAAY,SAAS;AAAA,IACrB,SAAS,SAAS,aAAa;AAAA,IAC/B,SAAS,IAAI,WAAW;AAAA,EAC1B,CAAC;AACH;AAEO,SAAS,UAAa,OAAa;AACxC,MAAI,UAAU,QAAQ,UAAU,OAAW,QAAO;AAClD,SAAO,KAAK,MAAM,KAAK,UAAU,KAAK,CAAC;AACzC;AAEO,SAAS,gBAAgB,OAAiD;AAC/E,MAAI,UAAU,UAAa,UAAU,KAAM,QAAO;AAClD,SAAO,MAAM,SAAS;AACxB;AAEA,eAAsB,oBACpB,IACA,aACA,IACA,SACA,QAAoE,EAAE,gBAAgB,MAAM,UAAU,KAAK,GAC/F;AACZ,QAAM,QAAiC,EAAE,IAAI,WAAW,KAAK;AAC7D,MAAI,MAAM,eAAgB,OAAM,iBAAiB,MAAM;AACvD,MAAI,MAAM,SAAU,OAAM,WAAW,MAAM;AAC3C,QAAM,SAAS,MAAM,sBAAsB,IAAI,aAAa,OAAO,CAAC,GAAG,KAAK;AAC5E,MAAI,CAAC,OAAQ,OAAM,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAC5D,SAAO;AACT;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nexport { assertFound } from '@open-mercato/shared/lib/crud/errors'\nexport { ensureOrganizationScope, ensureSameScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nexport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\n\n/** Resource kinds used by the document-aggregate optimistic-lock check. */\nexport const SALES_RESOURCE_KIND_ORDER = 'sales.order'\nexport const SALES_RESOURCE_KIND_QUOTE = 'sales.quote'\nexport const SALES_RESOURCE_KIND_RETURN = 'sales.return'\n\n/**\n * Enforce the document-aggregate OSS optimistic lock for a sales sub-resource\n * command (lines, adjustments, shipments, payments, returns, quote\n * conversion). The client sends the parent order/quote's expected `updated_at`\n * via the optimistic-lock extension header; this compares it against the\n * already-loaded document and throws the structured 409 on mismatch.\n *\n * The parent document is the consistency boundary: sub-resource mutations\n * recalculate document totals (or transition the document), which dirties the\n * parent so its `updated_at` advances on flush \u2014 meaning concurrent sub-edits\n * observe each other and conflict. Call this AFTER loading + scope-checking the\n * document and BEFORE mutating, so `document.updatedAt` is the pre-mutation\n * version.\n *\n * Strictly additive: when the client sends no header the check is a no-op, so\n * existing API consumers are unaffected. Respects `OM_OPTIMISTIC_LOCK`.\n */\nexport function enforceSalesDocumentOptimisticLock(\n  ctx: CommandRuntimeContext,\n  document: { id: string; updatedAt?: Date | string | null } | null | undefined,\n  resourceKind: string,\n): void {\n  if (!document) return\n  enforceCommandOptimisticLock({\n    resourceKind,\n    resourceId: document.id,\n    current: document.updatedAt ?? null,\n    request: ctx.request ?? null,\n  })\n}\n\nexport function cloneJson<T>(value: T): T {\n  if (value === null || value === undefined) return value\n  return JSON.parse(JSON.stringify(value)) as T\n}\n\nexport function toNumericString(value: number | null | undefined): string | null {\n  if (value === undefined || value === null) return null\n  return value.toString()\n}\n\n/** Numeric scale of the `total_net_amount` / `total_gross_amount` line columns. */\nconst LINE_AMOUNT_SCALE = 4\n\nfunction parseLineAmount(value: number | string | null | undefined): number {\n  if (typeof value === 'number') return Number.isFinite(value) ? value : 0\n  if (typeof value === 'string' && value.trim().length) {\n    const parsed = Number(value)\n    if (!Number.isNaN(parsed)) return parsed\n  }\n  return 0\n}\n\nfunction roundLineAmount(value: number): number {\n  const factor = 10 ** LINE_AMOUNT_SCALE\n  return Math.round((value + Number.EPSILON) * factor) / factor\n}\n\n/**\n * Derive a sales line's net total from its gross total and tax rate.\n *\n * `total_net_amount = 0` while `total_gross_amount > 0` is not a representable\n * priced state: `gross = net * (1 + taxRate)`, so `net = 0 \u21D2 gross = 0`. When a\n * line carries a positive gross but a missing/zero net (legacy rows, optional\n * pass-through inputs, or invoice/credit-memo copy of a zeroed order line), the\n * net is reconstructed from gross and the line's tax rate. `taxRate` is a\n * percentage (e.g. `23` \u21D2 `0.23` fraction), matching the stored column and\n * `taxCalculationService`. Returns the existing net unchanged when the\n * invariant already holds. See issues #3521 / #3036.\n */\nexport function deriveLineNetFromGross(\n  net: number | string | null | undefined,\n  gross: number | string | null | undefined,\n  taxRate: number | string | null | undefined,\n): number {\n  const netValue = parseLineAmount(net)\n  const grossValue = parseLineAmount(gross)\n  if (grossValue > 0 && netValue <= 0) {\n    const rate = parseLineAmount(taxRate)\n    const fraction = rate > 0 ? rate / 100 : 0\n    return roundLineAmount(fraction > 0 ? grossValue / (1 + fraction) : grossValue)\n  }\n  return netValue\n}\n\ntype LinePersistedTotals = {\n  totalNetAmount?: number | string | null\n  totalGrossAmount?: number | string | null\n  taxRate?: number | string | null\n}\n\n/**\n * Enforce the `gross > 0 \u21D2 net > 0` invariant on a line-entity create payload\n * right before persistence. Returns the payload unchanged when the net total is\n * already positive or gross is non-positive; otherwise fills the net total in\n * from gross / taxRate via {@link deriveLineNetFromGross}. Applied at every\n * sales line persistence site so the skew that froze return net totals (#3036)\n * cannot be stored at the source. Idempotent and non-destructive: it only ever\n * raises a zero/missing net to its derived value.\n */\nexport function reconcileLinePersistedTotals<T extends LinePersistedTotals>(payload: T): T {\n  const gross = parseLineAmount(payload.totalGrossAmount)\n  const net = parseLineAmount(payload.totalNetAmount)\n  if (gross <= 0 || net > 0) return payload\n  const derivedNet = toNumericString(deriveLineNetFromGross(net, gross, payload.taxRate))\n  if (derivedNet == null) return payload\n  return { ...payload, totalNetAmount: derivedNet } as T\n}\n\nexport async function requireScopedEntity<T extends { id: string; deletedAt?: Date | null }>(\n  em: EntityManager,\n  entityClass: { new (): T },\n  id: string,\n  message: string,\n  scope: { organizationId: string | null; tenantId: string | null } = { organizationId: null, tenantId: null },\n): Promise<T> {\n  const where: Record<string, unknown> = { id, deletedAt: null }\n  if (scope.organizationId) where.organizationId = scope.organizationId\n  if (scope.tenantId) where.tenantId = scope.tenantId\n  const entity = await findOneWithDecryption(em, entityClass, where, {}, scope)\n  if (!entity) throw new CrudHttpError(404, { error: message })\n  return entity\n}\n"],
+  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AAEtC,SAAS,oCAAoC;AAC7C,SAAS,mBAAmB;AAC5B,SAAS,yBAAyB,iBAAiB,yBAAyB;AAC5E,SAAS,0BAA0B;AAG5B,MAAM,4BAA4B;AAClC,MAAM,4BAA4B;AAClC,MAAM,6BAA6B;AAmBnC,SAAS,mCACd,KACA,UACA,cACM;AACN,MAAI,CAAC,SAAU;AACf,+BAA6B;AAAA,IAC3B;AAAA,IACA,YAAY,SAAS;AAAA,IACrB,SAAS,SAAS,aAAa;AAAA,IAC/B,SAAS,IAAI,WAAW;AAAA,EAC1B,CAAC;AACH;AAEO,SAAS,UAAa,OAAa;AACxC,MAAI,UAAU,QAAQ,UAAU,OAAW,QAAO;AAClD,SAAO,KAAK,MAAM,KAAK,UAAU,KAAK,CAAC;AACzC;AAEO,SAAS,gBAAgB,OAAiD;AAC/E,MAAI,UAAU,UAAa,UAAU,KAAM,QAAO;AAClD,SAAO,MAAM,SAAS;AACxB;AAGA,MAAM,oBAAoB;AAE1B,SAAS,gBAAgB,OAAmD;AAC1E,MAAI,OAAO,UAAU,SAAU,QAAO,OAAO,SAAS,KAAK,IAAI,QAAQ;AACvE,MAAI,OAAO,UAAU,YAAY,MAAM,KAAK,EAAE,QAAQ;AACpD,UAAM,SAAS,OAAO,KAAK;AAC3B,QAAI,CAAC,OAAO,MAAM,MAAM,EAAG,QAAO;AAAA,EACpC;AACA,SAAO;AACT;AAEA,SAAS,gBAAgB,OAAuB;AAC9C,QAAM,SAAS,MAAM;AACrB,SAAO,KAAK,OAAO,QAAQ,OAAO,WAAW,MAAM,IAAI;AACzD;AAcO,SAAS,uBACd,KACA,OACA,SACQ;AACR,QAAM,WAAW,gBAAgB,GAAG;AACpC,QAAM,aAAa,gBAAgB,KAAK;AACxC,MAAI,aAAa,KAAK,YAAY,GAAG;AACnC,UAAM,OAAO,gBAAgB,OAAO;AACpC,UAAM,WAAW,OAAO,IAAI,OAAO,MAAM;AACzC,WAAO,gBAAgB,WAAW,IAAI,cAAc,IAAI,YAAY,UAAU;AAAA,EAChF;AACA,SAAO;AACT;AAiBO,SAAS,6BAA4D,SAAe;AACzF,QAAM,QAAQ,gBAAgB,QAAQ,gBAAgB;AACtD,QAAM,MAAM,gBAAgB,QAAQ,cAAc;AAClD,MAAI,SAAS,KAAK,MAAM,EAAG,QAAO;AAClC,QAAM,aAAa,gBAAgB,uBAAuB,KAAK,OAAO,QAAQ,OAAO,CAAC;AACtF,MAAI,cAAc,KAAM,QAAO;AAC/B,SAAO,EAAE,GAAG,SAAS,gBAAgB,WAAW;AAClD;AAEA,eAAsB,oBACpB,IACA,aACA,IACA,SACA,QAAoE,EAAE,gBAAgB,MAAM,UAAU,KAAK,GAC/F;AACZ,QAAM,QAAiC,EAAE,IAAI,WAAW,KAAK;AAC7D,MAAI,MAAM,eAAgB,OAAM,iBAAiB,MAAM;AACvD,MAAI,MAAM,SAAU,OAAM,WAAW,MAAM;AAC3C,QAAM,SAAS,MAAM,sBAAsB,IAAI,aAAa,OAAO,CAAC,GAAG,KAAK;AAC5E,MAAI,CAAC,OAAQ,OAAM,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAC5D,SAAO;AACT;",
   "names": []
 }

package/dist/modules/sales/migrations/Migration20260624120000_backfill_line_net_from_gross.js

@@ -0,0 +1,27 @@
+import { Migration } from "@mikro-orm/migrations";
+class Migration20260624120000_backfill_line_net_from_gross extends Migration {
+  up() {
+    for (const table of [
+      "sales_order_lines",
+      "sales_quote_lines",
+      "sales_invoice_lines",
+      "sales_credit_memo_lines"
+    ]) {
+      this.addSql(`
+        update "${table}"
+        set "total_net_amount" = round(
+          "total_gross_amount" / (1 + coalesce("tax_rate", 0) / 100),
+          4
+        )
+        where "total_gross_amount" > 0
+          and ("total_net_amount" is null or "total_net_amount" <= 0);
+      `);
+    }
+  }
+  down() {
+  }
+}
+export {
+  Migration20260624120000_backfill_line_net_from_gross
+};
+//# sourceMappingURL=Migration20260624120000_backfill_line_net_from_gross.js.map

package/dist/modules/sales/migrations/Migration20260624120000_backfill_line_net_from_gross.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/sales/migrations/Migration20260624120000_backfill_line_net_from_gross.ts"],
+  "sourcesContent": ["import { Migration } from '@mikro-orm/migrations';\n\n/**\n * Backfill sales line rows that violate the `gross > 0 \u21D2 net > 0` invariant\n * (issue #3521, root cause of #3036).\n *\n * `total_net_amount = 0` while `total_gross_amount > 0` is not a representable\n * priced state (`gross = net * (1 + taxRate)`, so `net = 0 \u21D2 gross = 0`). Such\n * rows froze the order net grand total on a subsequent return and skewed any\n * invoice / credit-memo line that copied the order line's net. The persistence\n * paths are sealed at the source in `commands/documents.ts` via\n * `reconcileLinePersistedTotals` / `deriveLineNetFromGross`; this migration\n * repairs rows that were already stored in the inconsistent state (including the\n * seeded demo order `SO-DEMO-2001` on tenants provisioned before the fix).\n *\n * The repaired net is reconstructed from the stored gross and tax rate exactly\n * as the runtime helper does: `net = gross / (1 + taxRate/100)`, rounded to the\n * column scale (4). When the tax rate is zero/null the net equals the gross.\n *\n * Forward-only: the original (corrupt) zero net carried no information to\n * restore, so reverting is a no-op.\n */\nexport class Migration20260624120000_backfill_line_net_from_gross extends Migration {\n  override up(): void | Promise<void> {\n    for (const table of [\n      'sales_order_lines',\n      'sales_quote_lines',\n      'sales_invoice_lines',\n      'sales_credit_memo_lines',\n    ]) {\n      this.addSql(`\n        update \"${table}\"\n        set \"total_net_amount\" = round(\n          \"total_gross_amount\" / (1 + coalesce(\"tax_rate\", 0) / 100),\n          4\n        )\n        where \"total_gross_amount\" > 0\n          and (\"total_net_amount\" is null or \"total_net_amount\" <= 0);\n      `);\n    }\n  }\n\n  override down(): void | Promise<void> {\n    // Forward-only data repair. The pre-migration zero/missing net carried no\n    // information to restore, and reintroducing the `net = 0, gross > 0` skew\n    // would re-open #3036. No-op.\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAsBnB,MAAM,6DAA6D,UAAU;AAAA,EACzE,KAA2B;AAClC,eAAW,SAAS;AAAA,MAClB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,GAAG;AACD,WAAK,OAAO;AAAA,kBACA,KAAK;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,OAOhB;AAAA,IACH;AAAA,EACF;AAAA,EAES,OAA6B;AAAA,EAItC;AACF;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6246.1.85fd30c705",
+  "version": "0.6.6-develop.6255.1.a6ee4a57c1",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -246,16 +246,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6246.1.85fd30c705",
-    "@open-mercato/shared": "0.6.6-develop.6246.1.85fd30c705",
-    "@open-mercato/ui": "0.6.6-develop.6246.1.85fd30c705",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6255.1.a6ee4a57c1",
+    "@open-mercato/shared": "0.6.6-develop.6255.1.a6ee4a57c1",
+    "@open-mercato/ui": "0.6.6-develop.6255.1.a6ee4a57c1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6246.1.85fd30c705",
-    "@open-mercato/shared": "0.6.6-develop.6246.1.85fd30c705",
-    "@open-mercato/ui": "0.6.6-develop.6246.1.85fd30c705",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6255.1.a6ee4a57c1",
+    "@open-mercato/shared": "0.6.6-develop.6255.1.a6ee4a57c1",
+    "@open-mercato/ui": "0.6.6-develop.6255.1.a6ee4a57c1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/customers/components/calendar/TimeGrid.tsx

@@ -172,6 +172,7 @@ export function TimeGrid({
   const scrollRef = React.useRef<HTMLDivElement | null>(null)
   const nowMs = Date.now()
   const today = startOfDay(new Date())
+  const todayMs = today.getTime()
   const anchorMs = anchor.getTime()
   const [selectedId, setSelectedId] = React.useState<string | null>(null)
   const [drag, setDrag] = React.useState<DragState | null>(null)
@@ -179,8 +180,8 @@ export function TimeGrid({
   const dayStarts = React.useMemo(() => {
     const rangeStart = getVisibleRange(days === 7 ? 'week' : 'day', new Date(anchorMs), 0).from
     const all = Array.from({ length: days }, (_, index) => addDays(rangeStart, index))
-    return days === 7 ? applyWeekendVisibility(all, showWeekends) : all
-  }, [days, anchorMs, showWeekends])
+    return days === 7 ? applyWeekendVisibility(all, showWeekends, new Date(todayMs)) : all
+  }, [days, anchorMs, showWeekends, todayMs])
 
   const dayColumns = React.useMemo(
     () => dayStarts.map((dayStart) => buildDayColumn(dayStart, items)),

package/src/modules/customers/components/detail/DecisionMakersFooter.tsx

@@ -4,7 +4,7 @@ import * as React from 'react'
 import { Lightbulb, Send } from 'lucide-react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@open-mercato/ui/primitives/tooltip'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@open-mercato/ui/primitives/tooltip'
 
 interface DecisionMakersFooterProps {
   names: string[]
@@ -39,17 +39,19 @@ export function DecisionMakersFooter({ names, suggestion, onSendInvitation }: De
         </div>
       </div>
       {onSendInvitation && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span className="w-full shrink-0 sm:w-auto">
-              <Button type="button" size="sm" disabled className="pointer-events-none w-full sm:w-auto">
-                <Send className="mr-1.5 size-3.5" />
-                {t('customers.people.decisionMakers.sendInvitation', 'Send invitation')}
-              </Button>
-            </span>
-          </TooltipTrigger>
-          <TooltipContent>{t('customers.ai.comingSoon', 'Coming soon')}</TooltipContent>
-        </Tooltip>
+        <TooltipProvider delayDuration={300}>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <span className="w-full shrink-0 sm:w-auto">
+                <Button type="button" size="sm" disabled className="pointer-events-none w-full sm:w-auto">
+                  <Send className="mr-1.5 size-3.5" />
+                  {t('customers.people.decisionMakers.sendInvitation', 'Send invitation')}
+                </Button>
+              </span>
+            </TooltipTrigger>
+            <TooltipContent>{t('customers.ai.comingSoon', 'Coming soon')}</TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
       )}
     </div>
   )

package/src/modules/customers/lib/calendar/grid.ts

@@ -1,3 +1,5 @@
+import { isSameDay } from 'date-fns/isSameDay'
+
 export const DRAG_SNAP_MINUTES = 15
 export const MIN_DRAG_DURATION_MINUTES = 30
 const MINUTES_PER_DAY = 24 * 60
@@ -7,9 +9,15 @@ export function isWeekendDay(date: Date): boolean {
   return weekday === 0 || weekday === 6
 }
 
-export function applyWeekendVisibility(days: Date[], showWeekends: boolean): Date[] {
+export function applyWeekendVisibility(
+  days: Date[],
+  showWeekends: boolean,
+  keepWeekendDate?: Date | null,
+): Date[] {
   if (showWeekends) return days
-  const workingDays = days.filter((day) => !isWeekendDay(day))
+  const workingDays = days.filter(
+    (day) => !isWeekendDay(day) || (keepWeekendDate != null && isSameDay(day, keepWeekendDate)),
+  )
   return workingDays.length > 0 ? workingDays : days
 }
 

package/src/modules/query_index/lib/engine.ts

@@ -935,7 +935,11 @@ export class HybridQueryEngine implements QueryEngine {
         const cap = resolveEncryptedSortMaxRows()
         const phase1Root = db.selectFrom(`${baseTable} as b` as any)
         let phase1 = await applyQueryShape(phase1Root)
-        const sortFieldNames = Array.from(new Set(['id', ...resolvedSorts.map((s) => String(s.field))]))
+        const scopeFieldNames = [
+          hasTenantColumn ? 'tenant_id' : null,
+          hasOrganizationColumn ? 'organization_id' : null,
+        ].filter((field): field is string => field !== null)
+        const sortFieldNames = Array.from(new Set(['id', ...scopeFieldNames, ...resolvedSorts.map((s) => String(s.field))]))
         phase1 = applySelection(phase1, sortFieldNames)
         if (cap !== null) {
           phase1 = phase1.limit(cap).orderBy(qualify('id'), 'asc' as any)

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

@@ -96,6 +96,8 @@ import {
   ensureTenantScope,
   extractUndoPayload,
   toNumericString,
+  reconcileLinePersistedTotals,
+  deriveLineNetFromGross,
   enforceSalesDocumentOptimisticLock,
   SALES_RESOURCE_KIND_ORDER,
   SALES_RESOURCE_KIND_QUOTE,
@@ -2937,7 +2939,7 @@ function convertLineCalculationToEntityInput(
   index: number,
 ) {
   const line = lineResult.line;
-  return {
+  return reconcileLinePersistedTotals({
     lineNumber: line.lineNumber ?? index + 1,
     kind: line.kind ?? "product",
     statusEntryId: sourceLine.statusEntryId ?? null,
@@ -2984,7 +2986,7 @@ function convertLineCalculationToEntityInput(
     customFieldSetId: sourceLine.customFieldSetId ?? null,
     organizationId: document.organizationId,
     tenantId: document.tenantId,
-  };
+  });
 }
 
 function convertAdjustmentResultToEntityInput(
@@ -3941,7 +3943,9 @@ async function restoreQuoteGraph(
       discountPercent: line.discountPercent,
       taxRate: line.taxRate,
       taxAmount: line.taxAmount,
-      totalNetAmount: line.totalNetAmount,
+      totalNetAmount: toNumericString(
+        deriveLineNetFromGross(line.totalNetAmount, line.totalGrossAmount, line.taxRate),
+      ),
       totalGrossAmount: line.totalGrossAmount,
       configuration: line.configuration ? cloneJson(line.configuration) : null,
       promotionCode: line.promotionCode ?? null,
@@ -4269,7 +4273,9 @@ async function restoreOrderGraph(
       discountPercent: line.discountPercent,
       taxRate: line.taxRate,
       taxAmount: line.taxAmount,
-      totalNetAmount: line.totalNetAmount,
+      totalNetAmount: toNumericString(
+        deriveLineNetFromGross(line.totalNetAmount, line.totalGrossAmount, line.taxRate),
+      ),
       totalGrossAmount: line.totalGrossAmount,
       configuration: line.configuration ? cloneJson(line.configuration) : null,
       promotionCode: line.promotionCode ?? null,
@@ -6190,7 +6196,9 @@ const convertQuoteToOrderCommand: CommandHandler<
           discountPercent: line.discountPercent,
           taxRate: line.taxRate,
           taxAmount: line.taxAmount,
-          totalNetAmount: line.totalNetAmount,
+          totalNetAmount: toNumericString(
+            deriveLineNetFromGross(line.totalNetAmount, line.totalGrossAmount, line.taxRate),
+          ),
           totalGrossAmount: line.totalGrossAmount,
           configuration: line.configuration
             ? cloneJson(line.configuration)
@@ -8444,7 +8452,9 @@ const createInvoiceCommand: CommandHandler<
                   discountPercent: toNumericString(line.discountPercent ?? 0),
                   taxRate: toNumericString(line.taxRate ?? 0),
                   taxAmount: toNumericString(line.taxAmount ?? 0),
-                  totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
+                  totalNetAmount: toNumericString(
+                    deriveLineNetFromGross(line.totalNetAmount ?? 0, line.totalGrossAmount ?? 0, line.taxRate ?? 0),
+                  ),
                   totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
                   metadata: line.metadata ?? null,
                 }),
@@ -8796,7 +8806,9 @@ const deleteInvoiceCommand: CommandHandler<
         discountPercent: line.discountPercent,
         taxRate: line.taxRate,
         taxAmount: line.taxAmount,
-        totalNetAmount: line.totalNetAmount,
+        totalNetAmount: toNumericString(
+          deriveLineNetFromGross(line.totalNetAmount, line.totalGrossAmount, line.taxRate),
+        ),
         totalGrossAmount: line.totalGrossAmount,
         metadata: line.metadata,
       }));
@@ -8938,7 +8950,9 @@ const createCreditMemoCommand: CommandHandler<
                   unitPriceGross: toNumericString(line.unitPriceGross ?? 0),
                   taxRate: toNumericString(line.taxRate ?? 0),
                   taxAmount: toNumericString(line.taxAmount ?? 0),
-                  totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
+                  totalNetAmount: toNumericString(
+                    deriveLineNetFromGross(line.totalNetAmount ?? 0, line.totalGrossAmount ?? 0, line.taxRate ?? 0),
+                  ),
                   totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
                   metadata: line.metadata ?? null,
                 }),
@@ -9280,7 +9294,9 @@ const deleteCreditMemoCommand: CommandHandler<
         unitPriceGross: line.unitPriceGross,
         taxRate: line.taxRate,
         taxAmount: line.taxAmount,
-        totalNetAmount: line.totalNetAmount,
+        totalNetAmount: toNumericString(
+          deriveLineNetFromGross(line.totalNetAmount, line.totalGrossAmount, line.taxRate),
+        ),
         totalGrossAmount: line.totalGrossAmount,
         metadata: line.metadata,
       }));

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

@@ -53,6 +53,74 @@ export function toNumericString(value: number | null | undefined): string | null
   return value.toString()
 }
 
+/** Numeric scale of the `total_net_amount` / `total_gross_amount` line columns. */
+const LINE_AMOUNT_SCALE = 4
+
+function parseLineAmount(value: number | string | null | undefined): number {
+  if (typeof value === 'number') return Number.isFinite(value) ? value : 0
+  if (typeof value === 'string' && value.trim().length) {
+    const parsed = Number(value)
+    if (!Number.isNaN(parsed)) return parsed
+  }
+  return 0
+}
+
+function roundLineAmount(value: number): number {
+  const factor = 10 ** LINE_AMOUNT_SCALE
+  return Math.round((value + Number.EPSILON) * factor) / factor
+}
+
+/**
+ * Derive a sales line's net total from its gross total and tax rate.
+ *
+ * `total_net_amount = 0` while `total_gross_amount > 0` is not a representable
+ * priced state: `gross = net * (1 + taxRate)`, so `net = 0 ⇒ gross = 0`. When a
+ * line carries a positive gross but a missing/zero net (legacy rows, optional
+ * pass-through inputs, or invoice/credit-memo copy of a zeroed order line), the
+ * net is reconstructed from gross and the line's tax rate. `taxRate` is a
+ * percentage (e.g. `23` ⇒ `0.23` fraction), matching the stored column and
+ * `taxCalculationService`. Returns the existing net unchanged when the
+ * invariant already holds. See issues #3521 / #3036.
+ */
+export function deriveLineNetFromGross(
+  net: number | string | null | undefined,
+  gross: number | string | null | undefined,
+  taxRate: number | string | null | undefined,
+): number {
+  const netValue = parseLineAmount(net)
+  const grossValue = parseLineAmount(gross)
+  if (grossValue > 0 && netValue <= 0) {
+    const rate = parseLineAmount(taxRate)
+    const fraction = rate > 0 ? rate / 100 : 0
+    return roundLineAmount(fraction > 0 ? grossValue / (1 + fraction) : grossValue)
+  }
+  return netValue
+}
+
+type LinePersistedTotals = {
+  totalNetAmount?: number | string | null
+  totalGrossAmount?: number | string | null
+  taxRate?: number | string | null
+}
+
+/**
+ * Enforce the `gross > 0 ⇒ net > 0` invariant on a line-entity create payload
+ * right before persistence. Returns the payload unchanged when the net total is
+ * already positive or gross is non-positive; otherwise fills the net total in
+ * from gross / taxRate via {@link deriveLineNetFromGross}. Applied at every
+ * sales line persistence site so the skew that froze return net totals (#3036)
+ * cannot be stored at the source. Idempotent and non-destructive: it only ever
+ * raises a zero/missing net to its derived value.
+ */
+export function reconcileLinePersistedTotals<T extends LinePersistedTotals>(payload: T): T {
+  const gross = parseLineAmount(payload.totalGrossAmount)
+  const net = parseLineAmount(payload.totalNetAmount)
+  if (gross <= 0 || net > 0) return payload
+  const derivedNet = toNumericString(deriveLineNetFromGross(net, gross, payload.taxRate))
+  if (derivedNet == null) return payload
+  return { ...payload, totalNetAmount: derivedNet } as T
+}
+
 export async function requireScopedEntity<T extends { id: string; deletedAt?: Date | null }>(
   em: EntityManager,
   entityClass: { new (): T },

package/src/modules/sales/migrations/Migration20260624120000_backfill_line_net_from_gross.ts

@@ -0,0 +1,48 @@
+import { Migration } from '@mikro-orm/migrations';
+
+/**
+ * Backfill sales line rows that violate the `gross > 0 ⇒ net > 0` invariant
+ * (issue #3521, root cause of #3036).
+ *
+ * `total_net_amount = 0` while `total_gross_amount > 0` is not a representable
+ * priced state (`gross = net * (1 + taxRate)`, so `net = 0 ⇒ gross = 0`). Such
+ * rows froze the order net grand total on a subsequent return and skewed any
+ * invoice / credit-memo line that copied the order line's net. The persistence
+ * paths are sealed at the source in `commands/documents.ts` via
+ * `reconcileLinePersistedTotals` / `deriveLineNetFromGross`; this migration
+ * repairs rows that were already stored in the inconsistent state (including the
+ * seeded demo order `SO-DEMO-2001` on tenants provisioned before the fix).
+ *
+ * The repaired net is reconstructed from the stored gross and tax rate exactly
+ * as the runtime helper does: `net = gross / (1 + taxRate/100)`, rounded to the
+ * column scale (4). When the tax rate is zero/null the net equals the gross.
+ *
+ * Forward-only: the original (corrupt) zero net carried no information to
+ * restore, so reverting is a no-op.
+ */
+export class Migration20260624120000_backfill_line_net_from_gross extends Migration {
+  override up(): void | Promise<void> {
+    for (const table of [
+      'sales_order_lines',
+      'sales_quote_lines',
+      'sales_invoice_lines',
+      'sales_credit_memo_lines',
+    ]) {
+      this.addSql(`
+        update "${table}"
+        set "total_net_amount" = round(
+          "total_gross_amount" / (1 + coalesce("tax_rate", 0) / 100),
+          4
+        )
+        where "total_gross_amount" > 0
+          and ("total_net_amount" is null or "total_net_amount" <= 0);
+      `);
+    }
+  }
+
+  override down(): void | Promise<void> {
+    // Forward-only data repair. The pre-migration zero/missing net carried no
+    // information to restore, and reintroducing the `net = 0, gross > 0` skew
+    // would re-open #3036. No-op.
+  }
+}