feat(catalog): auto-purge orphan materials when quotes/items release them

A material that ends up referenced by nothing (no line_items anywhere, no warehouse stock) was previously left behind forever, accumulating dead catalog rows as offers were edited or deleted. - new quote_service.cleanup_orphan_materials(db, material_ids): for each candidate it checks usage across line_items (all quotes) and warehouse inventory; only when both are zero does it remove the auxiliary rows (supplier_materials, brand_materials, material_units, material_attribute_values) and finally the materials row; returns the purged ids - replace_quote_children (edit modal): snapshots the quote's material ids before the children are replaced, diffs against the incoming items, and purges whatever was detached - delete_quote: collects the quote's material ids + attachment keys first, deletes the quote, purges orphans inside the transaction, and only then (post-commit) removes the MinIO objects — now both the recorded attachment keys and a recursive remove_prefix(quote_id/) sweep, so stray objects under the quote folder cannot survive; the response's cascaded block reports purged_orphan_materials - line_items: PATCH that switches a line item's material, and DELETE of a line item, both clean up the previously referenced material - storage.remove_prefix(prefix): best-effort recursive object deletion under a prefix (sync MinIO client wrapped in asyncio.to_thread, same pattern as remove_object) Safety: usage checks run against the whole system before any delete, so shared materials — including those held only by warehouse stock — are never touched. Verified: python compile + api image build clean.
fix(wizard,quotes,dates): reliable error routing, single-project accept, Persian date/time input
2026-09-17 18:04:57 +03:30 · 2026-09-17 16:13:27 +03:30
18 changed files with 622 additions and 171 deletions
@@ -119,6 +119,7 @@ def _fa_validation_msg(msg: str) -> str:

@app.exception_handler(RequestValidationError)
 async def validation_error_handler(_request: Request, exc: RequestValidationError):
+    logger.warning("RequestValidationError on %s: %s", _request.url.path, exc.errors())
    first = exc.errors()[0]
    loc = [str(part) for part in first.get("loc", []) if part not in ("body", "query", "path")]
    field = ".".join(loc) if loc else None
