Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(sales): pre-fill order requested/promised dates from quote lead time (#1752)

Brad Barbin3e066551f1ed
diff --git a/packages/database/supabase/functions/convert/index.ts b/packages/database/supabase/functions/convert/index.ts
index 3553a8d9cc..45902a24e3 100644
--- a/packages/database/supabase/functions/convert/index.ts
+++ b/packages/database/supabase/functions/convert/index.ts
@@ -4,7 +4,6 @@ import { z } from "npm:zod@^4.5.4";
import { DB, getConnectionPool, getDatabaseClient } from "../lib/database.ts";
import { datetime, getCompanyTimeZone } from "../lib/datetime.ts";
-import { format } from "https://deno.land/[email protected]/datetime/format.ts";
import { getFunctionLogger } from "../lib/logging.ts";
import { toJson } from "../lib/json.ts";
import { RecordNotFoundError } from "../lib/company-records.ts";
@@ -576,7 +575,10 @@ serve(async (req: Request) => {
let insertedSalesOrderId = "";
await db.transaction().execute(async (trx) => {
- const today = datetime.today(await getCompanyTimeZone(client, companyId)).toString();
+ const todayDate = datetime.today(
+ await getCompanyTimeZone(client, companyId)
+ );
+ const today = todayDate.toString();
const salesOrderId = await getNextSequence(
trx,
"salesOrder",
@@ -657,15 +659,6 @@ serve(async (req: Request) => {
})
.execute();
- // Copy quoteShipment data to salesOrderShipment
- await trx
- .insertInto("salesOrderShipment")
- .values({
- ...quoteShipping.data,
- id: insertedSalesOrderId,
- })
- .execute();
-
const pickMethodDefaultsByLineId = new Map<string, string | null>();
await Promise.all(
selectedQuoteLines.map(async (line) => {
@@ -721,12 +714,9 @@ serve(async (req: Request) => {
status: "Ordered",
unitOfMeasureCode: line.unitOfMeasureCode,
unitPrice: price.netUnitPrice ?? 0,
- promisedDate: format(
- new Date(
- Date.now() + (price.leadTime ?? 0) * 24 * 60 * 60 * 1000
- ),
- "yyyy-MM-dd"
- ),
+ promisedDate: todayDate
+ .add({ days: price.leadTime ?? 0 })
+ .toString(),
createdBy: userId,
companyId,
exchangeRate: quote.data.exchangeRate ?? 1,
@@ -736,6 +726,28 @@ serve(async (req: Request) => {
};
});
+ // The order is promised when its last line is: the latest line
+ // promise (today + that line's quoted lead time). A requested date
+ // the quote already carries is the customer's and is kept.
+ const receiptPromisedDate =
+ salesOrderLineInserts
+ .map((insert) => insert.promisedDate)
+ .filter((date): date is string => !!date)
+ .sort()
+ .at(-1) ?? null;
+
+ // Copy quoteShipment data to salesOrderShipment
+ await trx
+ .insertInto("salesOrderShipment")
+ .values({
+ ...quoteShipping.data,
+ id: insertedSalesOrderId,
+ receiptRequestedDate:
+ quoteShipping.data.receiptRequestedDate ?? receiptPromisedDate,
+ receiptPromisedDate,
+ })
+ .execute();
+
if (salesOrderLineInserts.length > 0) {
await trx
.insertInto("salesOrderLine")