@@ -108,6 +108,7 @@ async def update_line_item(
        effective_bm = payload.brand_material_id if payload.brand_material_id is not None else li.brand_material_id
        await ensure_brand_material_belong(db, effective_bm, new_material_id)

+    old_material_id = li.material_id
    if payload.material_id is not None:
        li.material_id = payload.material_id
        # v2.5: keep the supplier<->material catalog edge in sync.
@@ -121,6 +122,11 @@ async def update_line_item(
    if payload.notes is not None:
        li.notes = payload.notes
    await db.flush()
+
+    if payload.material_id is not None and payload.material_id != old_material_id:
+        from app.services.quote_service import cleanup_orphan_materials
+        await cleanup_orphan_materials(db, [old_material_id])
+
    return {"data": (await serialize_line_items(db, [li], set()))[0]}


@@ -133,6 +139,13 @@ async def delete_line_item(quote_id, line_item_id, db: AsyncSession = Depends(ge
    decision = await db.scalar(select(ItemDecision).where(ItemDecision.line_item_id == li.id))
    if decision is not None and decision.status == "chosen":
        raise ConflictError("خط آیتم انتخاب‌شده قابل حذف نیست")
+    old_material_id = li.material_id
    await db.delete(li)  # specs / links / decision / receipt cascade via DDL
    await db.flush()
+
+    if old_material_id:
+        from app.services.quote_service import cleanup_orphan_materials
+        await cleanup_orphan_materials(db, [old_material_id])
+
    return {"data": {"id": str(line_item_id), "deleted": True}}
+
@@ -290,12 +290,78 @@ async def quote_has_receipts(db: AsyncSession, quote_id: UUID) -> bool:
    return (count or 0) > 0


+async def cleanup_orphan_materials(db: AsyncSession, material_ids) -> list[UUID]:
+    """Check candidate material_ids and purge any that have zero references.
+
+    A material is considered an orphan if:
+    1. It is not referenced by ANY line_items across all quotes.
+    2. It is not referenced by ANY inventory stock items in warehouses.
+
+    If count == 0:
+    - Auxiliary records in supplier_materials, brand_materials, material_units,
+      and material_attribute_values are cleaned up.
+    - The material row is deleted from the central materials table.
+
+    Returns the list of purged material UUIDs.
+    """
+    purged: list[UUID] = []
+    unique_ids = {m for m in material_ids if m is not None}
+    if not unique_ids:
+        return purged
+
+    from app.models.catalog import (
+        BrandMaterial,
+        Material,
+        MaterialAttributeValue,
+        MaterialUnit,
+    )
+    from app.models.inventory import InventoryItem
+    from app.models.procurement import LineItem, SupplierMaterial
+
+    for mat_id in unique_ids:
+        # Check active usage in line_items across the whole system
+        line_item_count = await db.scalar(
+            select(func.count(LineItem.id)).where(LineItem.material_id == mat_id)
+        )
+        if (line_item_count or 0) > 0:
+            continue
+
+        # Check active usage in warehouse inventory
+        inv_count = await db.scalar(
+            select(func.count(InventoryItem.id)).where(InventoryItem.material_id == mat_id)
+        )
+        if (inv_count or 0) > 0:
+            continue
+
+        # Material is not used in ANY line item and not in ANY warehouse inventory: pure orphan!
+        await db.execute(
+            delete(SupplierMaterial).where(SupplierMaterial.material_id == mat_id)
+        )
+        await db.execute(
+            delete(BrandMaterial).where(BrandMaterial.material_id == mat_id)
+        )
+        await db.execute(
+            delete(MaterialUnit).where(MaterialUnit.material_id == mat_id)
+        )
+        await db.execute(
+            delete(MaterialAttributeValue).where(MaterialAttributeValue.material_id == mat_id)
+        )
+        await db.execute(
+            delete(Material).where(Material.id == mat_id)
+        )
+        purged.append(mat_id)
+        logger.info("Purged orphan material %s from central catalog", mat_id)
+
+    return purged
+
+
 async def replace_quote_children(
    db: AsyncSession, quote_id: UUID, payload: QuoteChildrenReplaceIn, actor: str | None = None
 ) -> Quote:
    """Full replacement of a quote's line items + termsheets (edit modal).

    Only allowed while the quote is still offered and has no warehouse receipts.
+    Automatically purges any materials detached during this replacement if they become orphans.
    """
    async with db.begin():
        quote = await get_quote_or_404(db, quote_id)
@@ -309,6 +375,11 @@ async def replace_quote_children(
                "این پیشنهاد به‌دلیل ثبت رسید در انبار، غیرقابل ویرایش یا بازگشت است.",
                field="status",
            )
+
+        # 1. Pre-update snapshot: record previous material_ids assigned to this quote's items
+        old_items = (await db.execute(select(LineItem).where(LineItem.quote_id == quote.id))).scalars().all()
+        old_material_ids = {li.material_id for li in old_items if li.material_id is not None}
+
        # children cascade via DDL: item_termsheets, item_decisions, item_receipts, schedule_steps
        await db.execute(
            delete(LineItem).where(LineItem.quote_id == quote.id).execution_options(synchronize_session=False)
@@ -317,10 +388,21 @@ async def replace_quote_children(
            delete(Termsheet).where(Termsheet.quote_id == quote.id).execution_options(synchronize_session=False)
        )
        await _insert_children(db, quote.id, quote.supplier_id, payload.line_items, payload.termsheets, payload.item_termsheets)
+        await db.flush()
+
+        # 2. Identify detached materials: previous materials no longer present in the updated line items
+        new_material_ids = {li.material_id for li in payload.line_items if li.material_id is not None}
+        detached_material_ids = old_material_ids - new_material_ids
+
+        # 3. Clean up any detached materials that are now orphans (0 usage)
+        if detached_material_ids:
+            await cleanup_orphan_materials(db, detached_material_ids)
+
        _add_event(db, quote.id, "edited", {"changed_fields": ["line_items", "termsheets"]}, actor)
    return quote


+
 async def _apply_status_transition(db: AsyncSession, quote: Quote, new_status: str) -> None:
    """Backward transitions only; reverts bookkeeping when going back to offered."""
    current = quote.status
@@ -346,7 +428,7 @@ async def _apply_status_transition(db: AsyncSession, quote: Quote, new_status: s
        li_ids = select(LineItem.id).where(LineItem.quote_id == quote.id)
        await db.execute(
            update(ItemDecision)
-            .where(ItemDecision.line_item_id.in_(li_ids), ItemDecision.status != "pending")
+            .where(ItemDecision.line_item_id.in_(li_ids))
            .values(
                status="pending",
                decided_at=None,
@@ -524,21 +606,7 @@ async def accept_quote(db: AsyncSession, quote_id: UUID, payload: AcceptQuoteIn,
                decision.adjusted_notes = decision_in.adjusted_notes
                decision.decided_at = utcnow()

-        # --- per-material project allocation (تخصیص پروژه به هر قلم) ---
-        for entry in payload.item_projects:
-            if entry.line_item_id not in li_ids:
-                raise NotFoundError(
-                    "خط آیتم یافت نشد یا متعلق به این پیشنهاد نیست", field="item_projects"
-                )
-            await db.execute(
-                delete(LineItemProjects)
-                .where(LineItemProjects.line_item_id == entry.line_item_id)
-                .execution_options(synchronize_session=False)
-            )
-            for pid in entry.project_ids:
-                if await db.get(Project, pid) is None:
-                    raise NotFoundError("پروژه یافت نشد", field="item_projects.project_ids")
-                db.add(LineItemProjects(line_item_id=entry.line_item_id, project_id=pid))
+        # LineItemProjects records in PostgreSQL remain 100% untouched. Only item_decisions.project_id is written.

        # termsheets referenced by at least one chosen item -> accepted
        if chosen_ts_ids:
@@ -735,20 +803,36 @@ async def delete_quote(db: AsyncSession, quote_id: UUID) -> dict:
        termsheets = (await db.execute(select(Termsheet).where(Termsheet.quote_id == quote.id))).scalars().all()
        events = (await db.execute(select(QuoteEvent).where(QuoteEvent.quote_id == quote.id))).scalars().all()

-        # clean up attachments in MinIO before cascade
+        # collect candidate material_ids for orphan cleanup before deleting quote
+        candidate_material_ids = [li.material_id for li in line_items if li.material_id is not None]
+
+        # collect attachment keys before deleting quote row
        from app.models.files import QuoteAttachment
        from app.services import storage

        attachments = (await db.execute(select(QuoteAttachment).where(QuoteAttachment.quote_id == quote.id))).scalars().all()
-        for att in attachments:
-            try:
-                await storage.remove_object(att.object_key)
-            except Exception:
-                logger.warning("Failed to remove MinIO object %s for attachment %s", att.object_key, att.id)
+        att_keys = [att.object_key for att in attachments]
+        quote_prefix = f"{quote.id}/"

        await db.delete(quote)
+        await db.flush()
+
+        # Purge any materials that no longer have any references in the system
+        purged_material_ids = await cleanup_orphan_materials(db, candidate_material_ids)
+
+    # Post-commit: clean up attachments in MinIO (best-effort; DB is already committed)
+    for key in att_keys:
+        try:
+            await storage.remove_object(key)
+        except Exception:
+            logger.warning("Failed to remove MinIO object %s for quote %s", key, quote_id)
+    try:
+        await storage.remove_prefix(quote_prefix)
+    except Exception:
+        logger.warning("Failed to remove MinIO prefix %s for quote %s", quote_prefix, quote_id)
+
    return {
-            "id": str(quote.id),
+        "id": str(quote_id),
        "deleted": True,
        "cascaded": {
            "line_items": len(line_items),
@@ -757,10 +841,13 @@ async def delete_quote(db: AsyncSession, quote_id: UUID) -> dict:
            "decisions": len(decisions),
            "receipts": len(receipts),
            "attachments": len(attachments),
+            "purged_orphan_materials": len(purged_material_ids),
        },
    }


+
+
 # ---------------------------------------------------------------------------
 # Statistics
 # ---------------------------------------------------------------------------
@@ -66,3 +66,22 @@ async def remove_object(key: str) -> None:
        await asyncio.to_thread(get_client().remove_object, settings.MINIO_BUCKET, key)
    except Exception:
        logger.warning("Could not remove MinIO object %r — ignoring", key)
+
+
+async def remove_prefix(prefix: str) -> None:
+    """Delete all objects matching a prefix in the bucket (best-effort)."""
+    client = get_client()
+
+    def _sync_remove_prefix():
+        try:
+            objects = client.list_objects(settings.MINIO_BUCKET, prefix=prefix, recursive=True)
+            for obj in objects:
+                try:
+                    client.remove_object(settings.MINIO_BUCKET, obj.object_name)
+                except Exception:
+                    logger.warning("Could not remove MinIO object %r under prefix %r", obj.object_name, prefix)
+        except Exception:
+            logger.warning("Could not list MinIO objects under prefix %r — ignoring", prefix)
+
+    await asyncio.to_thread(_sync_remove_prefix)
+
@@ -6,6 +6,7 @@ import {
  jalaliStrToIso,
  jalaliToGregorian,
  MONTHS,
+  toAsciiDigits,
  toFa,
  WEEKDAYS,
 } from "../lib/jalali";
@@ -29,7 +30,7 @@ function todayJalali(): [number, number, number] {

 function isoToJalali(iso: string | null): [number, number, number] | null {
  if (!iso) return null;
-  const m = String(iso).match(/^(\d{4})-(\d{2})-(\d{2})/);
+  const m = String(iso).match(/^(\d{4})-(\d{2})-(\d{2})$/);
  if (m) {
    const gy = parseInt(m[1], 10);
    const gm = parseInt(m[2], 10);
@@ -78,6 +79,10 @@ export function JalaliDatePicker({
 }: JalaliDatePickerProps) {
  const [open, setOpen] = useState(false);
  const [curJ, setCurJ] = useState<[number, number, number]>(() => isoToJalali(value) ?? todayJalali());
+  const initialTime = timeOf(value);
+  const [hourText, setHourText] = useState<string>(() => faNum(String(initialTime.h).padStart(2, "0")));
+  const [minuteText, setMinuteText] = useState<string>(() => faNum(String(initialTime.m).padStart(2, "0")));
+
  const [text, setText] = useState<string>(() => {
    if (!value) return "";
    const j = isoToJalaliStr(value);
@@ -92,19 +97,28 @@ export function JalaliDatePicker({
  useEffect(() => {
    if (!value) {
      setText("");
+      const now = nowTime();
+      setHourText(faNum(String(now.h).padStart(2, "0")));
+      setMinuteText(faNum(String(now.m).padStart(2, "0")));
      return;
    }
    const j = isoToJalaliStr(value);
+    const t = timeOf(value);
    if (!withTime) {
      setText(j);
    } else {
-      const d = new Date(value);
-      if (Number.isNaN(d.getTime())) {
-        setText(j);
-      } else {
-        const hh = String(d.getHours()).padStart(2, "0");
-        const mm = String(d.getMinutes()).padStart(2, "0");
+      const hh = String(t.h).padStart(2, "0");
+      const mm = String(t.m).padStart(2, "0");
      setText(`${j} ${faNum(hh + ":" + mm)}`);
+
+      // Only update local input texts if numeric values differ, to avoid wiping in-progress typing
+      const curH = parseInt(toAsciiDigits(hourText) || "0", 10);
+      if (curH !== t.h) {
+        setHourText(faNum(hh));
+      }
+      const curM = parseInt(toAsciiDigits(minuteText) || "0", 10);
+      if (curM !== t.m) {
+        setMinuteText(faNum(mm));
      }
    }
    const jParts = isoToJalali(value);
@@ -116,14 +130,13 @@ export function JalaliDatePicker({
  // تاریخ انتخاب‌شده به صورت محلی (نه UTC) برای مقایسه با سلول‌های تقویم
  function selectedLocalDate(): string | null {
    if (!value) return null;
-    const m = String(value).match(/^(\d{4})-(\d{2})-(\d{2})/);
+    const m = String(value).match(/^(\d{4})-(\d{2})-(\d{2})$/);
    if (m) return `${m[1]}-${m[2]}-${m[3]}`;
    const d = new Date(value);
    if (Number.isNaN(d.getTime())) return null;
    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
  }
  const selectedIso = selectedLocalDate();
-  const time = timeOf(value);

  const grid = useMemo(() => {
    const [jy, jm] = curJ;
@@ -163,36 +176,108 @@ export function JalaliDatePicker({
  };

  const selectDay = (jy: number, jm: number, jd: number) => {
-    const val = withTime ? buildIso(jy, jm, jd, time.h, time.m) : buildDateOnly(jy, jm, jd);
+    const currentH = parseInt(toAsciiDigits(hourText) || "0", 10);
+    const currentM = parseInt(toAsciiDigits(minuteText) || "0", 10);
+    const validH = Math.min(23, Math.max(0, currentH));
+    const validM = Math.min(59, Math.max(0, currentM));
+    const val = withTime ? buildIso(jy, jm, jd, validH, validM) : buildDateOnly(jy, jm, jd);
    onChange(val);
    setText(
-      `${toFa(jy)}/${toFa(String(jm).padStart(2, "0"))}/${toFa(String(jd).padStart(2, "0"))}${withTime ? " " + faNum(String(time.h).padStart(2, "0") + ":" + String(time.m).padStart(2, "0")) : ""}`
+      `${toFa(jy)}/${toFa(String(jm).padStart(2, "0"))}/${toFa(String(jd).padStart(2, "0"))}${withTime ? " " + faNum(String(validH).padStart(2, "0") + ":" + String(validM).padStart(2, "0")) : ""}`
    );
    setOpen(false);
  };

-  const setTimePart = (part: "h" | "m", raw: string) => {
-    const n = parseInt(raw.replace(/[۰-۹]/g, (d) => String("۰۱۲۳۴۵۶۷۸۹".indexOf(d))), 10);
-    if (Number.isNaN(n)) return;
-    const h = part === "h" ? Math.min(23, Math.max(0, n)) : time.h;
-    const m = part === "m" ? Math.min(59, Math.max(0, n)) : time.m;
+  const handleHourChange = (raw: string) => {
+    let digits = toAsciiDigits(raw).replace(/\D/g, "");
+    if (digits.length === 3) {
+      digits = digits.slice(-1);
+    } else if (digits.length > 3) {
+      digits = digits.slice(0, 2);
+    }
+    if (!digits) {
+      setHourText("");
+      return;
+    }
+    const n = parseInt(digits, 10);
+    const clamped = Math.min(23, Math.max(0, n));
+    const textToShow = digits.length === 2 && n > 23 ? String(clamped) : digits;
+    setHourText(faNum(textToShow));
+
    const [jy, jm, jd] = curJ;
-    onChange(buildIso(jy, jm, jd, h, m));
-    // به‌روزرسانی نمایش
-    const j = value ? isoToJalaliStr(value) : isoToJalaliStr(buildIso(jy, jm, jd, h, m));
-    setText(`${j} ${faNum(String(h).padStart(2, "0") + ":" + String(m).padStart(2, "0"))}`);
+    const currentM = parseInt(toAsciiDigits(minuteText) || "0", 10);
+    const validM = Math.min(59, Math.max(0, currentM));
+    onChange(buildIso(jy, jm, jd, clamped, validM));
+    const j = value ? isoToJalaliStr(value) : isoToJalaliStr(buildIso(jy, jm, jd, clamped, validM));
+    setText(`${j} ${faNum(String(clamped).padStart(2, "0") + ":" + String(validM).padStart(2, "0"))}`);
+  };
+
+  const handleHourBlur = () => {
+    const digits = toAsciiDigits(hourText).replace(/\D/g, "");
+    const n = digits ? parseInt(digits, 10) : 0;
+    const clamped = Math.min(23, Math.max(0, n));
+    setHourText(faNum(String(clamped).padStart(2, "0")));
+
+    const [jy, jm, jd] = curJ;
+    const currentM = parseInt(toAsciiDigits(minuteText) || "0", 10);
+    const validM = Math.min(59, Math.max(0, currentM));
+    onChange(buildIso(jy, jm, jd, clamped, validM));
+    const j = value ? isoToJalaliStr(value) : isoToJalaliStr(buildIso(jy, jm, jd, clamped, validM));
+    setText(`${j} ${faNum(String(clamped).padStart(2, "0") + ":" + String(validM).padStart(2, "0"))}`);
+  };
+
+  const handleMinuteChange = (raw: string) => {
+    let digits = toAsciiDigits(raw).replace(/\D/g, "");
+    if (digits.length === 3) {
+      digits = digits.slice(-1);
+    } else if (digits.length > 3) {
+      digits = digits.slice(0, 2);
+    }
+    if (!digits) {
+      setMinuteText("");
+      return;
+    }
+    const n = parseInt(digits, 10);
+    const clamped = Math.min(59, Math.max(0, n));
+    const textToShow = digits.length === 2 && n > 59 ? String(clamped) : digits;
+    setMinuteText(faNum(textToShow));
+
+    const [jy, jm, jd] = curJ;
+    const currentH = parseInt(toAsciiDigits(hourText) || "0", 10);
+    const validH = Math.min(23, Math.max(0, currentH));
+    onChange(buildIso(jy, jm, jd, validH, clamped));
+    const j = value ? isoToJalaliStr(value) : isoToJalaliStr(buildIso(jy, jm, jd, validH, clamped));
+    setText(`${j} ${faNum(String(validH).padStart(2, "0") + ":" + String(clamped).padStart(2, "0"))}`);
+  };
+
+  const handleMinuteBlur = () => {
+    const digits = toAsciiDigits(minuteText).replace(/\D/g, "");
+    const n = digits ? parseInt(digits, 10) : 0;
+    const clamped = Math.min(59, Math.max(0, n));
+    setMinuteText(faNum(String(clamped).padStart(2, "0")));
+
+    const [jy, jm, jd] = curJ;
+    const currentH = parseInt(toAsciiDigits(hourText) || "0", 10);
+    const validH = Math.min(23, Math.max(0, currentH));
+    onChange(buildIso(jy, jm, jd, validH, clamped));
+    const j = value ? isoToJalaliStr(value) : isoToJalaliStr(buildIso(jy, jm, jd, validH, clamped));
+    setText(`${j} ${faNum(String(validH).padStart(2, "0") + ":" + String(clamped).padStart(2, "0"))}`);
  };

  const pickToday = () => {
    const now = new Date();
    const [jy, jm, jd] = todayJalali();
+    const nh = now.getHours();
+    const nm = now.getMinutes();
+    setHourText(faNum(String(nh).padStart(2, "0")));
+    setMinuteText(faNum(String(nm).padStart(2, "0")));
    const val = withTime
-      ? buildIso(jy, jm, jd, now.getHours(), now.getMinutes())
+      ? buildIso(jy, jm, jd, nh, nm)
      : buildDateOnly(jy, jm, jd);
    onChange(val);
    setText(
      withTime
-        ? `${toFa(jy)}/${toFa(String(jm).padStart(2, "0"))}/${toFa(String(jd).padStart(2, "0"))} ${faNum(String(now.getHours()).padStart(2, "0") + ":" + String(now.getMinutes()).padStart(2, "0"))}`
+        ? `${toFa(jy)}/${toFa(String(jm).padStart(2, "0"))}/${toFa(String(jd).padStart(2, "0"))} ${faNum(String(nh).padStart(2, "0") + ":" + String(nm).padStart(2, "0"))}`
        : `${toFa(jy)}/${toFa(String(jm).padStart(2, "0"))}/${toFa(String(jd).padStart(2, "0"))}`,
    );
    setOpen(false);
@@ -201,17 +286,24 @@ export function JalaliDatePicker({
  const clear = () => {
    onChange(null);
    setText("");
+    const now = nowTime();
+    setHourText(faNum(String(now.h).padStart(2, "0")));
+    setMinuteText(faNum(String(now.m).padStart(2, "0")));
    setOpen(false);
  };

  const onInputChange = (v: string) => {
    setText(v);
+    if (!v.trim()) {
+      onChange(null);
+      return;
+    }
    const iso = jalaliStrToIso(v);
    if (iso) {
      if (!withTime) {
        const nums = String(v)
          .split(/[/\-.]/)
-          .map((x) => parseInt(String(x).replace(/[۰-۹]/g, (d) => String("۰۱۲۳۴۵۶۷۸۹".indexOf(d))), 10));
+          .map((x) => parseInt(toAsciiDigits(x), 10));
        if (nums.length >= 3 && !nums.some((n) => Number.isNaN(n))) {
          const [gy, gm, gd] = jalaliToGregorian(nums[0], nums[1], nums[2]);
          onChange(`${gy}-${String(gm).padStart(2, "0")}-${String(gd).padStart(2, "0")}`);
@@ -226,6 +318,51 @@ export function JalaliDatePicker({
    }
  };

+  const handleInputBlur = () => {
+    if (!text.trim()) {
+      onChange(null);
+      return;
+    }
+    const iso = jalaliStrToIso(text);
+    if (iso) {
+      if (!withTime) {
+        const nums = String(text)
+          .split(/[/\-.]/)
+          .map((x) => parseInt(toAsciiDigits(x), 10));
+        if (nums.length >= 3 && !nums.some((n) => Number.isNaN(n))) {
+          const [gy, gm, gd] = jalaliToGregorian(nums[0], nums[1], nums[2]);
+          const dOnly = `${gy}-${String(gm).padStart(2, "0")}-${String(gd).padStart(2, "0")}`;
+          onChange(dOnly);
+          setText(isoToJalaliStr(dOnly));
+        } else {
+          onChange(iso.slice(0, 10));
+          setText(isoToJalaliStr(iso));
+        }
+      } else {
+        onChange(iso);
+        const j = isoToJalaliStr(iso);
+        const d = new Date(iso);
+        if (!Number.isNaN(d.getTime())) {
+          const hh = String(d.getHours()).padStart(2, "0");
+          const mm = String(d.getMinutes()).padStart(2, "0");
+          setText(`${j} ${faNum(hh + ":" + mm)}`);
+        }
+      }
+    } else if (value) {
+      const j = isoToJalaliStr(value);
+      if (!withTime) {
+        setText(j);
+      } else {
+        const d = new Date(value);
+        if (!Number.isNaN(d.getTime())) {
+          const hh = String(d.getHours()).padStart(2, "0");
+          const mm = String(d.getMinutes()).padStart(2, "0");
+          setText(`${j} ${faNum(hh + ":" + mm)}`);
+        }
+      }
+    }
+  };
+
  return (
    <div ref={ref} className={cn("relative", className)}>
      <input
@@ -238,6 +375,7 @@ export function JalaliDatePicker({
        onFocus={() => !disabled && setOpen(true)}
        onClick={() => !disabled && setOpen(true)}
        onChange={(e) => onInputChange(e.target.value)}
+        onBlur={handleInputBlur}
      />
      {open && !disabled && (
        <div
@@ -248,6 +386,7 @@ export function JalaliDatePicker({
            withTime ? "w-80 p-3" : "w-64 p-2",
          )}
        >
+          {/* 1. Header: Month / Year Navigation */}
          <div className="mb-1.5 flex items-center justify-between gap-1">
            <button type="button" className="cursor-pointer rounded px-1.5 text-sm hover:bg-slate-bg" onClick={() => nav("y+1")}>
              «
@@ -265,6 +404,8 @@ export function JalaliDatePicker({
              »
            </button>
          </div>
+
+          {/* 2. Day of Week Header & Days Grid */}
          <div className="grid grid-cols-7 gap-0.5 text-center">
            {WEEKDAYS.map((w) => (
              <div key={w} className="py-0.5 text-[10px] font-bold text-muted">
@@ -291,33 +432,40 @@ export function JalaliDatePicker({
              ),
            )}
          </div>
+
+          {/* 3. Time Inputs Row (Positioned BELOW the calendar grid) — Hour on left, Minute on right */}
          {withTime && (
-            <div className="mt-2 flex items-center justify-center gap-4 border-t border-line pt-2.5">
+            <div className="mt-2 flex items-center justify-center gap-3 rounded-md border border-line/70 bg-slate-bg/40 py-1.5">
              <div className="flex items-center gap-1.5">
-                <span className="text-[11.5px] font-semibold text-muted">ساعت</span>
                <input
                  type="text"
-                  className="num-input h-8 w-14 rounded-md border border-line bg-panel px-1 text-center text-[13px] tabular-nums focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 max-md:h-10 max-md:w-16"
-                  value={faNum(String(time.h).padStart(2, "0"))}
+                  className="num-input h-7 w-12 rounded-md border border-line bg-panel px-1 text-center text-[13px] tabular-nums focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 max-md:h-9 max-md:w-14"
+                  value={minuteText}
                  inputMode="numeric"
-                  maxLength={2}
-                  onChange={(e) => setTimePart("h", e.target.value)}
+                  onFocus={(e) => e.target.select()}
+                  onChange={(e) => handleMinuteChange(e.target.value)}
+                  onBlur={handleMinuteBlur}
                />
-              </div>
-              <span className="text-muted">:</span>
-              <div className="flex items-center gap-1.5">
                <span className="text-[11.5px] font-semibold text-muted">دقیقه</span>
+              </div>
+              <span className="font-bold text-muted">:</span>
+              <div className="flex items-center gap-1.5">
                <input
                  type="text"
-                  className="num-input h-8 w-14 rounded-md border border-line bg-panel px-1 text-center text-[13px] tabular-nums focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 max-md:h-10 max-md:w-16"
-                  value={faNum(String(time.m).padStart(2, "0"))}
+                  className="num-input h-7 w-12 rounded-md border border-line bg-panel px-1 text-center text-[13px] tabular-nums focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 max-md:h-9 max-md:w-14"
+                  value={hourText}
                  inputMode="numeric"
-                  maxLength={2}
-                  onChange={(e) => setTimePart("m", e.target.value)}
+                  onFocus={(e) => e.target.select()}
+                  onChange={(e) => handleHourChange(e.target.value)}
+                  onBlur={handleHourBlur}
                />
+                <span className="text-[11.5px] font-semibold text-muted">ساعت</span>
              </div>
            </div>
          )}
+
+
+          {/* 4. Action Buttons Footer */}
          <div className="mt-2 flex justify-between border-t border-line pt-2">
            <button type="button" className="cursor-pointer rounded px-2 py-0.5 text-[11.5px] text-accent hover:bg-slate-bg" onClick={pickToday}>
              امروز
@@ -17,7 +17,7 @@ export function useAddMaterial() {
  const invalidate = useInvalidateStore();
  return useMutation({
    mutationFn: (m: Material) => api.materials.create(m),
-    onMutate: (m) => addMaterial(m),
+    onSuccess: (created) => addMaterial(created),
    onSettled: () => invalidate(),
  });
 }
@@ -14,6 +14,7 @@

 import { normalize } from "./normalize";
 import { buildTopics } from "./topics";
+import { jalaliToGregorian, toAsciiDigits } from "./jalali";
 import { useAuthStore } from "../store/auth";
 import type {
  Attachment,
@@ -33,7 +34,7 @@ import type {
  Warehouse,
 } from "./types";

-const BASE_URL = (import.meta.env.VITE_API_BASE_URL as string | undefined)?.trim() || "/api/v1";
+const BASE_URL = (import.meta.env?.VITE_API_BASE_URL as string | undefined)?.trim() || "/api/v1";
 const PAGE_SIZE = 100;

 // حذف کلیدهای خالی/undefined از پارامترهای کوئری — URLSearchParams مقدار
@@ -135,22 +136,42 @@ const FIELD_FA: Record<string, string> = {
  expiry_date: "تاریخ انقضا",
  accepted_date: "تاریخ پذیرش",
  arrived_date: "تاریخ رسید",
+  due_date: "تاریخ سررسید",
+  schedule_steps: "مراحل پرداخت",
+  milestones: "مراحل پرداخت",
+  amount: "مبلغ",
+  step_no: "شماره مرحله",
 };

-const faField = (field: string): string => {
-  const last = field.split(".").filter(Boolean).pop() || field;
+export const faField = (field: string): string => {
+  const parts = field.split(".").filter((p) => p && !/^\d+$/.test(p));
+  const last = parts.pop() || field;
  return FIELD_FA[last] || FIELD_FA[field] || field;
 };

-// ترجمه‌ی خطای HTTP بر اساس کد وضعیت
-const faHttpError = (status: number, fallback: string): string => {
+// ترجمه‌ی خطای HTTP بر اساس کد وضعیت — پیام‌های معنادار بک‌اند حفظ می‌شوند
+export const faHttpError = (status: number, fallback: string): string => {
  if (status === 413) return "فایل انتخاب‌شده از حد مجاز (۵ مگابایت) بزرگ‌تر است";
-  if (status === 404) return "مورد درخواستی یافت نشد";
-  if (status === 409) return "تعارض داده — رکورد تکراری یا وضعیت نامعتبر";
-  if (status === 400) return "داده‌ی ارسال‌شده نامعتبر است";
+  if (status === 404 && (!fallback || fallback.startsWith("خطای سرور"))) return "مورد درخواستی یافت نشد";
+  if (status === 409 && (!fallback || fallback.startsWith("خطای سرور"))) return "تعارض داده — رکورد تکراری یا وضعیت نامعتبر";
+  if (status === 400 && (!fallback || fallback.startsWith("خطای سرور"))) return "داده‌ی ارسال‌شده نامعتبر است";
  return fallback;
 };

+export class ApiError extends Error {
+  status: number;
+  code?: string;
+  field?: string;
+
+  constructor(message: string, status: number, code?: string, field?: string) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.code = code;
+    this.field = field;
+  }
+}
+
 // ============================================================
 // HTTP helpers — envelope بک‌اند: {"data": ..., "meta": ...}
 // ============================================================
@@ -163,27 +184,43 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
      headers: authHeaders(init),
    });
  } catch {
-    throw new Error("اتصال به سرور برقرار نشد — آیا بک‌اند در دسترس است؟");
+    throw new ApiError("اتصال به سرور برقرار نشد — آیا بک‌اند در دسترس است؟", 0);
  }
  if (!res.ok) {
    let msg = `خطای سرور (${res.status})`;
+    let errCode: string | undefined;
+    let errField: string | undefined;
+
    try {
      const body = await res.json();
-      if (body?.error?.message) {
-        msg = body.error.message;
+      if (body?.error) {
+        errCode = body.error.code;
+        errField = body.error.field;
+        const rawMsg = body.error.message || "";
+        const fName = errField ? faField(errField) : "";
+        if (fName && rawMsg) {
+          msg = `داده‌ی «${fName}» نامعتبر است: ${rawMsg}`;
+        } else if (rawMsg) {
+          msg = rawMsg;
+        }
      } else if (Array.isArray(body?.detail)) {
        // FastAPI 422 — آرایه‌ی خطاهای اعتبارسنجی با پیام انگلیسی
        const first = body.detail[0];
-        const field = first?.loc?.length ? String(first.loc[first.loc.length - 1]) : "";
+        const loc = first?.loc || [];
+        const filteredLoc = loc.filter((p: unknown) => p !== "body" && p !== "query" && p !== "path");
+        errField = filteredLoc.join(".");
+        const fieldName = filteredLoc.length ? String(filteredLoc[filteredLoc.length - 1]) : "";
        const fa = first?.msg ? VALIDATION_FA(String(first.msg)) : "داده‌ی ارسال‌شده نامعتبر است";
-        msg = field ? `داده‌ی «${faField(field)}» نامعتبر است: ${fa}` : fa;
+        const fName = fieldName ? faField(fieldName) : "";
+        msg = fName ? `داده‌ی «${fName}» نامعتبر است: ${fa}` : fa;
      } else if (body?.detail) {
        msg = String(body.detail);
      }
    } catch {
      /* بدنۀ خطا JSON نیست */
    }
-    throw new Error(faHttpError(res.status, msg));
+    const finalMsg = faHttpError(res.status, msg);
+    throw new ApiError(finalMsg, res.status, errCode, errField);
  }
  return (await res.json()) as T;
 }
@@ -668,23 +705,66 @@ function adaptAttachment(raw: RawAttachment): Attachment {

 function toDateOnly(v: string | null | undefined): string | null {
  if (!v) return null;
-  const str = String(v).trim();
-  if (/^\d{4}-\d{2}-\d{2}$/.test(str)) return str;
-  // datetime کامل → تاریخ به وقت محلی (نه UTC که یک روز عقب می‌افتد)
+  const str = toAsciiDigits(v).trim();
+  if (!str) return null;
+
+  // ۱. فرمت جلالی با اسلش، خط تیره یا نقطه (سال‌های ۱۳۰۰ تا ۱۵۰۰)
+  const jm = str.match(/^(1[34]\d{2})[/\-.](\d{1,2})[/\-.](\d{1,2})/);
+  if (jm) {
+    const jy = parseInt(jm[1], 10);
+    const jmon = parseInt(jm[2], 10);
+    const jd = parseInt(jm[3], 10);
+    const [gy, gm, gd] = jalaliToGregorian(jy, jmon, jd);
+    return `${gy}-${String(gm).padStart(2, "0")}-${String(gd).padStart(2, "0")}`;
+  }
+
+  // ۲. فرمت میلادی استاندارد YYYY-MM-DD
+  const gm = str.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+  if (gm && parseInt(gm[1], 10) >= 1900) return str;
+
+  // ۳. رشته‌ی datetime کامل یا مقادیر دیگر
  const d = new Date(str);
  if (Number.isNaN(d.getTime())) return null;
+  if (d.getFullYear() < 1900 && d.getFullYear() >= 1300) {
+    const [gy, gm, gd] = jalaliToGregorian(d.getFullYear(), d.getMonth() + 1, d.getDate());
+    return `${gy}-${String(gm).padStart(2, "0")}-${String(gd).padStart(2, "0")}`;
+  }
  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
 }
+
 function toDateTime(v: string | null | undefined): string | null {
-  const d = toDateOnly(v);
-  if (!d) return null;
-  return /^\d{4}-\d{2}-\d{2}$/.test(v as string) ? d + "T00:00:00Z" : (v as string);
+  if (!v) return null;
+  const str = toAsciiDigits(v).trim();
+  if (!str) return null;
+
+  // ۱. تاریخ جلالی با زمان اختیاری
+  const jm = str.match(/^(1[34]\d{2})[/\-.](\d{1,2})[/\-.](\d{1,2})(?:[ T](\d{1,2}):(\d{1,2})(?::(\d{1,2}))?)?/);
+  if (jm) {
+    const jy = parseInt(jm[1], 10);
+    const jmon = parseInt(jm[2], 10);
+    const jd = parseInt(jm[3], 10);
+    const h = jm[4] != null ? parseInt(jm[4], 10) : 0;
+    const m = jm[5] != null ? parseInt(jm[5], 10) : 0;
+    const s = jm[6] != null ? parseInt(jm[6], 10) : 0;
+    const [gy, gm, gd] = jalaliToGregorian(jy, jmon, jd);
+    return new Date(gy, gm - 1, gd, h, m, s).toISOString();
+  }
+
+  // ۲. اگر میلادی استاندارد ISO است
+  const d = new Date(str);
+  if (!Number.isNaN(d.getTime()) && d.getFullYear() >= 1900) {
+    return /^\d{4}-\d{2}-\d{2}$/.test(str) ? str + "T00:00:00Z" : str;
+  }
+
+  const dateOnly = toDateOnly(str);
+  return dateOnly ? dateOnly + "T00:00:00Z" : null;
 }
 function todayIso(): string {
  return new Date().toISOString().slice(0, 10);
 }
-function looksLikeUuid(v: string): boolean {
-  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v);
+export function looksLikeUuid(v: string | null | undefined): boolean {
+  if (!v) return false;
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(String(v).trim());
 }

 // ============================================================
@@ -777,6 +857,13 @@ export const api = {
      // مقدار پیش‌فرض/واحد جادویی؛ واحد خالی یعنی خطای صریح «واحد مشخص نشده»)
      // پروژه‌های هر قلم هم به id واقعی ترجمه می‌شوند (در صورت نبودن ساخته می‌شوند)
      for (let i = 0; i < lineItems.length; i++) {
+        let matId = realMaterialId(lineItems[i].material_id);
+        if (!looksLikeUuid(matId)) {
+          const rawMats = await getData<RawMaterial[]>(`/materials?page_size=100`);
+          const found = rawMats.find((rm) => rm.id === matId) || rawMats[0];
+          if (found) matId = found.id;
+        }
+        lineItems[i].material_id = matId;
        lineItems[i].unit_id = await unitIdByNameOrCreate(lookup, q.line_items[i].unit);
        for (const p of q.line_items[i].projects || []) {
          const pid = looksLikeUuid(p.id) ? p.id : await projectIdByNameOrCreate(p.name);
@@ -870,7 +957,6 @@ export const api = {
            if (pid) targetProjByLine.set(li.id, pid);
          }
        }
-        const allProjectIds = [...new Set([...targetProjByLine.values()])];

        const payload = {
          accepted_termsheets: acceptedTs.map((t) => ({
@@ -899,11 +985,7 @@ export const api = {
          item_projects: [], // کاندیداهای قبلی در line_item_projects کاملاً حفظ می‌شوند
        };
        await patchData(`/quotes/${id}/accept`, payload);
-        // پروژه‌های سطح پیشنهاد با اتحاد پروژه‌های اقلام همگام می‌شوند
-        if (allProjectIds.length) {
-          await patchData(`/quotes/${id}`, { project_ids: allProjectIds });
-        }
-        return { ...current, ...patch } as Quote;
+        return { ...current, ...patch, projects: current.projects } as Quote;
      }

      // --- ویرایش ساده: اقلام/termsheetها (جایگزینی کامل) + فیلدهای metadata ---
@@ -1259,6 +1341,10 @@ async function fetchProjects(): Promise<RawProject[]> {
 async function projectIdByNameOrCreate(name: string | null | undefined): Promise<string | null> {
  if (!name) return null;
  const projects = await fetchProjects();
+  if (looksLikeUuid(name)) {
+    const byId = projects.find((x) => x.id.toLowerCase() === name.toLowerCase());
+    if (byId) return byId.id;
+  }
  const pid = projectIdByName(projects, name);
  if (pid) return pid;
  const raw = await postData<RawProject>("/projects", { name });
@@ -1390,8 +1476,12 @@ async function specDefinitionId(spec: string): Promise<string | null> {

 // utility برای ساخت id موقت جدید (ویزارد — قبل از ذخیره در بک‌اند)
 export function nextId(prefix: string, items: { id: string }[]): string {
+  const regex = new RegExp(`^${prefix}(\\d+)$`);
  const max = items
-    .map((x) => parseInt(String(x.id).replace(/\D/g, ""), 10))
+    .map((x) => {
+      const m = String(x.id).match(regex);
+      return m ? parseInt(m[1], 10) : 0;
+    })
    .filter((n) => !Number.isNaN(n))
    .reduce((a, b) => Math.max(a, b), 0);
  return prefix + (max + 1);
@@ -99,8 +99,11 @@ export const MONTHS = [

 export const WEEKDAYS = ["ش", "ی", "د", "س", "چ", "پ", "ج"];

-function toEnSafe(s: string): string {
-  return String(s).replace(/[۰-۹]/g, (d) => String("۰۱۲۳۴۵۶۷۸۹".indexOf(d)));
+export function toAsciiDigits(s: string | number | null | undefined): string {
+  if (s == null) return "";
+  return String(s)
+    .replace(/[۰-۹]/g, (d) => String("۰۱۲۳۴۵۶۷۸۹".indexOf(d)))
+    .replace(/[٠-٩]/g, (d) => String("٠١٢٣٤٥٦٧٨٩".indexOf(d)));
 }

 // format an ISO (gregorian) string to "۱۴۰۳/۰۵/۱۲"
@@ -121,18 +124,31 @@ export function isoToJalaliLong(iso: string | null | undefined): string {
  return `${toFa(jd)} ${MONTHS[jm - 1]} ${toFa(jy)}`;
 }

-// parse a jalali "yyyy/m/d" string to a JS Date (gregorian) at local midnight
+// parse a jalali "yyyy/m/d" or "yyyy/m/d h:m" string to a JS Date (gregorian) ISO string
 export function jalaliStrToIso(str: string | null | undefined): string | null {
  if (!str) return null;
-  const nums = String(str)
+  const s = toAsciiDigits(str).trim();
+  const m = s.match(/^(1[34]\d{2})[/\-.](\d{1,2})[/\-.](\d{1,2})(?:[ T](\d{1,2}):(\d{1,2})(?::(\d{1,2}))?)?/);
+  if (!m) {
+    const nums = s
      .split(/[/\-.]/)
-    .map((x) => parseInt(toEnSafe(x), 10));
+      .map((x) => parseInt(x, 10));
    if (nums.length < 3 || nums.some((n) => Number.isNaN(n))) return null;
    const [jy, jm, jd] = nums;
    const [gy, gm, gd] = jalaliToGregorian(jy, jm, jd);
    const dt = new Date(gy, gm - 1, gd);
    return Number.isNaN(dt.getTime()) ? null : dt.toISOString();
  }
+  const jy = parseInt(m[1], 10);
+  const jm = parseInt(m[2], 10);
+  const jd = parseInt(m[3], 10);
+  const h = m[4] != null ? parseInt(m[4], 10) : 0;
+  const min = m[5] != null ? parseInt(m[5], 10) : 0;
+  const sec = m[6] != null ? parseInt(m[6], 10) : 0;
+  const [gy, gm, gd] = jalaliToGregorian(jy, jm, jd);
+  const dt = new Date(gy, gm - 1, gd, h, min, sec);
+  return Number.isNaN(dt.getTime()) ? null : dt.toISOString();
+}

 export function daysInMonth(jy: number, jm: number): number {
  if (jm <= 6) return 31;
@@ -147,17 +147,10 @@ export function lineItemTotal(li: LineItem): number | null {
 // - در وضعیت accepted یا arrived: فقط تک پروژه‌ی انتخاب‌شده در خرید (item_decisions.project_id)
 export function itemProjects(q: Quote, li: LineItem): string[] {
  if (q.status === "accepted" || q.status === "arrived") {
-    if (li.target_project?.name) {
-      return [li.target_project.name];
+    return li.target_project?.name ? [li.target_project.name] : [];
  }
-    // اگر target_project هنوز آبجکت نام نداشت، بررسی نام در صورت تک‌پروژه بودن
-    if (li.projects && li.projects.length === 1) {
-      const p = li.projects[0];
-      return [typeof p === "string" ? p : p.name];
-    }
-    return [];
-  }
-  return (li.projects || []).map((p) => (typeof p === "string" ? p : p.name));
+  // For 'offered', 'rejected', 'expired': return all candidate projects
+  return (li.projects || []).map((p) => (typeof p === "string" ? p : p.name)).filter(Boolean);
 }

 // ---------- واحد مرجع و ضریب تبدیل ----------
@@ -219,20 +219,14 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
      if (t.status === "accepted" && !usedIds.has(t.id)) t.status = "offered";
    });

-    // پروژه‌ی هر قلم (تکی هدف خرید) + همگام‌سازی پروژه‌های سطح پیشنهاد
-    const projUnion = new Set<string>();
+    // پروژه‌ی هر قلم (تکی هدف خرید) — فقط target_project تنظیم می‌شود؛
+    // li.projects و next.projects دست‌نخورده باقی می‌مانند تا پروژه‌های کاندیدای اولیه حفظ شوند
    next.line_items.forEach((li) => {
      if (li.rejected) return;
      const name = itemProjectsSel[li.id];
      if (name === undefined) return;
      li.target_project = name ? { id: "", name } : null;
-      // توجه: li.projects دست‌نخورده باقی می‌ماند تا پروژه‌های کاندیدای اولیه حفظ شوند
-      if (name) projUnion.add(name);
    });
-    if (projUnion.size > 0) {
-      next.projects = [...projUnion];
-      next.project = next.projects[0] || "";
-    }

    const now = new Date().toISOString();
    next.accepted_date = acceptDate || now;
@@ -37,6 +37,7 @@ import {
 interface EditItemRow {
  key: string;
  origLi?: LineItem;
+  projects?: { id: string; name: string }[];
  cat: string;
  brand: string;
  specs: string[];
@@ -148,7 +149,17 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
    if (!q) return;
    const sup = supplierById(suppliers, q.supplier_id);
    setSupplierName(sup.name);
-    setSelectedProjects(q.projects && q.projects.length ? [...q.projects] : q.project ? [q.project] : []);
+    // حفظ تمام پروژه‌های کاندیدا: اتحاد پروژه‌های سطح پیشنهاد و پروژه‌های کاندیدای هر قلم
+    const candidateSet = new Set<string>();
+    (q.projects || []).forEach((p) => p && candidateSet.add(p));
+    if (q.project) candidateSet.add(q.project);
+    q.line_items.forEach((li) => {
+      (li.projects || []).forEach((p) => {
+        const n = typeof p === "string" ? p : p.name;
+        if (n) candidateSet.add(n);
+      });
+    });
+    setSelectedProjects([...candidateSet]);
    setNotes(q.notes || "");
    setItemRows(
      q.line_items.map((li) => {
@@ -156,6 +167,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
        return {
          key: li.id,
          origLi: li,
+          projects: li.projects && li.projects.length ? [...li.projects] : [],
          cat: m.category || "",
          brand: m.brand || "",
          specs: materialSpecs(m),
@@ -349,8 +361,15 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
        acceptedTsId = null;
      }

+      const candProjs =
+        row.projects && row.projects.length
+          ? row.projects
+          : row.origLi?.projects && row.origLi.projects.length
+            ? row.origLi.projects
+            : selectedProjects.map((pname) => ({ id: "", name: pname }));
+
      newItems.push({
-        id: "li-" + (newItems.length + 1),
+        id: row.origLi ? row.origLi.id : row.key.startsWith("new-") ? row.key : "li-" + (newItems.length + 1),
        material_id: materialId,
        quantity: qty,
        unit,
@@ -360,7 +379,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
        accepted_ts_id: acceptedTsId,
        rejected,
        arrived_date: row.origLi?.arrived_date ?? null,
-        projects: row.origLi?.projects ?? [],
+        projects: candProjs,
        target_project: status === "offered" ? null : (row.origLi?.target_project ?? null),
        target_project_id: status === "offered" ? null : (row.origLi?.target_project_id ?? null),
      });
@@ -243,7 +243,32 @@ export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit
          ))}
        </InfoCell>

-        {/* ۳. مجموع مبلغ */}
+        <InfoCell label="پروژه">
+          <span className="inline-flex items-center gap-1 text-xs sm:text-[13px]">
+            <Building2 className="h-3.5 w-3.5 shrink-0 text-muted" />
+            <span className="truncate">
+              {(() => {
+                const activeItems = (q.line_items || []).filter((li) => !li.rejected);
+                if (q.status === "accepted" || q.status === "arrived") {
+                  // فقط پروژه‌ی هدف پذیرفته‌شده — همان منطق itemProjects در وضعیت accepted
+                  const targetProj = activeItems.find((li) => li.target_project)?.target_project;
+                  return targetProj?.name ?? projectCell(q);
+                }
+                // وضعیت offered: همه‌ی پروژه‌های کاندیدا از line_items (همان منطق itemProjects)
+                const names = new Set<string>();
+                activeItems.forEach((li) =>
+                  (li.projects || []).forEach((p) => {
+                    const name = typeof p === "string" ? p : p.name;
+                    if (name) names.add(name);
+                  })
+                );
+                if (names.size > 0) return [...names].join("، ");
+                return projectCell(q);
+              })()}
+            </span>
+          </span>
+        </InfoCell>
+
        <InfoCell label="مجموع مبلغ" className="col-span-1">
          {pc ? (
            <div>
@@ -103,7 +103,7 @@ export function Step1TopicSupplier({
              ))
            )}
          </div>
-          <div className={cn("field max-w-md", invalid && "invalid")}>
+          <div data-field="supplier_id" className={cn("field max-w-md", invalid && "invalid")}>
            <label>یا نام تأمین‌کننده را تایپ و انتخاب کنید</label>
            <Combobox
              value={supplierName}
@@ -221,7 +221,7 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
        <span>قیمت کل</span>
      </div>

-      <div className="flex flex-col gap-2">
+      <div data-field="line_items" className="flex flex-col gap-2">
        {items.map((it) => (
          <div key={it.tempId} className="item-row wizard-item-row items-center">
            <Combobox
@@ -47,7 +47,7 @@ export function Step3Termsheets({ cards, onCardsChange, items, coverage, onCover
      </h3>
      <div className="mb-3 text-[12px] text-muted" dangerouslySetInnerHTML={{ __html: 'هر <b>termsheet</b> یک روش پرداخت است (نقد، چک، اقساط...). داخل هر termsheet مشخص کنید کدام قلم‌ها را پوشش می‌دهد — یک termsheet می‌تواند چند قلم را بگیرد، و یک قلم هم می‌تواند زیر چند termsheet مختلف (مثلاً هم نقد هم چک) پیشنهاد شود.' }} />

-      <div className="flex flex-col gap-3">
+      <div data-field="termsheets" className="flex flex-col gap-3">
        {cards.map((card, idx) => (
          <TermsheetCard
            key={card.key}
@@ -155,7 +155,7 @@ export function Step4Projects({ items, projects, assignment, onAssign, onUnassig
  };

  return (
-    <div>
+    <div data-field="project">
      <h3 className="mb-1 text-[15px] font-bold">
        <span className="me-1 inline-flex h-6 w-6 items-center justify-center rounded-full bg-accent text-[12px] font-bold text-white">۴</span>
        پروژه‌ها
@@ -57,20 +57,20 @@ export function Step5Review({

      <div className="grid max-w-2xl grid-cols-12 gap-3">
        {/* تاریخ پیشنهاد: فضای بزرگتر (۷ ستون از ۱۲) به همراه ساعت */}
-        <div className="field col-span-7 [&>div]:w-full [&_input]:w-full">
+        <div className="field col-span-7 [&>div]:w-full [&_input]:w-full" data-field="quote_date">
          <label>تاریخ پیشنهاد</label>
          <JalaliDatePicker value={quoteDate} onChange={onQuoteDate} placeholder="۱۴۰۳/۰۵/۱۲" withTime />
          <div className="hint">پیش‌فرض امروز</div>
        </div>

        {/* تاریخ انقضای پیشنهاد: فضای کوچکتر (۵ ستون از ۱۲) */}
-        <div className="field col-span-5 [&>div]:w-full [&_input]:w-full">
+        <div className="field col-span-5 [&>div]:w-full [&_input]:w-full" data-field="expiry_date">
          <label>تاریخ انقضای پیشنهاد</label>
          <JalaliDatePicker value={expiryDate} onChange={onExpiryDate} placeholder="۱۴۰۳/۰۶/۱۲" />
          <div className="hint">تا چه زمانی این قیمت معتبر است؟</div>
        </div>

-        <div className="field col-span-12">
+        <div className="field col-span-12" data-field="notes">
          <label>یادداشت (اختیاری)</label>
          <textarea
            rows={2}
@@ -81,7 +81,7 @@ export function Step5Review({
          />
        </div>

-        <div className="field col-span-12">
+        <div className="field col-span-12" data-field="proforma">
          <label>پیش‌فاکتور (اختیاری)</label>
          {proforma ? (
            /* وضعیت فایل انتخاب‌شده با دکمه حذف تمیز */
@@ -3,7 +3,7 @@ import { Link, useNavigate, useSearchParams } from "react-router-dom";
 import { ChevronRight, ChevronLeft, Check } from "lucide-react";
 import { toast } from "sonner";
 import type { LineItem, Quote } from "../../lib/types";
-import { api, nextId } from "../../lib/api";
+import { api, ApiError, looksLikeUuid, nextId } from "../../lib/api";
 import {
  useAddMaterial,
  useAddProject,
@@ -125,16 +125,8 @@ export function WizardPage() {
    goToStep(currentStep + 1);
  };

-  const rememberMaterial = (rec: MaterialRec) => {
-    void addMaterial.mutateAsync({
-      id: nextId("m", materials),
-      name: (rec.category || rec.brand || rec.specs.join(" ") || "").trim() || "کالای جدید",
-      topic: rec.topic,
-      category: rec.category,
-      brand: rec.brand,
-      specs: rec.specs,
-      base_unit: "",
-    });
+  const rememberMaterial = (_rec: MaterialRec) => {
+    // رکوردهای متریال به همراه واحد و مشخصه‌ها در زمان ذخیره نهایی ساخته می‌شوند
  };

  // ---------- پروژه‌ها: از مجموعه + نام‌های قدیمی quoteها ----------
@@ -193,19 +185,72 @@ export function WizardPage() {

  // ---------- ذخیره ----------
  const doSave = async () => {
-    const sectionError = (step: number, title: string, err: unknown) => {
+    const resolveErrorTarget = (err: unknown): { step: number; field?: string } => {
+      let field = "";
+      let msg = "";
+      if (err instanceof ApiError) {
+        field = err.field || "";
+        msg = err.message || "";
+      } else if (err instanceof Error) {
+        msg = err.message || "";
+        if ("field" in err && typeof (err as any).field === "string") {
+          field = (err as any).field;
+        }
+      }
+
+      const combined = `${field} ${msg}`.toLowerCase();
+
+      // ۱. تأمین‌کننده
+      if (/supplier|تأمین|تامین/i.test(combined)) return { step: 1, field: "supplier_id" };
+
+      // ۲. اقلام / متریال / واحد / تعداد / قیمت
+      if (/line_item|material|canonical_unit|unit_id|quantity|متریال|واحد|قلم|تعداد/i.test(combined)) {
+        return { step: 2, field: field || "line_items" };
+      }
+
+      // ۳. شرایط پرداخت / termsheet / مراحل پرداخت / سررسید
+      if (/termsheet|item_termsheet|schedule_step|due_date|milestone|ترم|پرداخت|پوشش|سررسید/i.test(combined)) {
+        return { step: 3, field: field || "termsheets" };
+      }
+
+      // ۴. پروژه
+      if (/project|پروژه/i.test(combined)) return { step: 4, field: "project" };
+
+      // ۵. تاریخ‌ها، یادداشت، پیش‌فاکتور
+      if (/expiry_date|تاریخ انقضا/i.test(combined)) return { step: 5, field: "expiry_date" };
+      if (/quote_date|تاریخ پیشنهاد/i.test(combined)) return { step: 5, field: "quote_date" };
+      if (/proforma|پیش‌فاکتور/i.test(combined)) return { step: 5, field: "proforma" };
+      if (/notes|یادداشت/i.test(combined)) return { step: 5, field: "notes" };
+
+      return { step: 5, field };
+    };
+
+    const sectionError = (stepOrTarget: number | { step: number; field?: string }, title: string, err: unknown) => {
+      const target = typeof stepOrTarget === "number" ? { step: stepOrTarget } : stepOrTarget;
      const msg = err instanceof Error ? err.message : "خطای ناشناخته";
      toast.error(`${title}: ${msg}`, {
-        action: { label: "رفع خطا", onClick: () => goToStep(step) },
+        duration: 8000,
+        action: {
+          label: "رفع خطا",
+          onClick: () => {
+            goToStep(target.step);
+            setTimeout(() => {
+              const targetAttr = target.field ? `[data-field="${target.field}"]` : "";
+              const el = (targetAttr ? document.querySelector(targetAttr) : null) ||
+                document.querySelector(`[data-step="${target.step}"]`);
+              if (el instanceof HTMLElement) {
+                el.scrollIntoView({ behavior: "smooth", block: "center" });
+                const input = el.querySelector("input, textarea, select") as HTMLElement | null;
+                if (input) input.focus();
+                else el.focus?.();
+                el.classList.add("ring-2", "ring-red-500", "rounded-xl");
+                setTimeout(() => el.classList.remove("ring-2", "ring-red-500", "rounded-xl"), 3500);
+              }
+            }, 150);
+          },
+        },
      });
    };
-    const guessStep = (msg: string): number => {
-      if (/تأمین|تامین|supplier/i.test(msg)) return 1;
-      if (/متریال|واحد|قلم|خط آیتم|item|دسته/i.test(msg)) return 2;
-      if (/ترم|termsheet|پرداخت|پوشش/i.test(msg)) return 3;
-      if (/پروژه|project/i.test(msg)) return 4;
-      return 5;
-    };

    const name = supplierName.trim();
    let supplierId = "";
@@ -244,10 +289,11 @@ export function WizardPage() {
      if (!cat && !brand && qty == null && price == null) continue;

      const wantName = (cat || brand || specs.join(" ") || "").trim() || "کالای جدید";
-      let material = materials.find((m) => normalize(m.name) === normalize(wantName));
+      let material = materials.find((m) => looksLikeUuid(m.id) && normalize(m.name) === normalize(wantName));
      if (!material) {
        material = materials.find(
          (m) =>
+            looksLikeUuid(m.id) &&
            normalize(m.category) === normalize(cat) &&
            normalize(m.brand) === normalize(brand) &&
            specsKey(m.specs) === specsKey(specs),
@@ -257,11 +303,11 @@ export function WizardPage() {
      // تطبیق دوم بر اساس category/brand/specs انجام می‌شود تا آن‌ها هم پیدا شوند.
      if (!material && cat) {
        material = materials.find(
-          (m) => normalize(m.category) === normalize(cat) && normalize(m.brand) === normalize(brand),
+          (m) => looksLikeUuid(m.id) && normalize(m.category) === normalize(cat) && normalize(m.brand) === normalize(brand),
        );
      }
      let materialId: string;
-      if (material) {
+      if (material && looksLikeUuid(material.id)) {
        materialId = material.id;
      } else {
        try {
@@ -272,7 +318,7 @@ export function WizardPage() {
            category: cat,
            brand,
            specs,
-            base_unit: unit,
+            base_unit: unit || "عدد",
          });
          materialId = created.id;
        } catch (err) {
@@ -361,8 +407,8 @@ export function WizardPage() {
      toast.success("پیشنهاد ذخیره شد.");
      navigate("/");
    } catch (e) {
-      const msg = e instanceof Error ? e.message : "خطا در ذخیره پیشنهاد";
-      sectionError(guessStep(msg), "خطا در ثبت پیشنهاد", e);
+      const target = resolveErrorTarget(e);
+      sectionError(target, "خطا در ثبت پیشنهاد", e);
    }
  };

@@ -392,7 +438,7 @@ export function WizardPage() {
        <Stepper current={currentStep} highestVisited={highestVisited} completedSteps={completedSteps} onGoto={goToStep} />

        {currentStep === 1 && (
-          <div className="rounded-xl border border-line bg-panel p-5 shadow-sm">
+          <div data-step="1" className="rounded-xl border border-line bg-panel p-5 shadow-sm">
            <Step1TopicSupplier
              selectedTopic={selectedTopic}
              onTopicSelect={(t) => {
@@ -416,12 +462,12 @@ export function WizardPage() {
          </div>
        )}
        {currentStep === 2 && (
-          <div className="rounded-xl border border-line bg-panel p-5 shadow-sm">
+          <div data-step="2" className="rounded-xl border border-line bg-panel p-5 shadow-sm">
            <Step2LineItems items={items} onItemsChange={setItems} selectedTopic={selectedTopic} onRemember={rememberMaterial} />
          </div>
        )}
        {currentStep === 3 && (
-          <div className="rounded-xl border border-line bg-panel p-5 shadow-sm">
+          <div data-step="3" className="rounded-xl border border-line bg-panel p-5 shadow-sm">
            <Step3Termsheets
              cards={cards}
              onCardsChange={setCards}
@@ -432,7 +478,7 @@ export function WizardPage() {
          </div>
        )}
        {currentStep === 4 && (
-          <div className="rounded-xl border border-line bg-panel p-5 shadow-sm">
+          <div data-step="4" className="rounded-xl border border-line bg-panel p-5 shadow-sm">
            <Step4Projects
              items={items}
              projects={projectNames}
@@ -446,7 +492,7 @@ export function WizardPage() {
          </div>
        )}
        {currentStep === 5 && (
-          <div className="rounded-xl border border-line bg-panel p-5 shadow-sm">
+          <div data-step="5" className="rounded-xl border border-line bg-panel p-5 shadow-sm">
            <Step5Review
              quoteDate={quoteDate}
              onQuoteDate={setQuoteDate}