fix: resolve typescript configs and finish merge

README.md

@@ -1,3 +1,4 @@
+
 # Procurement Stack v1.3 — Dockerized (PostgreSQL + FastAPI + React + MinIO)
 
 Self-contained ship package: everything needed to run the stack is in this
@@ -12,19 +13,22 @@ folder — no external files or sibling folders required.
 | **frontend** | `procurement-frontend` | React 19 + Vite, served by nginx (internal) | via Traefik |
 | **traefik** | `procurement-traefik` | Traefik v3 — public reverse proxy (edge) | `80` (web), `443` (websecure) |
 
+
 ```
+
 Browser ──► Traefik :80 (edge)
-                │
-                ├── Host(localhost) ──► frontend (nginx SPA :80)
-                │                            │
-                │                            └── /api/* proxy ──► api :8000 (/api/v1)
-                │
-                ├── Host(api.localhost) ──► api :8000
-                ├── Host(auth.localhost) ──► casdoor :8000 (OIDC login)
-                └── Host(s3/storage.localhost) ──► minio (API / console)
-                                  │
-                                  ├── postgres :5432 (procurement + casdoor DBs)
-                                  └── minio :9000 (invoice/proforma files)
+│
+├── Host(localhost) ──► frontend (nginx SPA :80)
+│                            │
+│                            └── /api/* proxy ──► api :8000 (/api/v1)
+│
+├── Host(api.localhost) ──► api :8000
+├── Host(auth.localhost) ──► casdoor :8000 (OIDC login)
+└── Host(s3/storage.localhost) ──► minio (API / console)
+│
+├── postgres :5432 (procurement + casdoor DBs)
+└── minio :9000 (invoice/proforma files)
+
 ```
 
 ---
@@ -74,6 +78,7 @@ v1.3/
             ├── Projects/     (projects)
             ├── Units/        (unit conversions)
             └── Inventory/    (warehouse management panel — React port)
+
 ```
 
 ---
@@ -86,12 +91,12 @@ the form (username / password) is sent to
 (password grant), verifies the returned JWT, and starts the session —
 no browser redirect to Casdoor.
 
-- **مدیر پروژه (PM)** → lands in the inventory panel (their project) — can record
-  stock changes, manage the project's warehouses and confirm arrivals («کالاهای در راه»).
-- **مدیر تدارکات / ادمین** → lands in the procurement office — can manage
-  quotes, suppliers, projects, and in the inventory panel: dashboard, daily control,
-  «کالاهای در راه» (receiving included) and «سازمان‌دهی» (users, PMs, warehouses).
-  The «انبارها» and «تغییر موجودی» sections are PM-only.
+* **مدیر پروژه (PM)** → lands in the inventory panel (their project) — can record
+stock changes, manage the project's warehouses and confirm arrivals («کالاهای در راه»).
+* **مدیر تدارکات / ادمین** → lands in the procurement office — can manage
+quotes, suppliers, projects, and in the inventory panel: dashboard, daily control,
+«کالاهای در راه» (receiving included) and «سازمان‌دهی» (users, PMs, warehouses).
+The «انبارها» and «تغییر موجودی» sections are PM-only.
 
 **Developer Mode** (top-left button on the login page) is a 3-step flow for
 the admin (super user): ① superuser auth gate (admin credentials only) →
@@ -103,7 +108,7 @@ controlled by the `VITE_ENABLE_DEV_LOGIN` env var (in Docker: the
 for production builds).
 
 | What | Where | Credentials |
-|---|---|---|
+| --- | --- | --- |
 | App | http://localhost (via Traefik) | — |
 | Casdoor console | http://localhost:8080 | admin credentials are set when you run the seeder (`CASDOOR_ADMIN_PW`) — never commit them |
 | Seeded app users (org `inventory`) | `razaei` (admin), `mousavi` (مدیر تدارکات), `mohaghegh` (مدیر پروژه), `tester` (مدیر پروژه، پروژه «تست») | password from `CASDOOR_SEED_PASSWORD` (bcrypt-hashed at rest — see `backend/tools/seed_casdoor.py`) |
@@ -111,11 +116,11 @@ for production builds).
 Run `backend/tools/seed_casdoor.py` once after the first boot to create the
 Casdoor organization, application and users (idempotent). Full details —
 addresses, credentials, role model, failure scenarios and the checklist —
-are in [`docs/casdoor-auth.md`](docs/casdoor-auth.md).
+are in [`docs/casdoor-auth.md`](https://www.google.com/search?q=docs/casdoor-auth.md).
 
 > The **currently committed seed** (`backups/علی محقق/`) instead ships a
 > single admin — `ali.mohaghegh` («علی محقق») — see
-> [Restoring the committed seed data](#restoring-the-committed-seed-data).
+> [Restoring the committed seed data](https://www.google.com/search?q=%23restoring-the-committed-seed-data).
 
 ---
 
@@ -125,13 +130,13 @@ The production deployment of this stack runs on the server and is reachable
 at these public addresses (HTTPS):
 
 | What | Address |
-|---|---|
+| --- | --- |
 | **App (ERP)** | https://aramesh.bennu-api-bahrestan.ir/ |
 | **Casdoor admin panel** | https://casdoor.bennu-api-bahrestan.ir/ |
 
 Log in to the app with your Casdoor account (org `inventory`); the role is
 assigned inside the app (`users.role` — see «Login» above and
-[`docs/casdoor-auth.md`](docs/casdoor-auth.md)).
+[`docs/casdoor-auth.md`](https://www.google.com/search?q=docs/casdoor-auth.md)).
 
 ### MinIO console on the server (SSH tunnel)
 
@@ -140,21 +145,20 @@ The MinIO console is deliberately **loopback-only** on the server
 is an SSH tunnel from your machine:
 
 1. Open PowerShell and start the tunnel (**keep the window open** while you
-   use the panel):
+use the panel):
+```powershell
+ssh -L 9001:127.0.0.1:9001 <user>@<server-host>
 
-   ```powershell
-   ssh -L 9001:127.0.0.1:9001 <user>@<server-host>
-   ```
+```
 
-   You will also land in a normal SSH session — that is fine; the tunnel
-   lives as long as the window stays open.
 
+You will also land in a normal SSH session — that is fine; the tunnel
+lives as long as the window stays open.
 2. In your browser, open: **http://localhost:9001**
-
 3. Log in with the production MinIO root credentials from the server's
-   `/srv/erp/.env` (`MINIO_ROOT_USER` / `MINIO_ROOT_PASSWORD`) — they are
-   **never** written in this repo or its history. See
-   [`docs/SECRET-MANAGEMENT.md`](docs/SECRET-MANAGEMENT.md).
+`/srv/erp/.env` (`MINIO_ROOT_USER` / `MINIO_ROOT_PASSWORD`) — they are
+**never** written in this repo or its history. See
+[`docs/SECRET-MANAGEMENT.md`](https://www.google.com/search?q=docs/SECRET-MANAGEMENT.md).
 
 You will see the **`procurement-files`** bucket — the invoices/proformas the
 ERP stores, browsable and downloadable from there.
@@ -168,22 +172,22 @@ tunnel.
 
 Notes from the server setup:
 
-- The panel is published only on the server's loopback, so the internet
-  cannot reach it at all — the tunnel is what carries it to your browser.
-- Host port `9000` stays reserved for the deploy-webhook receiver, which is
-  why the console uses `9001`.
-- If you ever need the raw S3 API from your machine, or a clickable URL for
-  the console (e.g. `storage.aramesh.bennu-api-bahrestan.ir` behind Traefik
-  with a password prompt on top), that can be arranged on request — the
-  tunnel remains the safer default.
+* The panel is published only on the server's loopback, so the internet
+cannot reach it at all — the tunnel is what carries it to your browser.
+* Host port `9000` stays reserved for the deploy-webhook receiver, which is
+why the console uses `9001`.
+* If you ever need the raw S3 API from your machine, or a clickable URL for
+the console (e.g. `storage.aramesh.bennu-api-bahrestan.ir` behind Traefik
+with a password prompt on top), that can be arranged on request — the
+tunnel remains the safer default.
 
 ---
 
 ## Prerequisites (target machine)
 
-- **Docker Desktop** (Windows) or Docker Engine + Compose plugin (Linux/macOS)
-- ~3–4 GB free disk for images (`postgres:18`, `python:3.13-slim`, `node:22-alpine`, `nginx:alpine`, `minio/minio`, `minio/mc`)
-- Internet access on first build (image + `npm ci` downloads)
+* **Docker Desktop** (Windows) or Docker Engine + Compose plugin (Linux/macOS)
+* ~3–4 GB free disk for images (`postgres:18`, `python:3.13-slim`, `node:22-alpine`, `nginx:alpine`, `minio/minio`, `minio/mc`)
+* Internet access on first build (image + `npm ci` downloads)
 
 ---
 
@@ -192,6 +196,7 @@ Notes from the server setup:
 ```powershell
 cd <this-folder>
 docker compose up -d --build
+
 ```
 
 First run downloads base images and builds the frontend (takes a few minutes).
@@ -201,6 +206,7 @@ Wait until all services are up:
 
 ```powershell
 docker compose ps
+
 ```
 
 All should show `Up` (postgres also `(healthy)`).
@@ -210,7 +216,7 @@ All should show `Up` (postgres also `(healthy)`).
 ## Verify
 
 | What | Where |
-|---|---|
+| --- | --- |
 | Frontend UI | http://localhost |
 | API docs (Swagger) | http://localhost:8000/docs |
 | API health | http://localhost:8000/health → `{"status":"ok","service":"procurement-api"}` |
@@ -225,23 +231,24 @@ Automated end-to-end checks (authenticates via `SMOKE_USER` /
 ```powershell
 backend\tools\smoke_test.py   # read paths
 backend\tools\smoke_test_write.py / smoke_test_misc.py
+
 ```
 
 > Every API route now requires a Casdoor JWT — a bare
 > `curl http://localhost/api/v1/quotes` returns **401** by design.
-> Day-2 operations (deploys, backups, monitoring): [`docs/OPERATIONS.md`](docs/OPERATIONS.md).
+> Day-2 operations (deploys, backups, monitoring): [`docs/OPERATIONS.md`](https://www.google.com/search?q=docs/OPERATIONS.md).
 
 ---
 
 ## MinIO (object storage for invoice / proforma files)
 
 | Item | Value |
-|---|---|
+| --- | --- |
 | S3 API endpoint | `localhost:9000` (from the API container: `minio:9000`) |
 | Web console | http://localhost:9001 |
 | Root user / password | `minioadmin` / `minioadmin` (dev — change for production) |
 | Bucket | `procurement-files` (created automatically by the `minio-init` container) |
-| Object key layout | `{quote_id}/{kind}/{attachment_id}` where kind = `invoice` \| `proforma` |
+| Object key layout | `{quote_id}/{kind}/{attachment_id}` where kind = `invoice` | `proforma` |
 
 File **bytes** live in MinIO; the `quote_attachments` table holds the metadata.
 
@@ -249,6 +256,7 @@ Ad-hoc bucket inspection from the host (see `mc.cmd`):
 
 ```powershell
 .\mc.cmd ls --recursive
+
 ```
 
 ---
@@ -261,10 +269,12 @@ Port:     5433
 Database: procurement
 Username: postgres
 Password: postgres
+
 ```
 
 ```powershell
 docker exec -it procurement-postgres psql -U postgres -d procurement
+
 ```
 
 ---
@@ -276,26 +286,28 @@ database dumps must never be committed (they contain user rows and signing
 material). Two supported ways to bring a fresh stack up:
 
 1. **Empty boot** — schema v2.6 auto-applies on the first boot of an empty
-   `postgres_data` volume; then run the seeders:
+`postgres_data` volume; then run the seeders:
+```powershell
+# Casdoor org + app + users (prints/generates credentials — do not commit them)
+docker compose run --rm -e CASDOOR_BASE=http://casdoor:8000 api python tools/seed_casdoor.py
+# Demo dataset (optional):
+docker exec procurement-api sh -c "cd /srv/backend && python -m tools.seed"
+
+```
 
-   ```powershell
-   # Casdoor org + app + users (prints/generates credentials — do not commit them)
-   docker compose run --rm -e CASDOOR_BASE=http://casdoor:8000 api python tools/seed_casdoor.py
-   # Demo dataset (optional):
-   docker exec procurement-api sh -c "cd /srv/backend && python -m tools.seed"
-   ```
 
 2. **Restore your own dump** — create dumps on the server (kept server-side,
-   e.g. `/srv/erp/backups/`), never in git:
+e.g. `/srv/erp/backups/`), never in git:
+```powershell
+docker exec procurement-postgres pg_dump -U postgres -d procurement -Fc > /srv/erp/backups/procurement-$(date +%F).dump
+docker exec procurement-postgres pg_dump -U postgres -d casdoor    -Fc > /srv/erp/backups/casdoor-$(date +%F).dump
 
-   ```powershell
-   docker exec procurement-postgres pg_dump -U postgres -d procurement -Fc > /srv/erp/backups/procurement-$(date +%F).dump
-   docker exec procurement-postgres pg_dump -U postgres -d casdoor    -Fc > /srv/erp/backups/casdoor-$(date +%F).dump
-   ```
+```
 
-   Restore with `pg_restore --clean --if-exists` (stop `api` + `casdoor`
-   first — this **replaces all data**). The scheduled backup sidecar
-   (see `docs/OPERATIONS.md`) automates this.
+
+Restore with `pg_restore --clean --if-exists` (stop `api` + `casdoor`
+first — this **replaces all data**). The scheduled backup sidecar
+(see `docs/OPERATIONS.md`) automates this.
 
 ## Common operations
 
@@ -304,40 +316,44 @@ docker compose logs -f api          # see logs
 docker compose down                 # stop (keep data)
 docker compose up -d --build        # rebuild after code changes
 docker compose down -v              # ⚠️ full reset — wipes DB + MinIO volumes
+
 ```
 
 ---
 
 ## Known behavior
 
-- Authentication is Casdoor-based (JWT verified via JWKS) and **required on
-  every API route** except `/health`, `/health/ready` and `/auth/login`
-  (401 without a token, 403 without a role). The former dev-header fallback
-  (`X-User-Role` / `X-User-Name-B64`) is disabled unless
-  `PROCUREMENT_DEV_LOGIN_ENABLED=true` — never enable it in production.
-- Roles live in the app's `users` table (Casdoor is identity-only): `pm`,
-  `procurement_manager`, `admin`. Role changes are **admin-only** (RBAC);
-  the procurement manager can only assign projects to project managers.
-  The admin has a dedicated panel at `/admin` (user sync from Casdoor +
-  grant/revoke «مدیر تدارکات»).
-- **Partial goods receipt** («رسید جزیی») is supported in «کالاهای در راه»:
-  at least one item with a valid quantity is enough to submit; other items
-  stay in transit. The procurement ledger shows «رسیده X از Y» / «در راه Z»
-  badges and a «رسید جزیی» badge on the quote.
-- **One PostgreSQL instance** serves both the app (`procurement`) and Casdoor
-  (`casdoor`) — the separate casdoor-postgres container is gone (data was
-  dumped/restored; see `docs/casdoor-auth.md`).
-- **Traefik v3** is the public edge (ports 80/443); the frontend nginx only
-  serves the SPA and proxies `/api` internally. Production (real domains,
-  HTTPS via Let's Encrypt, HTTP→HTTPS redirect):
-  `docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build`
-  (see the prod file header for the required env vars).
-- Schema runs automatically ONLY on the first boot of an empty `postgres_data` volume
-  (see `docker-entrypoint-initdb.d`); the API also runs `CREATE TABLE IF NOT EXISTS`
-  for the units-dashboard tables and `quote_attachments` at startup.
-- Invoice upload requires an `accepted`/`arrived` quote; proforma has no restriction.
-- The supplier detail page (`/suppliers/:id`) shows the purchase history with
-  invoice/proforma download links from MinIO.
-- If builds fail with disk-full errors: `docker system prune -a`, then rebuild.
-- If the frontend shows «اتصال به سرور برقرار نشد» → the api container is not
-  reachable; check `docker compose ps` and `docker compose logs api`.
+* Authentication is Casdoor-based (JWT verified via JWKS) and **required on
+every API route** except `/health`, `/health/ready` and `/auth/login`
+(401 without a token, 403 without a role). The former dev-header fallback
+(`X-User-Role` / `X-User-Name-B64`) is disabled unless
+`PROCUREMENT_DEV_LOGIN_ENABLED=true` — never enable it in production.
+* Roles live in the app's `users` table (Casdoor is identity-only): `pm`,
+`procurement_manager`, `admin`. Role changes are **admin-only** (RBAC);
+the procurement manager can only assign projects to project managers.
+The admin has a dedicated panel at `/admin` (user sync from Casdoor +
+grant/revoke «مدیر تدارکات»).
+* **Partial goods receipt** («رسید جزیی») is supported in «کالاهای در راه»:
+at least one item with a valid quantity is enough to submit; other items
+stay in transit. The procurement ledger shows «رسیده X از Y» / «در راه Z»
+badges and a «رسید جزیی» badge on the quote.
+* **One PostgreSQL instance** serves both the app (`procurement`) and Casdoor
+(`casdoor`) — the separate casdoor-postgres container is gone (data was
+dumped/restored; see `docs/casdoor-auth.md`).
+* **Traefik v3** is the public edge (ports 80/443); the frontend nginx only
+serves the SPA and proxies `/api` internally. Production (real domains,
+HTTPS via Let's Encrypt, HTTP→HTTPS redirect):
+`docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build`
+(see the prod file header for the required env vars).
+* Schema runs automatically ONLY on the first boot of an empty `postgres_data` volume
+(see `docker-entrypoint-initdb.d`); the API also runs `CREATE TABLE IF NOT EXISTS`
+for the units-dashboard tables and `quote_attachments` at startup.
+* Invoice upload requires an `accepted`/`arrived` quote; proforma has no restriction.
+* The supplier detail page (`/suppliers/:id`) shows the purchase history with
+invoice/proforma download links from MinIO.
+* **Material-Supplier Lookup**: Clicking a material in the catalog (e.g., on the `/units` page) dynamically fetches its assigned suppliers (`GET /api/materials/{id}/suppliers`). The backend uses an atomic JOIN to guarantee accurate supplier data (avoiding SQLAlchemy identity-map mismatches), and the UI displays a clean empty state («تامین‌کننده‌ای برای این متریال ثبت نشده است») if none exist.
+* If builds fail with disk-full errors: `docker system prune -a`, then rebuild.
+* If the frontend shows «اتصال به سرور برقرار نشد» → the api container is not
+reachable; check `docker compose ps` and `docker compose logs api`.
+
+```

backend/app/db/init_db.py

@@ -247,7 +247,6 @@ _V26_DDL = [
         physical_qty          NUMERIC(18,6),
         transfer_pair_id      UUID,
         performed_by          TEXT,
-        delivered_to          TEXT,
         transaction_date      TIMESTAMPTZ                  NOT NULL DEFAULT now(),
         note                  TEXT,
         created_at            TIMESTAMPTZ                  NOT NULL DEFAULT now()
@@ -259,9 +258,6 @@ _V26_DDL = [
     """
     CREATE INDEX IF NOT EXISTS idx_inventory_tx_warehouse_date ON inventory_transactions (warehouse_id, transaction_date)
     """,
-    """
-    ALTER TABLE inventory_transactions ADD COLUMN IF NOT EXISTS delivered_to TEXT
-    """,
     # suppliers.categories JSONB (v2.4 runtime) is replaced by suppliers.category_id — drop it.
     """
     ALTER TABLE suppliers DROP COLUMN IF EXISTS categories
@@ -436,48 +432,3 @@ async def ensure_audit_table(engine: AsyncEngine) -> None:
         for stmt in indexes:
             await conn.execute(text(stmt))
     logger.info("audit_log table ensured")
-
-
-async def ensure_project_transfers_table(engine: AsyncEngine) -> None:
-    """Create (if missing) the project_transfers table for inter-site transfers. Safe on any volume."""
-    ddl = """
-    CREATE TABLE IF NOT EXISTS project_transfers (
-        id                  UUID            NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
-        from_project_id     UUID            NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
-        from_warehouse_id   UUID            NOT NULL REFERENCES warehouses(id) ON DELETE RESTRICT,
-        to_project_id       UUID            NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
-        material_id         UUID            NOT NULL REFERENCES materials(id) ON DELETE RESTRICT,
-        brand_id            UUID            REFERENCES brands(id) ON DELETE SET NULL,
-        unit_id             INTEGER         NOT NULL REFERENCES units(id) ON DELETE RESTRICT,
-        quantity            NUMERIC(18,6)   NOT NULL CHECK (quantity > 0),
-        specs               JSONB           NOT NULL DEFAULT '{}'::jsonb,
-        specs_hash          TEXT            NOT NULL DEFAULT 'default',
-        note                TEXT,
-        status              TEXT            NOT NULL DEFAULT 'in_transit' CHECK (status IN ('in_transit', 'received', 'cancelled')),
-        out_transaction_id  UUID            REFERENCES inventory_transactions(id) ON DELETE SET NULL,
-        transfer_date       TIMESTAMPTZ     NOT NULL DEFAULT now(),
-        transferred_by      TEXT,
-        received_at         TIMESTAMPTZ,
-        received_by         TEXT,
-        to_warehouse_id     UUID            REFERENCES warehouses(id) ON DELETE SET NULL,
-        receipt_allocations JSONB,
-        created_at          TIMESTAMPTZ     NOT NULL DEFAULT now(),
-        updated_at          TIMESTAMPTZ     NOT NULL DEFAULT now()
-    )
-    """
-    indexes = (
-        "CREATE INDEX IF NOT EXISTS idx_project_transfers_from ON project_transfers(from_project_id, status)",
-        "CREATE INDEX IF NOT EXISTS idx_project_transfers_to ON project_transfers(to_project_id, status)",
-        "DROP TRIGGER IF EXISTS trg_project_transfers_updated_at ON project_transfers",
-        """
-        CREATE TRIGGER trg_project_transfers_updated_at
-            BEFORE UPDATE ON project_transfers
-            FOR EACH ROW EXECUTE FUNCTION set_updated_at()
-        """,
-    )
-    async with engine.begin() as conn:
-        await conn.execute(text(ddl))
-        for stmt in indexes:
-            await conn.execute(text(stmt))
-    logger.info("project_transfers table ensured")
-

backend/app/main.py

@@ -31,7 +31,6 @@ from app.db.init_db import (
     ensure_dashboard_tables,
     ensure_material_topic_column,
     ensure_quote_projects,
-    ensure_project_transfers_table,
     ensure_v26,
 )
 from app.observability import RequestContextMiddleware, setup_logging
@@ -108,7 +107,6 @@ async def lifespan(_app: FastAPI):
     await ensure_v26(engine)
     await ensure_audit_table(engine)
     await ensure_drop_category_tables(engine)
-    await ensure_project_transfers_table(engine)
     task = asyncio.create_task(_auto_expire_loop()) if settings.AUTO_EXPIRE_ENABLED else None
     try:
         yield

backend/app/models/__init__.py

@@ -32,8 +32,6 @@ from app.models.procurement import (
     TermsheetScheduleStep,
 )
 
-from app.models.project_transfer import ProjectTransfer
-
 __all__ = [
     "Base",
     "Unit",
@@ -62,5 +60,4 @@ __all__ = [
     "ItemDecision",
     "ItemReceipt",
     "QuoteAttachment",
-    "ProjectTransfer",
 ]

backend/app/models/inventory.py

@@ -156,7 +156,6 @@ class InventoryTransaction(Base):
     # NULL for a standalone entry; links TRANSFER_OUT to its TRANSFER_IN row.
     transfer_pair_id: Mapped[uuid.UUID | None] = mapped_column(Uuid(as_uuid=True))
     performed_by: Mapped[str | None] = mapped_column(Text)  # user display name (dev placeholder)
-    delivered_to: Mapped[str | None] = mapped_column(Text)
     transaction_date: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), nullable=False, server_default=func.now()
     )

backend/app/models/project_transfer.py

@@ -1,87 +0,0 @@
-import uuid
-from datetime import datetime
-from decimal import Decimal
-
-from sqlalchemy import (
-    DateTime,
-    ForeignKey,
-    Numeric,
-    Text,
-    func,
-    text,
-)
-from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from app.db.base import Base
-from app.models.catalog import _timestamptz, _uuid_pk
-
-
-class ProjectTransfer(Base):
-    """project_transfers — Inter-project (inter-site) material transfer ledger.
-
-    Records the movement of materials from a source project warehouse to a
-    destination project. Stock is deducted from the source warehouse immediately
-    upon creation (status = 'in_transit') via out_transaction_id.
-    When the destination project PM confirms receipt in 'Arrivals', stock is
-    added to the destination warehouse (status = 'received').
-    While 'in_transit', the transfer can be edited or cancelled (restoring source stock).
-    Once 'received', the transfer is permanently locked from edit or cancellation.
-    """
-
-    __tablename__ = "project_transfers"
-    __mapper_args__ = {"eager_defaults": True}
-
-    id: Mapped[uuid.UUID] = _uuid_pk()
-    from_project_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("projects.id", ondelete="RESTRICT"), nullable=False
-    )
-    from_warehouse_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("warehouses.id", ondelete="RESTRICT"), nullable=False
-    )
-    to_project_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("projects.id", ondelete="RESTRICT"), nullable=False
-    )
-    material_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("materials.id", ondelete="RESTRICT"), nullable=False
-    )
-    brand_id: Mapped[uuid.UUID | None] = mapped_column(
-        ForeignKey("brands.id", ondelete="SET NULL")
-    )
-    unit_id: Mapped[int] = mapped_column(
-        ForeignKey("units.id", ondelete="RESTRICT"), nullable=False
-    )
-    quantity: Mapped[Decimal] = mapped_column(Numeric(18, 6), nullable=False)
-    specs: Mapped[dict] = mapped_column(JSONB, nullable=False, server_default=text("'{}'::jsonb"))
-    specs_hash: Mapped[str] = mapped_column(Text, nullable=False, server_default=text("'default'"))
-    note: Mapped[str | None] = mapped_column(Text)
-    status: Mapped[str] = mapped_column(Text, nullable=False, server_default=text("'in_transit'"))
-
-    out_transaction_id: Mapped[uuid.UUID | None] = mapped_column(
-        ForeignKey("inventory_transactions.id", ondelete="SET NULL")
-    )
-    transfer_date: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), nullable=False, server_default=func.now()
-    )
-    transferred_by: Mapped[str | None] = mapped_column(Text)
-    received_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
-    received_by: Mapped[str | None] = mapped_column(Text)
-    to_warehouse_id: Mapped[uuid.UUID | None] = mapped_column(
-        ForeignKey("warehouses.id", ondelete="SET NULL")
-    )
-    receipt_allocations: Mapped[list | None] = mapped_column(JSONB)
-    created_at: Mapped[datetime] = _timestamptz()
-    updated_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
-    )
-
-    from_project: Mapped["Project"] = relationship("Project", foreign_keys=[from_project_id], lazy="raise")
-    to_project: Mapped["Project"] = relationship("Project", foreign_keys=[to_project_id], lazy="raise")
-    from_warehouse: Mapped["Warehouse"] = relationship("Warehouse", foreign_keys=[from_warehouse_id], lazy="raise")
-    to_warehouse: Mapped["Warehouse | None"] = relationship("Warehouse", foreign_keys=[to_warehouse_id], lazy="raise")
-    material: Mapped["Material"] = relationship("Material", foreign_keys=[material_id], lazy="raise")
-    brand: Mapped["Brand | None"] = relationship("Brand", foreign_keys=[brand_id], lazy="raise")
-    unit: Mapped["Unit"] = relationship("Unit", foreign_keys=[unit_id], lazy="raise")
-    out_transaction: Mapped["InventoryTransaction | None"] = relationship(
-        "InventoryTransaction", foreign_keys=[out_transaction_id], lazy="raise"
-    )

backend/app/routers/__init__.py

@@ -14,7 +14,6 @@ from app.routers import (
     material_categories,
     materials,
     pm,
-    project_transfers,
     projects,
     quote_events,
     quotes,
@@ -51,6 +50,5 @@ ROUTERS = [
     standard_conversions.router,
     inventory.router,
     pm.router,
-    project_transfers.router,
     users.router,
 ]

backend/app/routers/inventory.py

@@ -197,7 +197,6 @@ def transaction_to_dict(tx: InventoryTransaction, wh: Warehouse | None = None) -
         "physical_qty": float(tx.physical_qty) if tx.physical_qty is not None else None,
         "transfer_pair_id": str(tx.transfer_pair_id) if tx.transfer_pair_id else None,
         "performed_by": tx.performed_by,
-        "delivered_to": tx.delivered_to,
         "transaction_date": to_iso(tx.transaction_date),
         "note": tx.note,
     }

backend/app/routers/project_transfers.py

@@ -1,206 +0,0 @@
-import uuid
-from typing import Literal
-
-from fastapi import APIRouter, Depends, Query, Request
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.db.engine import get_db
-from app.routers.pm import ArrivalScope, arrivals_scope
-from app.schemas.project_transfers import (
-    ProjectTransferCreate,
-    ProjectTransferOut,
-    ProjectTransferReceive,
-    ProjectTransferUpdate,
-)
-from app.services import project_transfer_service
-from app.utils.errors import ForbiddenError
-
-router = APIRouter(tags=["project-transfers"])
-
-
-def _to_transfer_out(t) -> dict:
-    return {
-        "id": t.id,
-        "from_project": (
-            {"id": t.from_project.id, "name": t.from_project.name}
-            if t.from_project
-            else {"id": t.from_project_id, "name": ""}
-        ),
-        "from_warehouse": (
-            {"id": t.from_warehouse.id, "name": t.from_warehouse.name}
-            if t.from_warehouse
-            else {"id": t.from_warehouse_id, "name": ""}
-        ),
-        "to_project": (
-            {"id": t.to_project.id, "name": t.to_project.name}
-            if t.to_project
-            else {"id": t.to_project_id, "name": ""}
-        ),
-        "to_warehouse": (
-            {"id": t.to_warehouse.id, "name": t.to_warehouse.name}
-            if t.to_warehouse
-            else None
-        ),
-        "material": (
-            {"id": t.material.id, "name": t.material.name}
-            if t.material
-            else {"id": t.material_id, "name": ""}
-        ),
-        "brand": (
-            {"id": t.brand.id, "name": t.brand.name}
-            if t.brand
-            else None
-        ),
-        "unit": (
-            {"id": t.unit.id, "code": t.unit.code, "name_fa": t.unit.name_fa}
-            if t.unit
-            else {"id": t.unit_id, "code": "", "name_fa": None}
-        ),
-        "quantity": t.quantity,
-        "specs": t.specs or {},
-        "specs_hash": t.specs_hash,
-        "note": t.note,
-        "status": t.status,
-        "transfer_date": t.transfer_date,
-        "transferred_by": t.transferred_by,
-        "received_at": t.received_at,
-        "received_by": t.received_by,
-        "receipt_allocations": t.receipt_allocations,
-        "created_at": t.created_at,
-        "updated_at": t.updated_at,
-    }
-
-
-# ---------------------------------------------------------------------------
-# POST /inventory/project-transfers — Create inter-project transfer
-# ---------------------------------------------------------------------------
-@router.post("/inventory/project-transfers", status_code=201)
-async def create_transfer(
-    payload: ProjectTransferCreate,
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    transfer = await project_transfer_service.create_project_transfer(
-        db=db,
-        payload=payload,
-        caller_project_id=ctx.project_id,
-        caller_role=ctx.role,
-        transferred_by=ctx.display_name,
-    )
-    return {"data": _to_transfer_out(transfer)}
-
-
-# ---------------------------------------------------------------------------
-# GET /inventory/project-transfers — List transfers with direction and filters
-# ---------------------------------------------------------------------------
-@router.get("/inventory/project-transfers")
-async def list_transfers(
-    project_id: uuid.UUID | None = Query(default=None),
-    direction: Literal["outgoing", "incoming", "all"] = Query(default="all"),
-    status: str | None = Query(default=None),
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    target_pid = project_id or ctx.project_id
-    transfers = await project_transfer_service.list_project_transfers(
-        db=db,
-        project_id=target_pid,
-        direction=direction,
-        status=status,
-    )
-    return {"data": [_to_transfer_out(t) for t in transfers]}
-
-
-# ---------------------------------------------------------------------------
-# GET /inventory/project-transfers/{id} — Single transfer details
-# ---------------------------------------------------------------------------
-@router.get("/inventory/project-transfers/{transfer_id}")
-async def get_transfer(
-    transfer_id: uuid.UUID,
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    transfer = await project_transfer_service.get_project_transfer_or_404(db, transfer_id)
-    if ctx.role == "pm" and ctx.project_id is not None:
-        if transfer.from_project_id != ctx.project_id and transfer.to_project_id != ctx.project_id:
-            raise ForbiddenError("شما به این رکورد انتقال دسترسی ندارید")
-    return {"data": _to_transfer_out(transfer)}
-
-
-# ---------------------------------------------------------------------------
-# PATCH /inventory/project-transfers/{id} — Edit in-transit transfer (source PM only)
-# ---------------------------------------------------------------------------
-@router.patch("/inventory/project-transfers/{transfer_id}")
-async def update_transfer(
-    transfer_id: uuid.UUID,
-    payload: ProjectTransferUpdate,
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    transfer = await project_transfer_service.update_project_transfer(
-        db=db,
-        transfer_id=transfer_id,
-        payload=payload,
-        caller_project_id=ctx.project_id,
-        caller_role=ctx.role,
-    )
-    return {"data": _to_transfer_out(transfer)}
-
-
-# ---------------------------------------------------------------------------
-# DELETE /inventory/project-transfers/{id} — Cancel in-transit transfer (source PM only)
-# ---------------------------------------------------------------------------
-@router.delete("/inventory/project-transfers/{transfer_id}")
-async def delete_transfer(
-    transfer_id: uuid.UUID,
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    res = await project_transfer_service.delete_project_transfer(
-        db=db,
-        transfer_id=transfer_id,
-        caller_project_id=ctx.project_id,
-        caller_role=ctx.role,
-    )
-    return {"data": res}
-
-
-# ---------------------------------------------------------------------------
-# GET /pm/transfers/on-the-way — Incoming in-transit transfers for active project
-# ---------------------------------------------------------------------------
-@router.get("/pm/transfers/on-the-way")
-async def pm_incoming_transfers(
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    if ctx.role == "pm" and ctx.project_id is None:
-        raise ForbiddenError("شما به هیچ پروژه‌ای متصل نیستید")
-
-    transfers = await project_transfer_service.list_project_transfers(
-        db=db,
-        project_id=ctx.project_id,
-        direction="incoming",
-        status="in_transit",
-    )
-    return {"data": [_to_transfer_out(t) for t in transfers]}
-
-
-# ---------------------------------------------------------------------------
-# POST /inventory/project-transfers/{id}/receive — Destination PM confirms arrival
-# ---------------------------------------------------------------------------
-@router.post("/inventory/project-transfers/{transfer_id}/receive")
-async def receive_transfer(
-    transfer_id: uuid.UUID,
-    payload: ProjectTransferReceive,
-    ctx: ArrivalScope = Depends(arrivals_scope),
-    db: AsyncSession = Depends(get_db),
-):
-    transfer = await project_transfer_service.receive_project_transfer(
-        db=db,
-        transfer_id=transfer_id,
-        payload=payload,
-        caller_project_id=ctx.project_id,
-        caller_role=ctx.role,
-        received_by=ctx.display_name,
-    )
-    return {"data": _to_transfer_out(transfer)}

backend/app/routers/supplier_materials.py

@@ -2,10 +2,12 @@
 
 GET/POST /suppliers/{id}/materials — manage a supplier's catalog.
 DELETE /suppliers/{id}/materials/{material_id} — unlink.
-GET /materials/{id}/suppliers — price-comparison data source.
+GET /materials/{id}/suppliers — suppliers linked to a material.
 """
+from uuid import UUID
+
 from fastapi import APIRouter, Depends, Query
-from sqlalchemy import select
+from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db.engine import get_db
@@ -20,29 +22,51 @@ from app.utils.serialization import to_iso
 router = APIRouter(tags=["supplier-materials"])
 
 
-def link_to_dict(link: SupplierMaterial, material: Material | None = None,
-                 category: MaterialCategory | None = None,
-                 supplier: Supplier | None = None) -> dict:
+def link_to_dict(
+    link: SupplierMaterial,
+    material: Material | None = None,
+    category: MaterialCategory | None = None,
+    supplier: Supplier | None = None,
+) -> dict:
+<<<<<<< Updated upstream
+    """Serialize a SupplierMaterial ORM row to a plain dict for the API envelope."""
+=======
+    """Serialize a SupplierMaterial ORM row to a plain dict."""
+>>>>>>> Stashed changes
     return {
         "id": str(link.id),
         "supplier_id": str(link.supplier_id),
         "material_id": str(link.material_id),
         "is_active": link.is_active,
-        "last_quoted_price": float(link.last_quoted_price) if link.last_quoted_price is not None else None,
+        "last_quoted_price": (
+            float(link.last_quoted_price) if link.last_quoted_price is not None else None
+        ),
         "last_quoted_at": to_iso(link.last_quoted_at) if link.last_quoted_at else None,
         "created_at": to_iso(link.created_at),
-        "material": {
-            "id": str(material.id),
-            "name": material.name,
-            "category": {"id": str(category.id), "name": category.name} if category else None,
-        } if material else None,
-        "supplier": {"id": str(supplier.id), "name": supplier.name} if supplier else None,
+        "material": (
+            {
+                "id": str(material.id),
+                "name": material.name,
+                "category": (
+                    {"id": str(category.id), "name": category.name} if category else None
+                ),
+            }
+            if material
+            else None
+        ),
+        "supplier": (
+            {"id": str(supplier.id), "name": supplier.name} if supplier else None
+        ),
     }
 
 
+# ---------------------------------------------------------------------------
+# GET /suppliers/{supplier_id}/materials
+# ---------------------------------------------------------------------------
+
 @router.get("/suppliers/{supplier_id}/materials")
 async def list_supplier_materials(
-    supplier_id,
+    supplier_id: UUID,
     page: int = Query(1, ge=1),
     page_size: int = Query(20, ge=1, le=100),
     db: AsyncSession = Depends(get_db),
@@ -56,44 +80,210 @@ async def list_supplier_materials(
         .order_by(SupplierMaterial.created_at)
     )
     items, meta = await paginate(stmt, page, page_size, db)
-    mat_ids = {l.material_id for l in items}
-    materials = {m.id: m for m in (await db.execute(select(Material).where(Material.id.in_(mat_ids)))).scalars()}
-    return {"data": [link_to_dict(l, materials.get(l.material_id), None) for l in items], "meta": meta}
+    mat_ids = [lnk.material_id for lnk in items]
+    materials: dict = {}
+    if mat_ids:
+        result = await db.execute(select(Material).where(Material.id.in_(mat_ids)))
+        materials = {m.id: m for m in result.scalars()}
+    return {
+        "data": [link_to_dict(lnk, materials.get(lnk.material_id)) for lnk in items],
+        "meta": meta,
+    }
 
 
+# ---------------------------------------------------------------------------
+# POST /suppliers/{supplier_id}/materials
+# ---------------------------------------------------------------------------
+
 @router.post("/suppliers/{supplier_id}/materials", status_code=201)
 async def create_supplier_material(
-    supplier_id, payload: SupplierMaterialCreate, db: AsyncSession = Depends(get_db)
+    supplier_id: UUID,
+    payload: SupplierMaterialCreate,
+    db: AsyncSession = Depends(get_db),
 ):
     async with db.begin():
         link = await link_supplier_material(db, supplier_id, payload.material_id)
         material = await db.get(Material, payload.material_id)
-    return {"data": link_to_dict(link, material, None)}
+    return {"data": link_to_dict(link, material)}
 
 
+# ---------------------------------------------------------------------------
+# DELETE /suppliers/{supplier_id}/materials/{material_id}
+# ---------------------------------------------------------------------------
+
 @router.delete("/suppliers/{supplier_id}/materials/{material_id}")
-async def delete_supplier_material(supplier_id, material_id, db: AsyncSession = Depends(get_db)):
+async def delete_supplier_material(
+    supplier_id: UUID,
+    material_id: UUID,
+<<<<<<< Updated upstream
+    db: AsyncSession = Depends(get_db),
+):
     async with db.begin():
         await unlink_supplier_material(db, supplier_id, material_id)
-    return {"data": {"supplier_id": str(supplier_id), "material_id": str(material_id), "deleted": True}}
+    return {
+        "data": {
+            "supplier_id": str(supplier_id),
+            "material_id": str(material_id),
+            "deleted": True,
+        }
+    }
 
 
-@router.get("/materials/{material_id}/suppliers")
+# ---------------------------------------------------------------------------
+# GET /materials/{material_id}/suppliers
+# ---------------------------------------------------------------------------
+
+@router.get(
+    "/materials/{material_id}/suppliers",
+    summary="List all suppliers linked to a material",
+)
 async def list_material_suppliers(
-    material_id,
+    material_id: UUID,
+    db: AsyncSession = Depends(get_db),
+):
+    """Return the suppliers linked to a material, straight from PostgreSQL.
+
+    The path parameter is typed as UUID so FastAPI validates and coerces it
+    before the handler runs; a malformed id is rejected with 422, an unknown
+    material with 404.
+
+    Atomic JOIN — a supplier is returned only through its supplier_materials
+    link, so the response can never contain a supplier that is not actually
+    linked to this material:
+
+        select(Supplier)
+        .join(SupplierMaterial, Supplier.id == SupplierMaterial.supplier_id)
+        .where(SupplierMaterial.material_id == material_id)
+
+    Response envelope (frontend MaterialSupplier binds these fields directly):
+        {
+          "data": [
+            {
+              "id":             "<supplier_uuid>",
+              "name":           "فولاد ناب آریا",
+              "phone":          "021-..." | null,
+              "contact_person": "علی محمدی" | null,
+              "location":       "تهران" | null
+            }
+          ]
+=======
+    db: AsyncSession = Depends(get_db),
+):
+    async with db.begin():
+        await unlink_supplier_material(db, supplier_id, material_id)
+    return {
+        "data": {
+            "supplier_id": str(supplier_id),
+            "material_id": str(material_id),
+            "deleted": True,
+        }
+    }
+
+
+# ---------------------------------------------------------------------------
+# GET /materials/{material_id}/suppliers
+# ---------------------------------------------------------------------------
+
+@router.get(
+    "/materials/{material_id}/suppliers",
+    summary="List all suppliers linked to a material",
+)
+async def list_material_suppliers(
+    material_id: UUID,
     page: int = Query(1, ge=1),
     page_size: int = Query(20, ge=1, le=100),
     db: AsyncSession = Depends(get_db),
 ):
+    """Return a paginated list of suppliers for a given material.
+
+    Uses explicit column-level SELECT with named labels so SQLAlchemy returns
+    plain Row tuples — no ORM identity-map involvement — eliminating the
+    string-vs-UUID comparison bug and the stale-entity collision that occurred
+    when selecting two mapped entities in the same session.
+
+    Response shape (matched by the frontend RawMaterialSupplier interface):
+        {
+          "data": [
+            {
+              "id": "<supplier_uuid>",
+              "name": "فولاد ناب آریا",
+              "phone": "021-..." | null,
+              "contact_person": "علی محمدی" | null,
+              "location": "تهران" | null
+            }
+          ],
+          "meta": {"total": 1, "page": 1, "page_size": 20}
+>>>>>>> Stashed changes
+        }
+    """
     material = await db.get(Material, material_id)
     if material is None:
         raise NotFoundError("متریال یافت نشد")
+
+<<<<<<< Updated upstream
     stmt = (
-        select(SupplierMaterial)
+        select(Supplier)
+        .join(SupplierMaterial, Supplier.id == SupplierMaterial.supplier_id)
+        .where(SupplierMaterial.material_id == material_id)
+        .order_by(Supplier.name)
+    )
+    suppliers = (await db.execute(stmt)).scalars().all()
+
+    return {
+        "data": [
+            {
+                "id": str(supplier.id),
+                "name": supplier.name,
+                "phone": supplier.phone,
+                "contact_person": supplier.contact_person,
+                "location": supplier.location,
+            }
+            for supplier in suppliers
+        ]
+=======
+    total: int = (
+        await db.scalar(
+            select(func.count(SupplierMaterial.id)).where(
+                SupplierMaterial.material_id == material_id
+            )
+        )
+    ) or 0
+
+    if total == 0:
+        return {"data": [], "meta": {"total": 0, "page": page, "page_size": page_size}}
+
+    # Explicit column-level SELECT — returns plain Row objects keyed by label,
+    # never ORM entities, so no identity-map collision is possible.
+    stmt = (
+        select(
+            Supplier.id.label("sup_id"),
+            Supplier.name.label("sup_name"),
+            Supplier.phone.label("sup_phone"),
+            Supplier.contact_person.label("sup_contact_person"),
+            Supplier.location.label("sup_location"),
+        )
+        .join(SupplierMaterial, Supplier.id == SupplierMaterial.supplier_id)
         .where(SupplierMaterial.material_id == material_id)
         .order_by(SupplierMaterial.last_quoted_at.desc().nulls_last())
+        .offset((page - 1) * page_size)
+        .limit(page_size)
     )
-    items, meta = await paginate(stmt, page, page_size, db)
-    sup_ids = {l.supplier_id for l in items}
-    suppliers = {s.id: s for s in (await db.execute(select(Supplier).where(Supplier.id.in_(sup_ids)))).scalars()}
-    return {"data": [link_to_dict(l, supplier=suppliers.get(l.supplier_id)) for l in items], "meta": meta}
+
+    rows = (await db.execute(stmt)).all()
+
+    data = [
+        {
+            "id": str(row.sup_id),
+            "name": row.sup_name,
+            "phone": row.sup_phone,
+            "contact_person": row.sup_contact_person,
+            "location": row.sup_location,
+        }
+        for row in rows
+    ]
+
+    return {
+        "data": data,
+        "meta": {"total": total, "page": page, "page_size": page_size},
+>>>>>>> Stashed changes
+    }

backend/app/schemas/inventory.py

@@ -64,7 +64,6 @@ class InventoryTransactionCreate(APIModel):
     unit_id: int | None = None
     specs: dict | None = None
     note: str | None = None
-    delivered_to: str | None = None
     transaction_date: datetime | None = None
 
     @model_validator(mode="after")

backend/app/schemas/procurement.py

@@ -135,11 +135,6 @@ class AcceptTermsheetIn(APIModel):
     schedule_steps: list[ScheduleStepIn] = Field(min_length=1)
 
 
-class ProjectAllocationIn(APIModel):
-    project_id: UUID
-    quantity: Decimal = Field(gt=0, description="Allocated quantity for this project")
-
-
 class ItemDecisionIn(APIModel):
     line_item_id: UUID
     status: Literal["chosen", "rejected"]
@@ -147,7 +142,6 @@ class ItemDecisionIn(APIModel):
     adjusted_unit_price: Decimal | None = Field(default=None, gt=0)
     adjusted_notes: str | None = None
     project_id: UUID | None = Field(default=None, description="The ONE purchased project (v2.6 — required when the offer spans several projects)")
-    allocations: list[ProjectAllocationIn] = Field(default_factory=list, description="Multi-project split allocations for this line item")
 
 
 class ItemProjectsIn(APIModel):

backend/app/schemas/project_transfers.py

@@ -1,74 +0,0 @@
-from datetime import datetime
-from decimal import Decimal
-from uuid import UUID
-
-from pydantic import Field
-
-from app.schemas.common import APIModel
-
-
-class WarehouseAllocationIn(APIModel):
-    warehouse_id: UUID
-    quantity: Decimal = Field(gt=0)
-
-
-class ProjectTransferCreate(APIModel):
-    from_warehouse_id: UUID
-    to_project_id: UUID
-    material_id: UUID
-    brand_id: UUID | None = None
-    unit_id: int
-    quantity: Decimal = Field(gt=0)
-    specs: dict = Field(default_factory=dict)
-    note: str | None = None
-    transfer_date: datetime | None = None
-
-
-class ProjectTransferUpdate(APIModel):
-    to_project_id: UUID | None = None
-    quantity: Decimal | None = Field(default=None, gt=0)
-    note: str | None = None
-    transfer_date: datetime | None = None
-
-
-class ProjectTransferReceive(APIModel):
-    allocations: list[WarehouseAllocationIn] = Field(
-        min_length=1,
-        description="Warehouse allocations in destination project (sum must equal transfer quantity)",
-    )
-    received_at: datetime | None = None
-    note: str | None = None
-
-
-class IdNameOut(APIModel):
-    id: UUID
-    name: str
-
-
-class UnitBriefOut(APIModel):
-    id: int
-    code: str
-    name_fa: str | None = None
-
-
-class ProjectTransferOut(APIModel):
-    id: UUID
-    from_project: IdNameOut
-    from_warehouse: IdNameOut
-    to_project: IdNameOut
-    to_warehouse: IdNameOut | None = None
-    material: IdNameOut
-    brand: IdNameOut | None = None
-    unit: UnitBriefOut
-    quantity: Decimal
-    specs: dict
-    specs_hash: str
-    note: str | None = None
-    status: str
-    transfer_date: datetime
-    transferred_by: str | None = None
-    received_at: datetime | None = None
-    received_by: str | None = None
-    receipt_allocations: list[dict] | None = None
-    created_at: datetime
-    updated_at: datetime

backend/app/services/inventory_service.py

@@ -290,7 +290,6 @@ async def apply_transaction(
             transaction_type=t,
             quantity=quantity,
             performed_by=performed_by,
-            delivered_to=payload.delivered_to,
             transaction_date=payload.transaction_date,
             note=payload.note,
         )
@@ -320,7 +319,6 @@ async def apply_transaction(
             transaction_type=t,
             quantity=-quantity,
             performed_by=performed_by,
-            delivered_to=payload.delivered_to,
             transaction_date=payload.transaction_date,
             note=payload.note,
         )

backend/app/services/project_transfer_service.py

@@ -1,471 +0,0 @@
-import uuid
-from datetime import datetime, timezone
-from decimal import Decimal
-
-from sqlalchemy import delete, select
-from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import selectinload
-
-from app.models.catalog import Brand, Material, Unit
-from app.models.inventory import InventoryItem, InventoryTransaction, Warehouse
-from app.models.procurement import Project
-from app.models.project_transfer import ProjectTransfer
-from app.schemas.project_transfers import (
-    ProjectTransferCreate,
-    ProjectTransferReceive,
-    ProjectTransferUpdate,
-)
-from app.services.inventory_service import (
-    _find_inventory,
-    _get_or_create_inventory,
-    canonical_specs_hash,
-)
-from app.utils.errors import ConflictError, ForbiddenError, NotFoundError, ValidationError
-
-
-async def get_project_transfer_or_404(db: AsyncSession, transfer_id: uuid.UUID) -> ProjectTransfer:
-    stmt = (
-        select(ProjectTransfer)
-        .where(ProjectTransfer.id == transfer_id)
-        .options(
-            selectinload(ProjectTransfer.from_project),
-            selectinload(ProjectTransfer.to_project),
-            selectinload(ProjectTransfer.from_warehouse),
-            selectinload(ProjectTransfer.to_warehouse),
-            selectinload(ProjectTransfer.material),
-            selectinload(ProjectTransfer.brand),
-            selectinload(ProjectTransfer.unit),
-        )
-    )
-    transfer = await db.scalar(stmt)
-    if transfer is None:
-        raise NotFoundError("رکورد انتقال بین کارگاهی یافت نشد", field="transfer_id")
-    return transfer
-
-
-async def create_project_transfer(
-    db: AsyncSession,
-    payload: ProjectTransferCreate,
-    caller_project_id: uuid.UUID | None,
-    caller_role: str,
-    transferred_by: str | None = None,
-) -> ProjectTransfer:
-    tx = db.begin_nested() if db.in_transaction() else db.begin()
-    async with tx:
-        # Validate source warehouse
-        from_wh = await db.get(Warehouse, payload.from_warehouse_id)
-        if from_wh is None:
-            raise NotFoundError("انبار مبدأ یافت نشد", field="from_warehouse_id")
-
-        # RBAC: PM can only send from their own project
-        if caller_role == "pm" and caller_project_id is not None:
-            if from_wh.project_id != caller_project_id:
-                raise ForbiddenError("شما فقط مجاز به انتقال از انبار پروژه خود هستید")
-
-        from_proj = await db.get(Project, from_wh.project_id)
-        to_proj = await db.get(Project, payload.to_project_id)
-        if to_proj is None:
-            raise NotFoundError("پروژه مقصد یافت نشد", field="to_project_id")
-
-        if from_wh.project_id == payload.to_project_id:
-            raise ValidationError(
-                "پروژه مقصد نمی‌تواند همان پروژه مبدأ باشد (از انتقال بین‌انباری استفاده کنید)",
-                field="to_project_id",
-            )
-
-        # Validate material, brand, unit
-        mat = await db.get(Material, payload.material_id)
-        if mat is None:
-            raise NotFoundError("ماده اولیه یافت نشد", field="material_id")
-
-        if payload.brand_id is not None:
-            brand = await db.get(Brand, payload.brand_id)
-            if brand is None:
-                raise NotFoundError("برند یافت نشد", field="brand_id")
-
-        unit = await db.get(Unit, payload.unit_id)
-        if unit is None:
-            raise NotFoundError("واحد یافت نشد", field="unit_id")
-
-        # Requirement 2: Canonical specs hash from inventory_service
-        specs = payload.specs or {}
-        specs_hash = canonical_specs_hash(specs)
-
-        # Check stock in source warehouse with SELECT ... FOR UPDATE
-        source_item = await _find_inventory(
-            db,
-            payload.from_warehouse_id,
-            payload.material_id,
-            payload.brand_id,
-            specs_hash,
-            for_update=True,
-        )
-
-        # Smart fallback: If exact hash or brand didn't match, check candidate rows in this warehouse for this material
-        if source_item is None:
-            candidates_res = await db.execute(
-                select(InventoryItem)
-                .where(
-                    InventoryItem.warehouse_id == payload.from_warehouse_id,
-                    InventoryItem.material_id == payload.material_id,
-                )
-                .with_for_update()
-            )
-            candidates = candidates_res.scalars().all()
-
-            if len(candidates) == 1:
-                source_item = candidates[0]
-            elif len(candidates) > 1:
-                best_cand = None
-                best_score = -1
-                p_keys = set(specs.keys())
-                p_vals = set(str(v).strip() for v in specs.values() if str(v).strip())
-
-                for cand in candidates:
-                    score = 0
-                    if cand.brand_id == payload.brand_id:
-                        score += 10
-                    elif cand.brand_id is None and payload.brand_id is None:
-                        score += 10
-                    elif cand.brand_id is None:
-                        score += 4
-
-                    c_specs = cand.specs or {}
-                    c_keys = set(c_specs.keys())
-                    c_vals = set(str(v).strip() for v in c_specs.values() if str(v).strip())
-
-                    for pk in p_keys:
-                        if pk in c_keys or f"spec_{pk}" in c_keys or any(pk in ck for ck in c_keys):
-                            score += 5
-                    for pv in p_vals:
-                        if pv in c_vals or any(pv in str(cv) for cv in c_vals):
-                            score += 5
-
-                    if cand.quantity >= payload.quantity:
-                        score += 2
-
-                    if score > best_score:
-                        best_score = score
-                        best_cand = cand
-
-                source_item = best_cand
-
-        if source_item is None or source_item.quantity < payload.quantity:
-            avail = source_item.quantity if source_item else Decimal("0")
-            raise ValidationError(
-                f"موجودی کافی در انبار مبدأ وجود ندارد (موجودی فعلی: {avail})",
-                field="quantity",
-            )
-
-        # Deduct from source warehouse immediately
-        source_item.quantity -= payload.quantity
-
-        transfer_pair_id = uuid.uuid4()
-        now_dt = payload.transfer_date or datetime.now(timezone.utc)
-        note_text = f"انتقال بین کارگاهی به پروژه {to_proj.name}"
-        if payload.note:
-            note_text += f" — {payload.note}"
-
-        out_tx = InventoryTransaction(
-            inventory_id=source_item.id,
-            warehouse_id=from_wh.id,
-            transaction_type="TRANSFER_OUT",
-            quantity=-payload.quantity,
-            transfer_pair_id=transfer_pair_id,
-            performed_by=transferred_by,
-            transaction_date=now_dt,
-            note=note_text,
-        )
-        db.add(out_tx)
-        await db.flush()
-
-        actual_brand_id = source_item.brand_id
-        actual_specs = source_item.specs if source_item.specs is not None else specs
-        actual_specs_hash = source_item.specs_hash or canonical_specs_hash(actual_specs)
-
-        transfer = ProjectTransfer(
-            from_project_id=from_wh.project_id,
-            from_warehouse_id=from_wh.id,
-            to_project_id=payload.to_project_id,
-            material_id=payload.material_id,
-            brand_id=actual_brand_id,
-            unit_id=source_item.unit_id if source_item.unit_id else payload.unit_id,
-            quantity=payload.quantity,
-            specs=actual_specs,
-            specs_hash=actual_specs_hash,
-            note=payload.note,
-            status="in_transit",
-            out_transaction_id=out_tx.id,
-            transfer_date=now_dt,
-            transferred_by=transferred_by,
-        )
-        db.add(transfer)
-        await db.flush()
-
-    return await get_project_transfer_or_404(db, transfer.id)
-
-
-async def update_project_transfer(
-    db: AsyncSession,
-    transfer_id: uuid.UUID,
-    payload: ProjectTransferUpdate,
-    caller_project_id: uuid.UUID | None,
-    caller_role: str,
-) -> ProjectTransfer:
-    tx = db.begin_nested() if db.in_transaction() else db.begin()
-    async with tx:
-        transfer = await db.scalar(
-            select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
-        )
-        if transfer is None:
-            raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
-
-        # RBAC (Requirement 4)
-        if caller_role == "pm" and caller_project_id is not None:
-            if transfer.from_project_id != caller_project_id:
-                raise ForbiddenError("شما فقط مجاز به ویرایش انتقال‌های پروژه مبدأ خود هستید")
-
-        # Status Lock Guard (Requirement 4)
-        if transfer.status == "received":
-            raise ConflictError(
-                "این انتقال در پروژه مقصد تحویل و ثبت انبار شده است و امکان ویرایش آن وجود ندارد"
-            )
-        if transfer.status != "in_transit":
-            raise ConflictError("فقط انتقال‌های در راه (in_transit) قابل ویرایش هستند")
-
-        if payload.to_project_id is not None and payload.to_project_id != transfer.to_project_id:
-            new_to_proj = await db.get(Project, payload.to_project_id)
-            if new_to_proj is None:
-                raise NotFoundError("پروژه مقصد یافت نشد", field="to_project_id")
-            if payload.to_project_id == transfer.from_project_id:
-                raise ValidationError("پروژه مقصد نمی‌تواند همان پروژه مبدأ باشد", field="to_project_id")
-            transfer.to_project_id = payload.to_project_id
-
-        # Quantity adjustment (reconciles source stock difference)
-        if payload.quantity is not None and payload.quantity != transfer.quantity:
-            delta = payload.quantity - transfer.quantity
-            source_item = await _find_inventory(
-                db,
-                transfer.from_warehouse_id,
-                transfer.material_id,
-                transfer.brand_id,
-                transfer.specs_hash,
-                for_update=True,
-            )
-            if delta > 0:
-                if source_item is None or source_item.quantity < delta:
-                    avail = source_item.quantity if source_item else Decimal("0")
-                    raise ValidationError(
-                        f"موجودی انبار مبدأ برای افزایش انتقال کافی نیست (موجود: {avail})",
-                        field="quantity",
-                    )
-                source_item.quantity -= delta
-            else:
-                if source_item is not None:
-                    source_item.quantity += abs(delta)
-
-            transfer.quantity = payload.quantity
-
-            # Update out_transaction
-            if transfer.out_transaction_id is not None:
-                out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
-                if out_tx is not None:
-                    out_tx.quantity = -payload.quantity
-
-        if payload.note is not None:
-            transfer.note = payload.note
-
-        if payload.transfer_date is not None:
-            transfer.transfer_date = payload.transfer_date
-            if transfer.out_transaction_id is not None:
-                out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
-                if out_tx is not None:
-                    out_tx.transaction_date = payload.transfer_date
-
-    return await get_project_transfer_or_404(db, transfer_id)
-
-
-async def delete_project_transfer(
-    db: AsyncSession,
-    transfer_id: uuid.UUID,
-    caller_project_id: uuid.UUID | None,
-    caller_role: str,
-) -> dict:
-    tx = db.begin_nested() if db.in_transaction() else db.begin()
-    async with tx:
-        transfer = await db.scalar(
-            select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
-        )
-        if transfer is None:
-            raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
-
-        # RBAC (Requirement 4)
-        if caller_role == "pm" and caller_project_id is not None:
-            if transfer.from_project_id != caller_project_id:
-                raise ForbiddenError("شما فقط مجاز به لغو انتقال‌های پروژه مبدأ خود هستید")
-
-        # Status Lock Guard (Requirement 4)
-        if transfer.status == "received":
-            raise ConflictError(
-                "این انتقال در پروژه مقصد تحویل و ثبت انبار شده است و امکان لغو یا حذف آن وجود ندارد"
-            )
-
-        # Reversibility (Requirement 4): Restore stock to source warehouse
-        source_item = await _find_inventory(
-            db,
-            transfer.from_warehouse_id,
-            transfer.material_id,
-            transfer.brand_id,
-            transfer.specs_hash,
-            for_update=True,
-        )
-        if source_item is not None:
-            source_item.quantity += transfer.quantity
-
-        # Delete out_transaction
-        if transfer.out_transaction_id is not None:
-            out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
-            if out_tx is not None:
-                await db.delete(out_tx)
-
-        await db.delete(transfer)
-
-    return {"ok": True, "message": "انتقال با موفقیت لغو شد و موجودی به انبار مبدأ بازگردانده شد"}
-
-
-async def receive_project_transfer(
-    db: AsyncSession,
-    transfer_id: uuid.UUID,
-    payload: ProjectTransferReceive,
-    caller_project_id: uuid.UUID | None,
-    caller_role: str,
-    received_by: str | None = None,
-) -> ProjectTransfer:
-    tx = db.begin_nested() if db.in_transaction() else db.begin()
-    async with tx:
-        transfer = await db.scalar(
-            select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
-        )
-        if transfer is None:
-            raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
-
-        # RBAC (Requirement 4)
-        if caller_role == "pm" and caller_project_id is not None:
-            if transfer.to_project_id != caller_project_id:
-                raise ForbiddenError("شما فقط مجاز به تأیید تحویل در پروژه مقصد خود هستید")
-
-        # Lock Guard
-        if transfer.status == "received":
-            raise ConflictError("این انتقال قبلاً تحویل گرفته و ثبت انبار شده است")
-        if transfer.status != "in_transit":
-            raise ConflictError("این انتقال در وضعیت در راه نیست")
-
-        # Requirement 1: 100% full delivery logic (no partial receipt)
-        alloc_sum = sum(Decimal(str(a.quantity)) for a in payload.allocations)
-        if alloc_sum != transfer.quantity:
-            raise ValidationError(
-                f"تخصیص انبارها باید دقیقاً برابر کل مقدار ارسالی ({transfer.quantity}) باشد. مجموع واردشده: {alloc_sum}",
-                field="allocations",
-            )
-
-        # Validate destination warehouses belong to destination project
-        wh_ids = [a.warehouse_id for a in payload.allocations]
-        wh_rows = (await db.execute(select(Warehouse).where(Warehouse.id.in_(wh_ids)))).scalars().all()
-        wh_map = {w.id: w for w in wh_rows}
-
-        for a in payload.allocations:
-            wh = wh_map.get(a.warehouse_id)
-            if wh is None or wh.project_id != transfer.to_project_id:
-                raise ValidationError(
-                    "انبار انتخاب‌شده معتبر نیست یا متعلق به پروژه مقصد نمی‌باشد",
-                    field="allocations.warehouse_id",
-                )
-
-        from_proj = await db.get(Project, transfer.from_project_id)
-        from_proj_name = from_proj.name if from_proj else "پروژه مبدأ"
-
-        out_tx = (
-            await db.get(InventoryTransaction, transfer.out_transaction_id)
-            if transfer.out_transaction_id
-            else None
-        )
-        pair_id = out_tx.transfer_pair_id if (out_tx and out_tx.transfer_pair_id) else uuid.uuid4()
-        now_dt = payload.received_at or datetime.now(timezone.utc)
-
-        # Add stock to destination warehouse(s) via TRANSFER_IN
-        for a in payload.allocations:
-            dest_item = await _get_or_create_inventory(
-                db,
-                a.warehouse_id,
-                transfer.material_id,
-                transfer.brand_id,
-                transfer.unit_id,
-                transfer.specs,
-                transfer.specs_hash,
-            )
-            dest_item.quantity += a.quantity
-
-            note_text = f"رسید انتقال بین کارگاهی از {from_proj_name}"
-            if payload.note:
-                note_text += f" — {payload.note}"
-
-            in_tx = InventoryTransaction(
-                inventory_id=dest_item.id,
-                warehouse_id=a.warehouse_id,
-                transaction_type="TRANSFER_IN",
-                quantity=a.quantity,
-                transfer_pair_id=pair_id,
-                performed_by=received_by,
-                transaction_date=now_dt,
-                note=note_text,
-            )
-            db.add(in_tx)
-
-        transfer.status = "received"
-        transfer.received_at = now_dt
-        transfer.received_by = received_by
-        transfer.to_warehouse_id = payload.allocations[0].warehouse_id
-        transfer.receipt_allocations = [
-            {"warehouse_id": str(a.warehouse_id), "quantity": str(a.quantity)}
-            for a in payload.allocations
-        ]
-
-    return await get_project_transfer_or_404(db, transfer_id)
-
-
-async def list_project_transfers(
-    db: AsyncSession,
-    project_id: uuid.UUID | None = None,
-    direction: str = "all",  # 'outgoing' | 'incoming' | 'all'
-    status: str | None = None,
-) -> list[ProjectTransfer]:
-    stmt = (
-        select(ProjectTransfer)
-        .options(
-            selectinload(ProjectTransfer.from_project),
-            selectinload(ProjectTransfer.to_project),
-            selectinload(ProjectTransfer.from_warehouse),
-            selectinload(ProjectTransfer.to_warehouse),
-            selectinload(ProjectTransfer.material),
-            selectinload(ProjectTransfer.brand),
-            selectinload(ProjectTransfer.unit),
-        )
-    )
-
-    if project_id is not None:
-        if direction == "outgoing":
-            stmt = stmt.where(ProjectTransfer.from_project_id == project_id)
-        elif direction == "incoming":
-            stmt = stmt.where(ProjectTransfer.to_project_id == project_id)
-        else:
-            stmt = stmt.where(
-                (ProjectTransfer.from_project_id == project_id)
-                | (ProjectTransfer.to_project_id == project_id)
-            )
-
-    if status:
-        stmt = stmt.where(ProjectTransfer.status == status)
-
-    stmt = stmt.order_by(ProjectTransfer.transfer_date.desc())
-    res = await db.execute(stmt)
-    return list(res.scalars().all())

backend/app/services/quote_service.py

@@ -7,7 +7,6 @@ same transaction.
 import asyncio
 import logging
 from datetime import date, datetime, timezone
-from decimal import Decimal
 from uuid import UUID
 
 from sqlalchemy import delete, func, select, update
@@ -19,7 +18,6 @@ from app.models.procurement import (
     ItemTermsheet,
     LineItem,
     LineItemProjects,
-    LineItemSpec,
     Project,
     Quote,
     QuoteEvent,
@@ -420,78 +418,6 @@ async def replace_quote_children(
 
 
 
-async def _ensure_quote_project(db: AsyncSession, quote_id: UUID, project_id: UUID) -> None:
-    """Ensure (quote_id, project_id) exists in quote_projects junction."""
-    exists = await db.scalar(
-        select(QuoteProjects).where(
-            QuoteProjects.quote_id == quote_id,
-            QuoteProjects.project_id == project_id,
-        )
-    )
-    if not exists:
-        db.add(QuoteProjects(quote_id=quote_id, project_id=project_id))
-
-
-async def _merge_split_line_items_on_reopen(db: AsyncSession, quote_id: UUID) -> None:
-    """Consolidate split line items when reverting a quote back to offered.
-
-    Line items sharing the exact same material, brand_material, unit, notes,
-    and identical specs are merged into a single consolidated row whose quantity
-    is the sum of all split rows. Secondary split rows are safely deleted.
-    """
-    line_items = (
-        await db.execute(
-            select(LineItem).where(LineItem.quote_id == quote_id).order_by(LineItem.created_at.asc(), LineItem.id.asc())
-        )
-    ).scalars().all()
-    if len(line_items) <= 1:
-        return
-
-    # Load all specs for these line items to compare canonical signatures
-    specs_rows = (
-        await db.execute(
-            select(LineItemSpec).where(LineItemSpec.line_item_id.in_([li.id for li in line_items]))
-        )
-    ).scalars().all()
-    specs_by_li: dict[UUID, list[tuple]] = {}
-    for sp in specs_rows:
-        sig = (
-            str(sp.attribute_definition_id),
-            str(sp.value_number) if sp.value_number is not None else "",
-            (sp.value_string or "").strip(),
-            str(sp.value_boolean) if sp.value_boolean is not None else "",
-            str(sp.value_date) if sp.value_date is not None else "",
-        )
-        specs_by_li.setdefault(sp.line_item_id, []).append(sig)
-
-    # Group line items by identity
-    groups: dict[tuple, list[LineItem]] = {}
-    for li in line_items:
-        specs_sig = tuple(sorted(specs_by_li.get(li.id, [])))
-        key = (
-            li.material_id,
-            li.brand_material_id,
-            li.unit_id,
-            (li.notes or "").strip(),
-            specs_sig,
-        )
-        groups.setdefault(key, []).append(li)
-
-    for key, items in groups.items():
-        if len(items) > 1:
-            primary = items[0]
-            total_qty = sum(Decimal(str(it.quantity)) for it in items)
-            primary.quantity = total_qty
-
-            secondary_ids = [it.id for it in items[1:]]
-            await db.execute(delete(ItemDecision).where(ItemDecision.line_item_id.in_(secondary_ids)))
-            await db.execute(delete(ItemTermsheet).where(ItemTermsheet.line_item_id.in_(secondary_ids)))
-            await db.execute(delete(LineItemProjects).where(LineItemProjects.line_item_id.in_(secondary_ids)))
-            await db.execute(delete(LineItemSpec).where(LineItemSpec.line_item_id.in_(secondary_ids)))
-            await db.execute(delete(LineItem).where(LineItem.id.in_(secondary_ids)))
-            await db.flush()
-
-
 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
@@ -528,8 +454,6 @@ async def _apply_status_transition(db: AsyncSession, quote: Quote, new_status: s
             )
             .execution_options(synchronize_session=False)
         )
-        # Requirement 2: Merge split line items back into single rows
-        await _merge_split_line_items_on_reopen(db, quote.id)
         # LineItemProjects (candidate projects) are preserved untouched!
     elif new_status == "accepted":  # arrived -> accepted
         quote.arrived_date = None
@@ -633,125 +557,6 @@ async def accept_quote(db: AsyncSession, quote_id: UUID, payload: AcceptQuoteIn,
                         "برای قلم انتخاب‌شده adjusted_unit_price الزامی است", field="item_decisions"
                     )
                 termsheet_id = ts_ids_by_index[index]
-
-                li_row = await db.scalar(
-                    select(LineItem).where(LineItem.id == decision_in.line_item_id).with_for_update()
-                )
-                if li_row is None:
-                    raise NotFoundError("خط آیتم یافت نشد", field="item_decisions.line_item_id")
-
-                allocations = decision_in.allocations or []
-                if allocations:
-                    # Requirement 3: Validate no duplicate projects within allocations of this item
-                    alloc_pids = [a.project_id for a in allocations]
-                    if len(alloc_pids) != len(set(alloc_pids)):
-                        raise ValidationError(
-                            "پروژه تکراری برای یک قلم کالا در ردیف‌های تخصیص انتخاب شده است",
-                            field="item_decisions.allocations",
-                        )
-                    # Requirement 5: Decimal precision check for sum of allocation quantities
-                    alloc_sum = sum(Decimal(str(a.quantity)) for a in allocations)
-                    target_qty = Decimal(str(li_row.quantity))
-                    if alloc_sum != target_qty:
-                        raise ValidationError(
-                            f"مجموع مقادیر تخصیص‌یافته ({alloc_sum}) با مقدار کل قلم ({target_qty}) برابر نیست",
-                            field="item_decisions.allocations",
-                        )
-                    # Validate all projects exist
-                    for a in allocations:
-                        if await db.get(Project, a.project_id) is None:
-                            raise NotFoundError("پروژه یافت نشد", field="item_decisions.allocations.project_id")
-
-                    if len(allocations) >= 2:
-                        # 1. Update the original line item to the first allocation quantity
-                        first_alloc = allocations[0]
-                        li_row.quantity = first_alloc.quantity
-                        decision_in.project_id = first_alloc.project_id
-
-                        # Query all existing item_termsheets and line_item_specs for copying
-                        orig_termsheets = (
-                            await db.execute(
-                                select(ItemTermsheet).where(ItemTermsheet.line_item_id == li_row.id)
-                            )
-                        ).scalars().all()
-                        orig_specs = (
-                            await db.execute(
-                                select(LineItemSpec).where(LineItemSpec.line_item_id == li_row.id)
-                            )
-                        ).scalars().all()
-
-                        # 2. For each subsequent allocation, create a new LineItem and copy specs + ALL termsheets
-                        for split_alloc in allocations[1:]:
-                            new_li = LineItem(
-                                quote_id=quote.id,
-                                material_id=li_row.material_id,
-                                brand_material_id=li_row.brand_material_id,
-                                unit_id=li_row.unit_id,
-                                quantity=split_alloc.quantity,
-                                notes=li_row.notes,
-                            )
-                            db.add(new_li)
-                            await db.flush()
-
-                            # Copy LineItemSpec
-                            for sp in orig_specs:
-                                db.add(
-                                    LineItemSpec(
-                                        line_item_id=new_li.id,
-                                        attribute_definition_id=sp.attribute_definition_id,
-                                        value_number=sp.value_number,
-                                        value_string=sp.value_string,
-                                        value_boolean=sp.value_boolean,
-                                        value_date=sp.value_date,
-                                        unit_id_at_time=sp.unit_id_at_time,
-                                    )
-                                )
-
-                            # Requirement 1: Copy ALL payment options (ItemTermsheet)
-                            chosen_new_it: ItemTermsheet | None = None
-                            for it_orig in orig_termsheets:
-                                price = (
-                                    decision_in.adjusted_unit_price
-                                    if (it_orig.termsheet_id == termsheet_id and decision_in.adjusted_unit_price is not None)
-                                    else it_orig.unit_price
-                                )
-                                copied_it = ItemTermsheet(
-                                    line_item_id=new_li.id,
-                                    termsheet_id=it_orig.termsheet_id,
-                                    unit_price=price,
-                                    min_order_qty=it_orig.min_order_qty,
-                                )
-                                db.add(copied_it)
-                                if it_orig.termsheet_id == termsheet_id:
-                                    chosen_new_it = copied_it
-
-                            if chosen_new_it is None:
-                                chosen_new_it = ItemTermsheet(
-                                    line_item_id=new_li.id,
-                                    termsheet_id=termsheet_id,
-                                    unit_price=decision_in.adjusted_unit_price,
-                                )
-                                db.add(chosen_new_it)
-                            await db.flush()
-
-                            # Create ItemDecision for the split line item
-                            new_decision = ItemDecision(
-                                line_item_id=new_li.id,
-                                status="chosen",
-                                chosen_item_termsheet_id=chosen_new_it.id,
-                                adjusted_unit_price=decision_in.adjusted_unit_price,
-                                adjusted_notes=decision_in.adjusted_notes,
-                                project_id=split_alloc.project_id,
-                                decided_at=utcnow(),
-                            )
-                            db.add(new_decision)
-
-                            # Requirement 4: sync QuoteProjects & LineItemProjects
-                            await _ensure_quote_project(db, quote.id, split_alloc.project_id)
-                            db.add(LineItemProjects(line_item_id=new_li.id, project_id=split_alloc.project_id))
-                    elif len(allocations) == 1:
-                        decision_in.project_id = allocations[0].project_id
-
                 it = await db.scalar(
                     select(ItemTermsheet).where(
                         ItemTermsheet.line_item_id == decision_in.line_item_id,
@@ -805,8 +610,6 @@ async def accept_quote(db: AsyncSession, quote_id: UUID, payload: AcceptQuoteIn,
                 if decision.project_id is not None:
                     if await db.get(Project, decision.project_id) is None:
                         raise NotFoundError("پروژه یافت نشد", field="item_decisions.project_id")
-                    # Requirement 4: sync QuoteProjects
-                    await _ensure_quote_project(db, quote.id, decision.project_id)
                 chosen_ts_ids.add(termsheet_id)
             else:  # rejected
                 if decision is None:

backend/tools/seed.py

@@ -128,7 +128,6 @@ async def get_category(db, slug: str) -> MaterialCategory:
 
 USER_PLAN = [
     # (casdoor username, first, last, role)
-    ("ali.mohaghegh", "علی", "محقق", "admin"),
     ("razaei", "علی", "رضایی", "admin"),
     ("mousavi", "حسین", "موسوی", "procurement_manager"),
     ("mohaghegh", "محمد", "محقق", "pm"),

frontend/src/lib/api.ts

@@ -30,10 +30,6 @@ import type {
   Supplier,
   TransactionType,
   Warehouse,
-  ProjectTransfer,
-  ProjectTransferCreateIn,
-  ProjectTransferUpdateIn,
-  ProjectTransferReceiveIn,
 } from "./types";
 
 const BASE_URL = (import.meta.env?.VITE_API_BASE_URL as string | undefined)?.trim() || "/api/v1";
@@ -243,32 +239,20 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
 }
 
 async function getData<T>(path: string): Promise<T> {
-  const res = await request<any>(path);
-  if (res && typeof res === "object" && "data" in res) {
-    return res.data as T;
-  }
-  return res as T;
+  const res = await request<{ data: T }>(path);
+  return res.data;
 }
 async function postData<T>(path: string, body: unknown): Promise<T> {
-  const res = await request<any>(path, { method: "POST", body: JSON.stringify(body) });
-  if (res && typeof res === "object" && "data" in res) {
-    return res.data as T;
-  }
-  return res as T;
+  const res = await request<{ data: T }>(path, { method: "POST", body: JSON.stringify(body) });
+  return res.data;
 }
 async function patchData<T>(path: string, body: unknown): Promise<T> {
-  const res = await request<any>(path, { method: "PATCH", body: JSON.stringify(body) });
-  if (res && typeof res === "object" && "data" in res) {
-    return res.data as T;
-  }
-  return res as T;
+  const res = await request<{ data: T }>(path, { method: "PATCH", body: JSON.stringify(body) });
+  return res.data;
 }
 async function deleteData<T>(path: string): Promise<T> {
-  const res = await request<any>(path, { method: "DELETE" });
-  if (res && typeof res === "object" && "data" in res) {
-    return res.data as T;
-  }
-  return res as T;
+  const res = await request<{ data: T }>(path, { method: "DELETE" });
+  return res.data;
 }
 
 // آپلود چندبخشی (multipart) — بدون هدر Content-Type دستی تا مرورگر
@@ -474,6 +458,36 @@ function adaptBrandLink(raw: RawBrandLink): BrandLinkRow {
   return { id: raw.id, brand_id: raw.brand_id, brand_name: raw.brand?.name || "" };
 }
 
+// ── تأمین‌کننده‌های متریال — پاسخ GET /materials/{id}/suppliers ──────────────
+// Raw shape mirrors the backend dict exactly. The backend uses an atomic
+// column-level JOIN so `name` always comes from the suppliers table.
+interface RawMaterialSupplier {
+  id: string;
+  name: string;
+  phone: string | null;
+  contact_person: string | null;
+  location: string | null;
+}
+
+/** Clean UI-facing type for one supplier linked to a material. */
+export interface MaterialSupplier {
+  id: string;
+  name: string;
+  phone: string | null;
+  contact_person: string | null;
+  location: string | null;
+}
+
+function adaptMaterialSupplier(raw: RawMaterialSupplier): MaterialSupplier {
+  return {
+    id: raw.id,
+    name: raw.name,
+    phone: raw.phone,
+    contact_person: raw.contact_person,
+    location: raw.location,
+  };
+}
+
 // فایل پیوست — پاسخ بک‌اند (metadata؛ بایت‌ها از endpoint دانلود می‌آیند)
 interface RawAttachment {
   id: string;
@@ -943,28 +957,13 @@ export const api = {
 
       if (becomingAccepted) {
         const acceptedTs = (patch.termsheets || []).filter((t) => t.status === "accepted");
-        // پروژه‌ی واحدِ انتخاب‌شده یا تخصیص‌های چندپروژه‌ای برای هر قلم
+        // پروژه‌ی واحدِ انتخاب‌شده برای هر قلم (item_decisions.project_id)
         const targetProjByLine = new Map<string, string>();
-        const allocationsByLine = new Map<string, { project_id: string; quantity: number }[]>();
         for (const li of patch.line_items || []) {
-          if (li.allocations && li.allocations.length > 0) {
-            const resolvedAllocs: { project_id: string; quantity: number }[] = [];
-            for (const a of li.allocations) {
-              const pid = looksLikeUuid(a.project_id) ? a.project_id! : await projectIdByNameOrCreate(a.project_name);
-              if (pid && a.quantity > 0) {
-                resolvedAllocs.push({ project_id: pid, quantity: Number(a.quantity) });
-              }
-            }
-            if (resolvedAllocs.length) {
-              allocationsByLine.set(li.id, resolvedAllocs);
-              targetProjByLine.set(li.id, resolvedAllocs[0].project_id);
-            }
-          } else {
-            const tp = li.target_project;
-            if (tp && tp.name) {
-              const pid = looksLikeUuid(tp.id) ? tp.id : await projectIdByNameOrCreate(tp.name);
-              if (pid) targetProjByLine.set(li.id, pid);
-            }
+          const tp = li.target_project;
+          if (tp && tp.name) {
+            const pid = looksLikeUuid(tp.id) ? tp.id : await projectIdByNameOrCreate(tp.name);
+            if (pid) targetProjByLine.set(li.id, pid);
           }
         }
 
@@ -984,13 +983,11 @@ export const api = {
             const idx = li.accepted_ts_id ? acceptedTs.findIndex((t) => t.id === li.accepted_ts_id) : -1;
             const chosen = !li.rejected && idx >= 0;
             const chosenProjId = targetProjByLine.get(li.id);
-            const lineAllocs = allocationsByLine.get(li.id);
             return {
               line_item_id: li.id,
               status: chosen ? "chosen" : "rejected",
               ...(chosen ? { accepted_termsheet_index: idx } : {}),
               ...(chosen && chosenProjId ? { project_id: chosenProjId } : {}),
-              ...(chosen && lineAllocs && lineAllocs.length ? { allocations: lineAllocs } : {}),
               ...(li.unit_price != null ? { adjusted_unit_price: li.unit_price } : {}),
             };
           }),
@@ -1159,6 +1156,13 @@ export const api = {
     updateCanonicalUnit: async (id: string, canonical_unit_id: number): Promise<void> => {
       await patchData(`/materials/${id}`, { canonical_unit_id });
     },
+    // فهرست تأمین‌کننده‌های متصل به یک متریال — GET /materials/{id}/suppliers
+    listSuppliers: async (materialId: string): Promise<MaterialSupplier[]> => {
+      const raw = await getData<RawMaterialSupplier[]>(
+        `/materials/${materialId}/suppliers?page_size=100`,
+      );
+      return raw.map(adaptMaterialSupplier);
+    },
   },
 
   projects: {
@@ -1711,7 +1715,7 @@ export const apiV26 = {
       transaction_type: TransactionType; warehouse_id: string; dest_warehouse_id?: string | null;
       material_id: string; brand_id?: string | null; quantity?: number | null;
       physical_qty?: number | null; unit_id?: number | null; specs?: Record<string, string> | null;
-      note?: string | null; delivered_to?: string | null; transaction_date?: string | null;
+      note?: string | null; transaction_date?: string | null;
     }): Promise<InventoryTransaction[]> => {
       return postData<InventoryTransaction[]>(`/inventory/transactions${projectQuery()}`, body);
     },
@@ -1762,41 +1766,4 @@ export const apiV26 = {
         attributes: [],
       }),
   },
-
-  projectTransfers: {
-    list: async (projectId?: string | null, direction: "outgoing" | "incoming" | "all" = "all", status?: string): Promise<ProjectTransfer[]> => {
-      const q = new URLSearchParams();
-      if (projectId) q.set("project_id", projectId);
-      if (direction) q.set("direction", direction);
-      if (status) q.set("status", status);
-      const qs = q.toString() ? `?${q.toString()}` : "";
-      try {
-        const res = await getData<ProjectTransfer[]>(`/inventory/project-transfers${qs}`);
-        return Array.isArray(res) ? res : [];
-      } catch (err) {
-        console.error("Failed to fetch project transfers:", err);
-        return [];
-      }
-    },
-    get: async (id: string, projectId?: string | null): Promise<ProjectTransfer> =>
-      getData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`),
-    create: async (body: ProjectTransferCreateIn, projectId?: string | null): Promise<ProjectTransfer> =>
-      postData<ProjectTransfer>(projectId ? `/inventory/project-transfers?project_id=${projectId}` : `/inventory/project-transfers`, body),
-    update: async (id: string, patch: ProjectTransferUpdateIn, projectId?: string | null): Promise<ProjectTransfer> =>
-      patchData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`, patch),
-    delete: async (id: string, projectId?: string | null): Promise<{ ok: boolean; message: string }> =>
-      deleteData(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`),
-    onTheWay: async (projectId?: string | null): Promise<ProjectTransfer[]> => {
-      try {
-        const res = await getData<ProjectTransfer[]>(projectId ? `/pm/transfers/on-the-way?project_id=${projectId}` : `/pm/transfers/on-the-way`);
-        return Array.isArray(res) ? res : [];
-      } catch (err) {
-        console.error("Failed to fetch on-the-way transfers:", err);
-        return [];
-      }
-    },
-    receive: async (id: string, body: ProjectTransferReceiveIn, projectId?: string | null): Promise<ProjectTransfer> =>
-      postData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}/receive?project_id=${projectId}` : `/inventory/project-transfers/${id}/receive`, body),
-  },
 };
-

frontend/src/lib/types.ts

@@ -73,7 +73,6 @@ export interface LineItem {
   projects?: { id: string; name: string }[]; // پروژه‌های کاندیدای تخصیص‌یافته به این قلم (line_item_projects)
   target_project?: { id: string; name: string } | null; // پروژه‌ی نهایی انتخاب‌شده در هنگام خرید (item_decisions.project_id)
   target_project_id?: string | null;
-  allocations?: { project_id?: string; project_name: string; quantity: number }[]; // تخصیص چندپروژه‌ای در پذیرش
 }
 
 // پیشنهاد خرید (اصلی‌ترین entity)
@@ -164,7 +163,6 @@ export interface InventoryTransaction {
   physical_qty?: number | null;
   transfer_pair_id?: string | null;
   performed_by?: string | null;
-  delivered_to?: string | null;
   transaction_date: string;
   note?: string | null;
   material?: { id: string; name: string } | null;
@@ -201,52 +199,3 @@ export interface ConfirmedReceipt {
   quality_note: string | null;
   allocations: { warehouse_id: string; warehouse_name: string; quantity: string }[];
 }
-
-export interface ProjectTransfer {
-  id: string;
-  from_project: { id: string; name: string };
-  from_warehouse: { id: string; name: string };
-  to_project: { id: string; name: string };
-  to_warehouse?: { id: string; name: string } | null;
-  material: { id: string; name: string };
-  brand?: { id: string; name: string } | null;
-  unit: { id: number; code: string; name_fa?: string | null };
-  quantity: number;
-  specs: Record<string, string>;
-  specs_hash: string;
-  note?: string | null;
-  status: "in_transit" | "received" | "cancelled";
-  transfer_date: string;
-  transferred_by?: string | null;
-  received_at?: string | null;
-  received_by?: string | null;
-  receipt_allocations?: { warehouse_id: string; quantity: string | number }[] | null;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface ProjectTransferCreateIn {
-  from_warehouse_id: string;
-  to_project_id: string;
-  material_id: string;
-  brand_id?: string | null;
-  unit_id: number;
-  quantity: number;
-  specs?: Record<string, string>;
-  note?: string | null;
-  transfer_date?: string | null;
-}
-
-export interface ProjectTransferUpdateIn {
-  to_project_id?: string;
-  quantity?: number;
-  note?: string | null;
-  transfer_date?: string | null;
-}
-
-export interface ProjectTransferReceiveIn {
-  allocations: { warehouse_id: string; quantity: number }[];
-  received_at?: string | null;
-  note?: string | null;
-}
-

frontend/src/pages/Dashboard/AcceptModal.tsx

@@ -23,134 +23,12 @@ import {
 import { MilestoneRow } from "../../components/MilestoneRow";
 import { FileList } from "../../components/FileList";
 import { JalaliDatePicker } from "../../components/JalaliDatePicker";
-import { Building2, Plus, Trash2, CheckCircle2, AlertCircle } from "lucide-react";
-
-// تبدیل عدد به حروف فارسی جهت نمایش زیر باکس مقدار
-const ONES = ["", "یک", "دو", "سه", "چهار", "پنج", "شش", "هفت", "هشت", "نه"];
-const TEENS = [
-  "ده",
-  "یازده",
-  "دوازده",
-  "سیزده",
-  "چهارده",
-  "پانزده",
-  "شانزده",
-  "هفده",
-  "هجده",
-  "نوزده",
-];
-const TENS = [
-  "",
-  "",
-  "بیست",
-  "سی",
-  "چهل",
-  "پنجاه",
-  "شصت",
-  "هفتاد",
-  "هشتاد",
-  "نود",
-];
-const HUNDREDS = [
-  "",
-  "صد",
-  "دویست",
-  "سیصد",
-  "چهارصد",
-  "پانصد",
-  "ششصد",
-  "هفتصد",
-  "هشتصد",
-  "نهصد",
-];
-const SCALES = ["", "هزار", "میلیون", "میلیارد", "تریلیون"];
-const DECIMAL_SCALES: Record<number, string> = {
-  1: "دهم",
-  2: "صدم",
-  3: "هزارم",
-  4: "ده‌هزارم",
-};
-
-function convertThreeDigits(n: number): string {
-  if (n === 0) return "";
-  const parts: string[] = [];
-  const h = Math.floor(n / 100);
-  const rem = n % 100;
-  if (h > 0) parts.push(HUNDREDS[h]);
-  if (rem >= 10 && rem <= 19) {
-    parts.push(TEENS[rem - 10]);
-  } else {
-    const t = Math.floor(rem / 10);
-    const u = rem % 10;
-    if (t > 0) parts.push(TENS[t]);
-    if (u > 0) parts.push(ONES[u]);
-  }
-  return parts.join(" و ");
-}
-
-function toEnglishDigits(str: string): string {
-  return str
-    .replace(/[۰-۹]/g, (d) => String(d.charCodeAt(0) - 1776))
-    .replace(/[٠-٩]/g, (d) => String(d.charCodeAt(0) - 1632));
-}
-
-function numberToPersianWords(val: number | string | null | undefined): string {
-  if (val == null || val === "") return "";
-  const numStr = toEnglishDigits(String(val).trim());
-  const num = parseFloat(numStr);
-  if (isNaN(num)) return "";
-  if (num === 0) return "صفر";
-
-  const isNeg = num < 0;
-  const parts = Math.abs(num).toString().split(".");
-  const intStr = parts[0];
-  const decStr = parts[1];
-
-  let intNum = parseInt(intStr, 10);
-  let intResult = "";
-
-  if (intNum === 0) {
-    intResult = "صفر";
-  } else {
-    const chunks: number[] = [];
-    while (intNum > 0) {
-      chunks.push(intNum % 1000);
-      intNum = Math.floor(intNum / 1000);
-    }
-    const chunkWords: string[] = [];
-    for (let i = chunks.length - 1; i >= 0; i--) {
-      const c = chunks[i];
-      if (c > 0) {
-        const w = convertThreeDigits(c);
-        const s = SCALES[i];
-        chunkWords.push(s ? `${w} ${s}` : w);
-      }
-    }
-    intResult = chunkWords.join(" و ");
-  }
-
-  if (decStr && parseInt(decStr, 10) > 0) {
-    const cleanDecStr = decStr.slice(0, 4);
-    const decNum = parseInt(cleanDecStr, 10);
-    const decWord = numberToPersianWords(decNum);
-    const scale = DECIMAL_SCALES[cleanDecStr.length];
-    if (scale) {
-      if (intNum === 0) {
-        return `${isNeg ? "منفی " : ""}${decWord} ${scale}`;
-      }
-      return `${isNeg ? "منفی " : ""}${intResult} و ${decWord} ${scale}`;
-    }
-    return `${isNeg ? "منفی " : ""}${intResult} ممیز ${decWord}`;
-  }
-
-  return isNeg ? `منفی ${intResult}` : intResult;
-}
 
 interface CardDraft {
   domId: string;
   isNew: boolean;
   milestones: Milestone[];
-  label: string | null;
+  label: string | null; // null = پیش‌فرض «گزینه N»
 }
 
 export interface AcceptModalProps {
@@ -173,9 +51,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
   const [removedItems, setRemovedItems] = useState<Set<string>>(new Set());
   const [assignments, setAssignments] = useState<Record<string, string>>({});
   const [itemProjectsSel, setItemProjectsSel] = useState<Record<string, string>>({});
-  const [itemAllocations, setItemAllocations] = useState<
-    Record<string, { rowId: string; project_name: string; quantity: number | string }[]>
-  >({});
   const [acceptDate, setAcceptDate] = useState<string | null>(() => new Date().toISOString());
   const [ready, setReady] = useState(false);
 
@@ -192,35 +67,17 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
     setRemovedItems(rem);
     setAssignments({});
     const projSel: Record<string, string> = {};
-    const allocs: Record<string, { rowId: string; project_name: string; quantity: number | string }[]> = {};
     q.line_items.forEach((li) => {
       const names = (li.projects || []).map((p) => p.name).filter(Boolean);
-      const defaultProj = li.target_project?.name
+      projSel[li.id] = li.target_project?.name
         ? li.target_project.name
         : names.length
           ? names[0]
           : q.projects && q.projects.length
             ? q.projects[0]
             : q.project || "";
-      projSel[li.id] = defaultProj;
-      if (li.allocations && li.allocations.length) {
-        allocs[li.id] = li.allocations.map((a, idx) => ({
-          rowId: `alloc-${li.id}-${idx}`,
-          project_name: a.project_name,
-          quantity: a.quantity,
-        }));
-      } else {
-        allocs[li.id] = [
-          {
-            rowId: `alloc-${li.id}-0`,
-            project_name: defaultProj,
-            quantity: li.quantity ?? 1,
-          },
-        ];
-      }
     });
     setItemProjectsSel(projSel);
-    setItemAllocations(allocs);
     setReady(true);
   }, [q]);
 
@@ -280,44 +137,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
     setAssignments((a) => ({ ...a, [liId]: domId }));
   };
 
-  const addAllocationRow = (liId: string, totalQty: number) => {
-    setItemAllocations((prev) => {
-      const currentList = prev[liId] || [];
-      const currentSum = currentList.reduce((sum, a) => sum + (parseFloat(String(a.quantity)) || 0), 0);
-      const remaining = Math.max(0, Math.round((totalQty - currentSum) * 10000) / 10000);
-      const usedProjects = new Set(currentList.map((a) => a.project_name).filter(Boolean));
-      const firstAvailable = projectOptions.find((p) => !usedProjects.has(p)) || "";
-      const newRow = {
-        rowId: `alloc-${liId}-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`,
-        project_name: firstAvailable,
-        quantity: remaining > 0 ? remaining : "",
-      };
-      return { ...prev, [liId]: [...currentList, newRow] };
-    });
-  };
-
-  const removeAllocationRow = (liId: string, rowId: string) => {
-    setItemAllocations((prev) => {
-      const currentList = prev[liId] || [];
-      if (currentList.length <= 1) return prev;
-      return { ...prev, [liId]: currentList.filter((a) => a.rowId !== rowId) };
-    });
-  };
-
-  const updateAllocationRow = (
-    liId: string,
-    rowId: string,
-    patch: Partial<{ project_name: string; quantity: number | string }>,
-  ) => {
-    setItemAllocations((prev) => {
-      const currentList = prev[liId] || [];
-      return {
-        ...prev,
-        [liId]: currentList.map((a) => (a.rowId === rowId ? { ...a, ...patch } : a)),
-      };
-    });
-  };
-
   const confirm = () => {
     if (!q) return;
 
@@ -343,7 +162,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
     next.line_items.forEach((li) => {
       if (removedItems.has(li.id)) li.rejected = true;
     });
-
     const active = activeItems(next);
     if (!active.length) {
       toast.error("همه‌ی قلم‌ها رد شده‌اند؛ حداقل یک قلم لازم است.");
@@ -388,60 +206,13 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
       if (t.status === "accepted" && !usedIds.has(t.id)) t.status = "offered";
     });
 
-    for (const li of active) {
-      const allocs = itemAllocations[li.id] || [];
-      const m = materialById(materials, li.material_id);
-      const title = formatMaterialTitle(m);
-      const targetQty = Number(li.quantity ?? 0);
-
-      if (!allocs.length) {
-        toast.error(`برای قلم «${title}» حداقل یک ردیف تخصیص به پروژه لازم است.`);
-        return;
-      }
-
-      for (const a of allocs) {
-        if (!a.project_name.trim()) {
-          toast.error(`برای قلم «${title}»، لطفاً پروژهٔ تمام ردیف‌های تخصیص را مشخص کنید.`);
-          return;
-        }
-        const qVal = parseFloat(String(a.quantity));
-        if (isNaN(qVal) || qVal <= 0) {
-          toast.error(`برای قلم «${title}»، مقدار تخصیص باید عددی بزرگ‌تر از صفر باشد.`);
-          return;
-        }
-      }
-
-      const pNames = allocs.map((a) => a.project_name.trim());
-      if (new Set(pNames).size !== pNames.length) {
-        toast.error(`برای قلم «${title}»، پروژهٔ تکراری در ردیف‌های تخصیص انتخاب شده است.`);
-        return;
-      }
-
-      const sumQty = allocs.reduce((sum, a) => sum + (parseFloat(String(a.quantity)) || 0), 0);
-      const diff = Math.abs(sumQty - targetQty);
-      if (diff > 0.0001) {
-        toast.error(
-          `مجموع مقادیر تخصیص‌یافته برای «${title}» (${fmtNum(sumQty)} ${li.unit}) با مقدار کل قلم (${fmtNum(targetQty)} ${li.unit}) برابر نیست.`
-        );
-        return;
-      }
-    }
-
+    // پروژه‌ی هر قلم (تکی هدف خرید) — فقط target_project تنظیم می‌شود؛
+    // li.projects و next.projects دست‌نخورده باقی می‌مانند تا پروژه‌های کاندیدای اولیه حفظ شوند
     next.line_items.forEach((li) => {
       if (li.rejected) return;
-      const allocs = itemAllocations[li.id];
-      if (allocs && allocs.length) {
-        li.allocations = allocs.map((a) => ({
-          project_name: a.project_name.trim(),
-          quantity: parseFloat(String(a.quantity)) || 0,
-        }));
-        li.target_project = { id: "", name: allocs[0].project_name.trim() };
-      } else {
-        const name = itemProjectsSel[li.id];
-        if (name !== undefined) {
-          li.target_project = name ? { id: "", name } : null;
-        }
-      }
+      const name = itemProjectsSel[li.id];
+      if (name === undefined) return;
+      li.target_project = name ? { id: "", name } : null;
     });
 
     const now = new Date().toISOString();
@@ -461,7 +232,7 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
       <DialogContent className="max-w-3xl p-0 gap-0 overflow-hidden bg-slate-50 border-none shadow-2xl rounded-xl">
         <div className="flex flex-col max-h-[85vh] w-full">
           
-          {/* هدر ثابت */}
+          {/* هدر ثابت و هم‌تراز */}
           <div className="px-6 py-4 bg-white border-b border-line shrink-0 z-10 text-right">
             <DialogHeader className="p-0 text-right">
               <DialogTitle className="text-right text-lg font-bold text-slate-800">
@@ -572,196 +343,53 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
               </div>
             </section>
 
-            {/* بخش ۳: تخصیص اقلام به پروژه‌ها */}
+            {/* بخش ۳: تخصیص اقلام به پروژه */}
             <section className="bg-white rounded-xl shadow-sm border border-line p-4 md:p-5">
-              <div className="flex items-center justify-between mb-1">
-                <h3 className="text-[14px] font-bold text-slate-800">۳. تخصیص اقلام به پروژه‌ها</h3>
-              </div>
+              <h3 className="mb-1 text-[14px] font-bold text-slate-800">۳. تخصیص اقلام به پروژه‌ها</h3>
               <div className="mb-4 text-[12px] text-muted">
-                مشخص کنید چه مقداری از هر قلم به کدام پروژه اختصاص داده می‌شود. در صورت خرید یک کالا برای چند پروژه، می‌توانید آن را به چند سطر تفکیک کنید.
+                برای هر متریال خریداری شده، می‌توانید پروژه مربوط به آن را مشخص کنید.
               </div>
-
-              {projectOptions.length === 0 ? (
-                <div className="text-[12px] text-amber-700 bg-amber-50 border border-amber-200 p-3 rounded-md text-center">
-                  ⚠️ هیچ پروژه‌ای در سیستم ثبت نشده است. لطفاً ابتدا از بخش پروژه‌ها، حداقل یک پروژه ایجاد کنید.
-                </div>
-              ) : (
-                <div className="flex flex-col gap-4">
-                  {allItems
-                    .filter((li) => !removedItems.has(li.id))
-                    .map((li) => {
-                      const m = materialById(materials, li.material_id);
-                      const targetQty = Number(li.quantity ?? 0);
-                      const allocs = itemAllocations[li.id] || [];
-                      const allocSum = allocs.reduce(
-                        (sum, a) => sum + (parseFloat(String(a.quantity)) || 0),
-                        0
-                      );
-                      const diff = Math.round((targetQty - allocSum) * 10000) / 10000;
-                      const isComplete = Math.abs(diff) < 0.0001;
-                      const isOver = diff < -0.0001;
-
-                      return (
-                        <div
-                          key={li.id}
-                          className="rounded-xl border border-line bg-slate-50/50 p-4 transition-all hover:border-primary/30"
-                        >
-                          {/* هدر کارت قلم */}
-                          <div className="flex flex-wrap items-center justify-between gap-2 mb-3 pb-2.5 border-b border-line/60">
-                            <div className="flex items-center gap-2">
-                              <Building2 className="w-4 h-4 text-primary shrink-0" />
-                              <span className="text-[13.5px] font-bold text-slate-800">
-                                {formatMaterialTitle(m)}
-                              </span>
-                            </div>
-
-                            <div className="flex items-center gap-2">
-                              <span className="text-[11px] font-medium text-slate-600 bg-white border border-line px-2.5 py-0.5 rounded-full">
-                                کل: {fmtNum(targetQty)} {li.unit}
-                              </span>
-
-                              {isComplete ? (
-                                <span className="inline-flex items-center gap-1 text-[11px] font-semibold text-emerald-700 bg-emerald-50 border border-emerald-200 px-2.5 py-0.5 rounded-full">
-                                  <CheckCircle2 className="w-3 h-3" />
-                                  تخصیص کامل ({fmtNum(allocSum)} {li.unit})
-                                </span>
-                              ) : isOver ? (
-                                <span className="inline-flex items-center gap-1 text-[11px] font-semibold text-red-700 bg-red-50 border border-red-200 px-2.5 py-0.5 rounded-full">
-                                  <AlertCircle className="w-3 h-3" />
-                                  مازاد تخصیص: {fmtNum(Math.abs(diff))} {li.unit}
-                                </span>
-                              ) : (
-                                <span className="inline-flex items-center gap-1 text-[11px] font-semibold text-amber-700 bg-amber-50 border border-amber-200 px-2.5 py-0.5 rounded-full">
-                                  <AlertCircle className="w-3 h-3" />
-                                  باقیمانده: {fmtNum(diff)} {li.unit}
-                                </span>
-                              )}
-                            </div>
-                          </div>
-
-                          {/* ردیف‌های تخصیص — تراز افقی یکپارچه بدون جابجایی دکمه‌ها */}
-                          <div className="flex flex-col gap-2.5 mb-3">
-                            {allocs.map((alloc) => {
-                              const otherUsedProjects = new Set(
-                                allocs
-                                  .filter((a) => a.rowId !== alloc.rowId)
-                                  .map((a) => a.project_name.trim())
-                                  .filter(Boolean)
-                              );
-
-                              const words = numberToPersianWords(alloc.quantity);
-
-                              return (
-                                <div
-                                  key={alloc.rowId}
-                                  className="flex flex-col sm:flex-row items-start gap-2.5 bg-white p-3 rounded-lg border border-line shadow-xs"
-                                >
-                                  {/* انتخاب پروژه و دکمه حذف موبایل */}
-                                  <div className="flex items-center gap-2 flex-1 w-full sm:w-auto">
-                                    <div className="flex-1 min-w-0">
-                                      <select
-                                        className="w-full h-9 rounded-md border border-line bg-panel px-2.5 py-1 font-inherit text-[12px] outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all text-slate-700"
-                                        value={alloc.project_name}
-                                        onChange={(e) =>
-                                          updateAllocationRow(li.id, alloc.rowId, {
-                                            project_name: e.target.value,
-                                          })
-                                        }
-                                      >
-                                        <option value="">انتخاب پروژه...</option>
-                                        {projectOptions.map((p) => {
-                                          const isUsed = otherUsedProjects.has(p);
-                                          return (
-                                            <option key={p} value={p} disabled={isUsed}>
-                                              {p} {isUsed ? "(در ردیف دیگر انتخاب شده)" : ""}
-                                            </option>
-                                          );
-                                        })}
-                                      </select>
-                                    </div>
-
-                                    {/* دکمه حذف موبایل */}
-                                    <button
-                                      type="button"
-                                      disabled={allocs.length <= 1}
-                                      onClick={() => removeAllocationRow(li.id, alloc.rowId)}
-                                      className="sm:hidden h-9 w-9 flex items-center justify-center rounded-md border border-line text-slate-400 hover:text-red-600 hover:bg-red-50 hover:border-red-200 transition-colors disabled:opacity-30 disabled:pointer-events-none shrink-0"
-                                      title="حذف این ردیف تخصیص"
-                                    >
-                                      <Trash2 className="w-3.5 h-3.5" />
-                                    </button>
-                                  </div>
-
-                                  {/* فیلد مقدار بدون اسپینر + واحد ثابت + متن حروفی */}
-                                  <div className="flex flex-col w-full sm:w-44 shrink-0">
-                                    <div className="flex items-stretch h-9 rounded-md border border-line bg-panel overflow-hidden focus-within:border-primary focus-within:ring-1 focus-within:ring-primary transition-all">
-                                      <input
-                                        type="number"
-                                        step="any"
-                                        min="0"
-                                        placeholder="مقدار"
-                                        className="flex-1 min-w-0 h-full bg-transparent px-2.5 py-1 font-inherit text-[12px] outline-none text-left font-mono [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
-                                        style={{ MozAppearance: "textfield" }}
-                                        dir="ltr"
-                                        value={alloc.quantity}
-                                        onChange={(e) =>
-                                          updateAllocationRow(li.id, alloc.rowId, {
-                                            quantity: e.target.value,
-                                          })
-                                        }
-                                      />
-                                      <div
-                                        className="px-2.5 bg-slate-100 border-s border-line text-slate-600 text-[12px] font-medium flex items-center justify-center shrink-0 select-none min-w-[42px]"
-                                        title={`واحد: ${li.unit}`}
-                                      >
-                                        {li.unit}
-                                      </div>
-                                    </div>
-
-                                    {words ? (
-                                      <div className="mt-1 text-[11px] text-slate-500 font-medium px-0.5 leading-tight text-right truncate" title={`${words} ${li.unit}`}>
-                                        {words} {li.unit}
-                                      </div>
-                                    ) : null}
-                                  </div>
-
-                                  {/* دکمه حذف دسکتاپ — تراز شده با لبه بالای دراپ‌داون و اینپوت */}
-                                  <button
-                                    type="button"
-                                    disabled={allocs.length <= 1}
-                                    onClick={() => removeAllocationRow(li.id, alloc.rowId)}
-                                    className="hidden sm:flex h-9 w-9 items-center justify-center rounded-md border border-line text-slate-400 hover:text-red-600 hover:bg-red-50 hover:border-red-200 transition-colors disabled:opacity-30 disabled:pointer-events-none shrink-0"
-                                    title="حذف این ردیف تخصیص"
-                                  >
-                                    <Trash2 className="w-3.5 h-3.5" />
-                                  </button>
-                                </div>
-                              );
-                            })}
-                          </div>
-
-                          {/* فوتر کارت قلم */}
-                          <div className="flex items-center justify-between pt-1">
-                            <button
-                              type="button"
-                              onClick={() => addAllocationRow(li.id, targetQty)}
-                              disabled={
-                                allocs.length >= projectOptions.length && projectOptions.length > 0
-                              }
-                              className="inline-flex items-center gap-1.5 text-[12px] font-medium text-primary hover:text-primary/80 transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
-                            >
-                              <Plus className="w-3.5 h-3.5" />
-                              <span>افزودن ردیف تخصیص (پروژه دیگر)</span>
-                            </button>
-                            <span className="text-[11px] text-muted">
-                              مجموع: {fmtNum(allocSum)} از {fmtNum(targetQty)} {li.unit}
-                            </span>
-                          </div>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+                {allItems
+                  .filter((li) => !removedItems.has(li.id))
+                  .map((li) => {
+                    const m = materialById(materials, li.material_id);
+                    return (
+                      <div key={li.id} className="rounded-lg border border-line p-3 flex flex-col justify-between hover:border-primary/30 transition-colors">
+                        <div className="mb-3 flex items-center justify-between">
+                          <span className="text-[13px] font-semibold text-slate-800 truncate">
+                            {formatMaterialTitle(m)}
+                          </span>
+                          <span className="ms-2 text-[11px] text-muted bg-slate-100 px-2 py-0.5 rounded-full whitespace-nowrap">
+                            {fmtNum(li.quantity)} {li.unit}
+                          </span>
                         </div>
-                      );
-                    })}
-                </div>
-              )}
+                        {projectOptions.length ? (
+                          <select
+                            className="w-full h-9 rounded-md border border-line bg-panel px-2.5 py-1.5 font-inherit text-[12px] outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all"
+                            value={itemProjectsSel[li.id] ?? ""}
+                            onChange={(e) =>
+                              setItemProjectsSel((s) => ({ ...s, [li.id]: e.target.value }))
+                            }
+                          >
+                            {(itemProjectsSel[li.id] ? [] : [{ name: "" }]).map((_, i) => (
+                              <option key={i} value="">
+                                انتخاب پروژه...
+                              </option>
+                            ))}
+                            {projectOptions.map((n) => (
+                              <option key={n} value={n}>
+                                {n}
+                              </option>
+                            ))}
+                          </select>
+                        ) : (
+                          <div className="text-[12px] text-muted bg-slate-50 p-2 rounded-md text-center">پروژه‌ای در سیستم ثبت نشده است.</div>
+                        )}
+                      </div>
+                    );
+                  })}
+              </div>
             </section>
 
             {/* بخش ۴: فاکتورها، پیش‌فاکتورها و تاریخ */}
@@ -813,17 +441,17 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
 
           </div>
 
-          {/* فوتر ثابت */}
-          <div className="px-6 py-4 bg-white border-t border-line shrink-0 z-10">
-            <DialogFooter className="flex w-full gap-3 sm:justify-end">
-              <Button variant="slate" onClick={onClose} className="w-full sm:w-auto">
-                انصراف
-              </Button>
-              <Button onClick={confirm} className="w-full sm:w-auto">
-                ثبت معامله بسته‌شده
-              </Button>
-            </DialogFooter>
-          </div>
+        {/* فوتر ثابت */}
+        <div className="px-6 py-4 bg-white border-t border-line shrink-0 z-10">
+          <DialogFooter className="flex w-full gap-3 sm:justify-end">
+            <Button variant="slate" onClick={onClose} className="w-full sm:w-auto">
+              انصراف
+            </Button>
+            <Button onClick={confirm} className="w-full sm:w-auto">
+              ثبت معامله بسته‌شده
+            </Button>
+          </DialogFooter>
+        </div>
 
         </div>
       </DialogContent>

frontend/src/pages/Dashboard/DashboardPage.tsx

@@ -110,7 +110,7 @@ export function DashboardPage() {
               className="inline-flex items-center gap-1.5 px-3.5 py-2 rounded-xl border border-gray-200 dark:border-zinc-700 bg-white dark:bg-zinc-800 text-gray-700 dark:text-zinc-200 text-xs font-semibold hover:bg-gray-50 dark:hover:bg-zinc-700 shadow-2xs transition-all no-underline"
             >
               <Ruler className="h-4 w-4 text-gray-500 dark:text-zinc-400" />
-              <span>ضرایب تبدیل</span>
+              <span>اقلام و ضرایب</span>
             </Link>
 
             {/* دکمه اصلی: افزودن پیشنهاد جدید */}

frontend/src/pages/Dashboard/EditModal.tsx

@@ -438,26 +438,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
         li.accepted_ts_id = null;
         li.target_project = null;
         li.target_project_id = null;
-        li.allocations = undefined;
       });
-
-      // ادغام سطرهای تفکیک‌شده حاصل از تخصیص چندپروژه‌ای (الزام ۲)
-      const mergedMap = new Map<string, LineItem>();
-      for (const li of next.line_items) {
-        const key = `${li.material_id}__${li.unit || ""}__${li.unit_price ?? ""}`;
-        const existing = mergedMap.get(key);
-        if (existing) {
-          const q1 = Number(existing.quantity ?? 0);
-          const q2 = Number(li.quantity ?? 0);
-          existing.quantity = Math.round((q1 + q2) * 10000) / 10000;
-          if (existing.unit_price != null && existing.quantity != null) {
-            existing.total_price = existing.unit_price * existing.quantity;
-          }
-        } else {
-          mergedMap.set(key, { ...li });
-        }
-      }
-      next.line_items = Array.from(mergedMap.values());
     } else if (next.status === "accepted") {
       next.arrived_date = null;
       next.line_items.forEach((li) => {

frontend/src/pages/Inventory/ArrivalsPage.tsx

@@ -8,7 +8,7 @@ import { useAuthStore } from "../../store/auth";
 import { inventorySubheader } from "./panelMenu";
 import { apiV26 } from "../../lib/api";
 import { refreshProcurementStore } from "../../hooks";
-import type { PendingArrival, Warehouse, ProjectTransfer } from "../../lib/types";
+import type { PendingArrival, Warehouse } from "../../lib/types";
 import { faNum, fmtDate } from "../../lib/formatters";
 
 // کالاهای در راه — داشبورد متصل به سیستم تدارکات (مرحله رسید)
@@ -25,31 +25,24 @@ export function ArrivalsPage() {
   const isPM = user?.role === "pm";
 
   const [items, setItems] = useState<PendingArrival[]>([]);
-  const [incomingTransfers, setIncomingTransfers] = useState<ProjectTransfer[]>([]);
   const [warehouses, setWarehouses] = useState<Warehouse[]>([]);
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState<string | null>(null); // quoteId
-  const [transferSaving, setTransferSaving] = useState<string | null>(null); // transferId
   const [expanded, setExpanded] = useState<Set<string>>(new Set());
   const [drafts, setDrafts] = useState<Record<string, ItemDraft>>({});
-  const [transferDrafts, setTransferDrafts] = useState<Record<string, AllocRow[]>>({});
 
   const load = useCallback(async () => {
     try {
       const activeProject = isPM ? user?.project_id || undefined : undefined;
-      const [arr, whs, incoming] = await Promise.all([
+      const [arr, whs] = await Promise.all([
         // پروژه‌ی فعال صریحاً ارسال می‌شود؛ بک‌اند تخصیص PM را بررسی می‌کند
         apiV26.pm.onTheWay(activeProject),
         apiV26.warehouses.list(activeProject),
-        apiV26.projectTransfers.onTheWay(activeProject),
       ]);
-      setItems(Array.isArray(arr) ? arr : []);
-      setWarehouses(Array.isArray(whs) ? whs : []);
-      setIncomingTransfers(Array.isArray(incoming) ? incoming : []);
+      setItems(arr);
+      setWarehouses(whs);
     } catch (err) {
       toast.error(err instanceof Error ? err.message : "خطا در دریافت کالاهای در راه");
-      setItems([]);
-      setIncomingTransfers([]);
     } finally {
       setLoading(false);
     }
@@ -219,53 +212,6 @@ export function ArrivalsPage() {
     }
   };
 
-  // ---------- transfer helpers ----------
-
-  const transferDraftOf = (t: ProjectTransfer): AllocRow[] => {
-    if (transferDrafts[t.id] && transferDrafts[t.id].length > 0) {
-      return transferDrafts[t.id];
-    }
-    const defaultWh = warehouses.find((w) => String(w.project_id) === String(t.to_project.id))?.id || warehouses[0]?.id || "";
-    return [{ key: 1, qty: String(t.quantity), whId: defaultWh }];
-  };
-
-  const setTransferAlloc = (transferId: string, rows: AllocRow[]) => {
-    setTransferDrafts((prev) => ({ ...prev, [transferId]: rows }));
-  };
-
-  const handleReceiveTransfer = async (transfer: ProjectTransfer, allocs: AllocRow[]) => {
-    const activeProject = isPM ? user?.project_id || undefined : undefined;
-    const allocSum = round4(allocs.reduce((s, a) => s + (parseFloat(a.qty) || 0), 0));
-    const targetQty = parseFloat(String(transfer.quantity));
-
-    if (allocSum !== targetQty) {
-      toast.error(`مجموع تخصیص انبارها (${faNum(allocSum)}) باید دقیقاً برابر کل بار ارسالی (${faNum(targetQty)}) باشد.`);
-      return;
-    }
-    if (allocs.some((a) => (parseFloat(a.qty) || 0) > 0 && !a.whId)) {
-      toast.error("لطفاً برای تمامی ردیف‌های دارای مقدار، انبار مقصد را انتخاب کنید.");
-      return;
-    }
-
-    setTransferSaving(transfer.id);
-    try {
-      const payloadAllocs = allocs
-        .filter((a) => (parseFloat(a.qty) || 0) > 0 && a.whId)
-        .map((a) => ({ warehouse_id: a.whId, quantity: parseFloat(a.qty) }));
-
-      await apiV26.projectTransfers.receive(transfer.id, {
-        allocations: payloadAllocs,
-      }, activeProject);
-
-      toast.success("تحویل انتقال بین کارگاهی ۱۰۰٪ تأیید شد و به انبار پروژه وارد گردید ✓");
-      await load();
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : "خطا در تأیید تحویل انتقال");
-    } finally {
-      setTransferSaving(null);
-    }
-  };
-
   if (!isAdmin && !isPM) {
     return (
       <div className="min-h-screen">
@@ -287,171 +233,19 @@ export function ArrivalsPage() {
       />
       <PageLayout className="flex flex-col gap-4">
         <div className="rounded-lg border border-blue/20 bg-blue/5 px-3 py-2 text-[12px] leading-6 text-muted">
-          🚚 این بخش به مرحله «رسید» سفارش‌های خرید و «انتقال بین کارگاهی» متصل است: اقلام ارسالی از سایر پروژه‌ها به صورت ۱۰۰٪ تحویل و بین انبارهای پروژه تخصیص داده می‌شوند؛ سفارش‌های خرید نیز قابلیت رسید کامل یا جزیی دارند.
+          🚚 این بخش به مرحله «رسید» سفارش‌های خرید متصل است: تأیید پیشنهاد و پذیرش در سیستم تدارکات انجام شده و
+          اینجا فقط رسید و تقسیم بین انبارها ثبت می‌شود. <b>رسید جزیی (قلمی و مقداری) مجاز است</b> — هر سفارش را باز
+          کنید، تعداد واقعیِ رسیده هر قلم را وارد کنید و آن را بین انبارهای پروژه تقسیم کنید؛ قلم‌هایی که مقداری برایشان
+          وارد نشود در صف «در راه» می‌مانند. مجموع تخصیص هر قلم باید دقیقاً با تعداد رسیده‌ی همان قلم برابر باشد و از
+          مانده‌ی سفارش بیشتر نشود.
         </div>
 
         {loading ? (
           <div className="py-6 text-center text-[12.5px] text-muted">در حال بارگذاری…</div>
-        ) : !(orders || []).length && !(incomingTransfers || []).length ? (
+        ) : !orders.length ? (
           <EmptyState emoji="🚚" text="کالای در راهی برای دریافت وجود ندارد." />
         ) : (
-          <>
-            {/* بخش انتقال‌های بین کارگاهی در راه */}
-            {(incomingTransfers || []).length > 0 && (
-              <div className="flex flex-col gap-3">
-                <div className="flex items-center gap-2">
-                  <h3 className="text-[14px] font-bold text-foreground">🔁 انتقال‌های بین کارگاهی در راه ({faNum((incomingTransfers || []).length)})</h3>
-                  <span className="text-[11.5px] text-muted">— تحویل ۱۰۰٪ کامل مصالح ارسالی از سایر پروژه‌ها</span>
-                </div>
-
-                {(incomingTransfers || []).map((t) => {
-                  const draftAllocs = transferDraftOf(t);
-                  const allocSum = round4(draftAllocs.reduce((s, a) => s + (parseFloat(a.qty) || 0), 0));
-                  const targetQty = parseFloat(String(t.quantity));
-                  const isExactMatch = allocSum === targetQty;
-                  const hasEmptyWh = draftAllocs.some((a) => (parseFloat(a.qty) || 0) > 0 && !a.whId);
-                  const isValid = isExactMatch && !hasEmptyWh && allocSum > 0;
-                  const days = daysElapsed(t.transfer_date);
-                  const projectWhs = warehouses.filter((w) => String(w.project_id) === String(t.to_project.id));
-                  const destWhOptions = projectWhs.length > 0 ? projectWhs : warehouses;
-
-                  return (
-                    <div key={t.id} className="overflow-hidden rounded-xl border border-line bg-panel shadow-sm">
-                      {/* سربرگ انتقال */}
-                      <div className="flex flex-wrap items-center justify-between gap-2 border-b border-line bg-panel px-4 py-3">
-                        <div className="flex flex-wrap items-center gap-2">
-                          <span className="text-[14px] font-bold text-foreground">🔁 انتقال از {t.from_project?.name || "پروژه مبدأ"}</span>
-                          <Badge variant="offered">در راه</Badge>
-                          {days !== null && (
-                            <Badge variant={days >= 7 ? "offered" : "muted"}>
-                              روز گذشته: {faNum(days)} روز
-                            </Badge>
-                          )}
-                        </div>
-                        <div className="flex flex-wrap items-center gap-3 text-[11.5px] text-muted">
-                          <span>ارسال‌کننده: <b className="text-foreground">{t.transferred_by || "—"}</b></span>
-                          <span>تاریخ ارسال: <b className="text-foreground">{fmtDate(t.transfer_date)}</b></span>
-                          <span>پروژه مقصد: <b className="text-foreground">{t.to_project?.name || "—"}</b></span>
-                        </div>
-                      </div>
-
-                      <div className="px-4 py-3">
-                        <div className="flex flex-wrap items-center gap-2">
-                          <span className="text-[13px] font-bold">{t.material?.name}</span>
-                          {t.brand?.name && <Badge variant="outline">{t.brand.name}</Badge>}
-                          <Badge variant="outline">
-                            مقدار ارسالی: {faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code || ""}
-                          </Badge>
-                          {t.specs && Object.keys(t.specs).length > 0 && (
-                            <span className="text-[11.5px] text-muted">
-                              مشخصات: {Object.entries(t.specs).map(([k, v]) => `${k}: ${v}`).join(" · ")}
-                            </span>
-                          )}
-                        </div>
-
-                        {t.note && (
-                          <div className="mt-1 text-[11.5px] text-muted">
-                            یادداشت ارسال: <span className="text-foreground">{t.note}</span>
-                          </div>
-                        )}
-
-                        <div className="mt-3 rounded-lg border border-line/70 bg-bg/50 p-3">
-                          <div className="text-[12px] font-semibold text-muted mb-2">
-                            تخصیص ۱۰۰٪ به انبار(های) پروژه (مجموع باید دقیقاً {faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code || ""} باشد):
-                          </div>
-
-                          <div className="flex flex-col gap-2">
-                            {draftAllocs.map((a) => (
-                              <div key={a.key} className="flex flex-wrap items-center gap-2">
-                                <input
-                                  type="number"
-                                  inputMode="decimal"
-                                  className="h-8 w-28 rounded-lg border border-line bg-panel px-2 text-sm ltr"
-                                  placeholder="تعداد"
-                                  value={a.qty}
-                                  onChange={(e) => {
-                                    const next = draftAllocs.map((x) => (x.key === a.key ? { ...x, qty: e.target.value } : x));
-                                    setTransferAlloc(t.id, next);
-                                  }}
-                                />
-                                <select
-                                  className="h-8 min-w-[200px] flex-1 rounded-lg border border-line bg-panel px-2 text-xs"
-                                  value={a.whId}
-                                  onChange={(e) => {
-                                    const next = draftAllocs.map((x) => (x.key === a.key ? { ...x, whId: e.target.value } : x));
-                                    setTransferAlloc(t.id, next);
-                                  }}
-                                >
-                                  <option value="">— انتخاب انبار پروژه مقصد —</option>
-                                  {destWhOptions.map((w) => (
-                                    <option key={w.id} value={w.id}>{w.name}</option>
-                                  ))}
-                                </select>
-                                {draftAllocs.length > 1 && (
-                                  <button
-                                    type="button"
-                                    className="h-8 px-2 text-muted hover:text-red transition-colors"
-                                    onClick={() => {
-                                      const next = draftAllocs.filter((x) => x.key !== a.key);
-                                      setTransferAlloc(t.id, next);
-                                    }}
-                                    title="حذف این ردیف تخصیص"
-                                  >
-                                    ✕
-                                  </button>
-                                )}
-                              </div>
-                            ))}
-
-                            <button
-                              type="button"
-                              className="w-fit rounded-lg border border-dashed border-accent/50 px-3 py-1 text-[11.5px] text-accent mt-1 hover:bg-accent-bg/40 transition-colors"
-                              onClick={() => {
-                                const next = [...draftAllocs, { key: Date.now() + Math.random(), qty: "", whId: destWhOptions[0]?.id || "" }];
-                                setTransferAlloc(t.id, next);
-                              }}
-                            >
-                              + افزودن انبار دیگر برای تقسیم بار
-                            </button>
-                          </div>
-
-                          <div className="mt-3 flex flex-wrap items-center justify-between gap-2 border-t border-line/60 pt-2 text-[12px]">
-                            <div>
-                              {isExactMatch ? (
-                                <span className="font-semibold text-emerald-600">
-                                  ✓ تخصیص کامل ۱۰۰٪ ({faNum(allocSum)} از {faNum(targetQty)}) آماده تحویل
-                                </span>
-                              ) : (
-                                <span className="font-bold text-rose-600">
-                                  اختلاف تخصیص: مجموع تخصیص ({faNum(allocSum)}) باید دقیقاً با مقدار کل ({faNum(targetQty)}) برابر باشد.
-                                </span>
-                              )}
-                              {hasEmptyWh && (
-                                <span className="ms-2 font-bold text-rose-600">
-                                  — لطفاً انبار مقصد را انتخاب کنید
-                                </span>
-                              )}
-                            </div>
-
-                            <Button
-                              size="sm"
-                              variant="green"
-                              disabled={!isValid || transferSaving === t.id}
-                              onClick={() => void handleReceiveTransfer(t, draftAllocs)}
-                            >
-                              {transferSaving === t.id ? "در حال ثبت تحویل…" : "✓ تأیید تحویل ۱۰۰٪ و ورود به انبار"}
-                            </Button>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  );
-                })}
-              </div>
-            )}
-
-            {/* بخش سفارش‌های خرید در راه */}
-            {orders.map(([quoteId, its]) => {
+          orders.map(([quoteId, its]) => {
             const first = its[0];
             const open = expanded.has(quoteId);
             const hasSubmittable = orderHasSubmittable(quoteId);
@@ -607,8 +401,7 @@ export function ArrivalsPage() {
                 )}
               </div>
             );
-          })}
-          </>
+          })
         )}
       </PageLayout>
     </div>

frontend/src/pages/Inventory/ChangeInventoryPage.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 import { toast } from "sonner";
 import { Header, PageLayout } from "../../components/layout/Header";
@@ -6,22 +6,21 @@ import { Combobox } from "../../components/Combobox";
 import { MultiSelectCombobox } from "../../components/MultiSelectCombobox";
 import { useAuthStore } from "../../store/auth";
 import { inventorySubheader } from "./panelMenu";
-import { api, apiV26 } from "../../lib/api";
+import { apiV26 } from "../../lib/api";
 import { notifyDataChanged } from "../../lib/crossTab";
 import { useInventoryData, unitName, whName } from "./useInventoryData";
 import { JalaliDatePicker } from "../../components/JalaliDatePicker";
 import { uniqueUnits } from "../../lib/units";
-import type { InventoryTransaction, TransactionType, Project, ProjectTransfer } from "../../lib/types";
-import { faNum, fmtDate } from "../../lib/formatters";
+import type { InventoryTransaction, TransactionType } from "../../lib/types";
+import { faNum } from "../../lib/formatters";
 import { gregorianToJalali, MONTHS, toFa } from "../../lib/jalali";
 import { cn } from "../../lib/utils";
 
-type FormType = TransactionType | "TRANSFER" | "PROJECT_TRANSFER";
+type FormType = TransactionType | "TRANSFER";
 
 const FORM_TYPES: { t: FormType; label: string; dir: string; cls: "in" | "out" | "mv" | "cnt"; color: string; desc: string }[] = [
   { t: "PURCHASE", label: "موجودی اولیه", dir: "افزایش", cls: "in", color: "#10b981", desc: "ثبت موجودی اولیه — متریال/برند/واحد را از فهرست انتخاب کنید؛ اگر نامی در فهرست نبود، همان نام تایپ‌شده هنگام ثبت به‌صورت خودکار در کاتالوگ سراسری ساخته می‌شود. ثبت حداقل یک مشخصه فنی الزامی است." },
   { t: "WITHDRAWAL", label: "برداشت", dir: "کاهش", cls: "out", color: "#e11d48", desc: "انبار را انتخاب و نام متریال را تایپ کنید؛ همه مدل‌ها (برند و مشخصه متفاوت) نمایش داده می‌شوند. برداشت‌ها در «کنترل روزانه» امروز دیده می‌شوند." },
-  { t: "PROJECT_TRANSFER", label: "انتقال بین کارگاهی", dir: "کاهش", cls: "out", color: "#e11d48", desc: "انتقال متریال از انبار این پروژه به یک پروژه دیگر — پس از ثبت، موجودی در انبار مبدأ کسر شده و کالا به عنوان بار در راه برای پروژه مقصد ارسال می‌شود تا مدیر پروژه مقصد آن را تحویل بگیرد." },
   { t: "RETURN", label: "برگشت", dir: "افزایش", cls: "in", color: "#10b981", desc: "برگشت از مصالحی که امروز برداشت شده‌اند — نام متریال را تایپ کنید و مقدار برگشتی هر ردیف را بزنید." },
   { t: "TRANSFER", label: "انتقال", dir: "جابه‌جایی", cls: "mv", color: "#2563eb", desc: "جابه‌جایی بین انبارهای پروژه — از انبار مبدأ، مقداری از هر مدل را به انبار مقصد منتقل کنید." },
   { t: "DAMAGE", label: "ضایعات", dir: "کاهش", cls: "out", color: "#e11d48", desc: "ثبت ضایعات خرید (مثلاً لوله‌های سوراخ) — انبار و متریال را انتخاب و تعداد ضایعات هر مدل را وارد کنید." },
@@ -54,22 +53,6 @@ export function ChangeInventoryPage() {
 
   const [type, setType] = useState<FormType>("PURCHASE");
   const [whId, setWhId] = useState("");
-  const [toProjectId, setToProjectId] = useState("");
-  const [allProjects, setAllProjects] = useState<Project[]>([]);
-  const [transfers, setTransfers] = useState<ProjectTransfer[]>([]);
-  const [loadingTransfers, setLoadingTransfers] = useState(false);
-
-  // Edit modal state
-  const [editingTransfer, setEditingTransfer] = useState<ProjectTransfer | null>(null);
-  const [editQty, setEditQty] = useState("");
-  const [editToProjectId, setEditToProjectId] = useState("");
-  const [editNote, setEditNote] = useState("");
-  const [editBusy, setEditBusy] = useState(false);
-
-  // Delete modal state
-  const [deleteConfirmTransfer, setDeleteConfirmTransfer] = useState<ProjectTransfer | null>(null);
-  const [deleteBusy, setDeleteBusy] = useState(false);
-
   const [fromId, setFromId] = useState("");
   const [toId, setToId] = useState("");
   const [matTxt, setMatTxt] = useState("");
@@ -79,7 +62,6 @@ export function ChangeInventoryPage() {
   const [dateInput, setDateInput] = useState<string>(() => new Date().toISOString());
   const [specsChips, setSpecsChips] = useState<string[]>([]);
   const [note, setNote] = useState("");
-  const [deliveredTo, setDeliveredTo] = useState("");
   const [rows, setRows] = useState<RowDraft[]>([]);
   const [busy, setBusy] = useState(false);
 
@@ -104,20 +86,10 @@ export function ChangeInventoryPage() {
   );
 
   const formRecords = useMemo(() => {
-    const txt = matTxt.trim().toLowerCase();
+    const txt = matTxt.trim();
     const wid = type === "TRANSFER" ? fromId : whId;
     return data.inventory.filter((r) => {
       if (r.warehouse?.id !== wid) return false;
-      if (type === "WITHDRAWAL") {
-        if (r.quantity_number <= 0) return false;
-        if (txt) {
-          const mMatch = r.material.name.toLowerCase().includes(txt);
-          const bMatch = r.brand?.name?.toLowerCase().includes(txt) ?? false;
-          const sMatch = Object.values(r.specs || {}).some((v) => String(v).toLowerCase().includes(txt));
-          if (!mMatch && !bMatch && !sMatch) return false;
-        }
-        return true;
-      }
       if (txt && !r.material.name.includes(txt)) return false;
       return true;
     });
@@ -214,7 +186,6 @@ export function ChangeInventoryPage() {
       setQty("");
       setSpecsChips([]);
       setNote("");
-      setDeliveredTo("");
       await data.refresh();
     } catch (err) {
       toast.error(err instanceof Error ? err.message : "خطا در ثبت");
@@ -223,82 +194,6 @@ export function ChangeInventoryPage() {
     }
   };
 
-  const loadTransfers = useCallback(async () => {
-    if (!user?.project_id) return;
-    setLoadingTransfers(true);
-    try {
-      const list = await apiV26.projectTransfers.list(user.project_id, "outgoing");
-      setTransfers(Array.isArray(list) ? list : []);
-    } catch (err) {
-      console.error("Failed to load project transfers:", err);
-      setTransfers([]);
-    } finally {
-      setLoadingTransfers(false);
-    }
-  }, [user?.project_id]);
-
-  useEffect(() => {
-    api.projects
-      .list()
-      .then((res) => setAllProjects(Array.isArray(res) ? res : []))
-      .catch(() => setAllProjects([]));
-  }, []);
-
-  useEffect(() => {
-    if (type === "PROJECT_TRANSFER") {
-      void loadTransfers();
-    }
-  }, [type, loadTransfers]);
-
-  const whStock = useMemo(() => {
-    if (!whId) return [];
-    return (data.inventory || []).filter((r) => r.warehouse?.id === whId && r.quantity_number > 0);
-  }, [data.inventory, whId]);
-
-
-
-  const handleSaveEdit = async () => {
-    if (!editingTransfer) return;
-    const n = parseNum(editQty);
-    if (!(n > 0)) return toast.error("تعداد باید بزرگ‌تر از صفر باشد");
-    if (!editToProjectId) return toast.error("پروژه مقصد را انتخاب کنید");
-
-    setEditBusy(true);
-    try {
-      await apiV26.projectTransfers.update(editingTransfer.id, {
-        quantity: n,
-        to_project_id: editToProjectId,
-        note: editNote,
-      }, user?.project_id);
-      toast.success("انتقال با موفقیت ویرایش شد ✓");
-      notifyDataChanged("inventory");
-      setEditingTransfer(null);
-      await data.refresh();
-      await loadTransfers();
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : "خطا در ویرایش انتقال");
-    } finally {
-      setEditBusy(false);
-    }
-  };
-
-  const handleConfirmDelete = async () => {
-    if (!deleteConfirmTransfer) return;
-    setDeleteBusy(true);
-    try {
-      await apiV26.projectTransfers.delete(deleteConfirmTransfer.id, user?.project_id);
-      toast.success("انتقال لغو شد و موجودی به انبار مبدأ بازگردانده شد ✓");
-      notifyDataChanged("inventory");
-      setDeleteConfirmTransfer(null);
-      await data.refresh();
-      await loadTransfers();
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : "خطا در لغو انتقال");
-    } finally {
-      setDeleteBusy(false);
-    }
-  };
-
   const submitPurchase = async () => {
     const matName = matTxt.trim();
     const brandName = brandTxt.trim();
@@ -339,86 +234,7 @@ export function ChangeInventoryPage() {
     }
   };
 
-  const submitProjectTransfer = async () => {
-    const matName = matTxt.trim();
-    const brandName = brandTxt.trim();
-    const unitName = unitTxt.trim();
-    const n = parseNum(qty);
-    if (!whId) return toast.error("انبار مبدأ را انتخاب کنید");
-    if (!toProjectId) return toast.error("پروژه مقصد را انتخاب کنید");
-    if (!matName) return toast.error("نام متریال را وارد کنید");
-    if (!unitName) return toast.error("نام واحد را وارد کنید");
-    if (!(n > 0)) return toast.error("تعداد باید بزرگ‌تر از صفر باشد");
-
-    setBusy(true);
-    try {
-      // Find matching inventory in the selected source warehouse
-      const invInWh = (data.inventory || []).filter(
-        (r) => r.warehouse?.id === whId && r.material.name.trim() === matName
-      );
-      const matchedInv = invInWh.find(
-        (r) => (brandName ? r.brand?.name === brandName : !r.brand)
-      ) || invInWh[0];
-
-      let uid = matchedInv?.unit?.id ?? unitIdByName(unitName);
-      if (!uid) {
-        const created = await apiV26.catalog.createUnit(unitName);
-        uid = created.id;
-      }
-
-      let bid: string | null = matchedInv?.brand?.id ?? (brandName ? brandIdByName(brandName) : null);
-      if (brandName && !bid) {
-        const created = await apiV26.catalog.createBrand(brandName);
-        bid = created.id;
-      }
-
-      let mid = matchedInv?.material.id;
-      if (!mid) {
-        let m = matByName(matName);
-        if (!m) {
-          const created = await apiV26.catalog.createMaterial({ name: matName, canonical_unit_id: uid, brand_ids: bid ? [bid] : [] });
-          mid = created.id;
-        } else {
-          mid = m.id;
-        }
-      }
-
-      const finalSpecs = matchedInv ? (matchedInv.specs || {}) : specsFromChips();
-
-      await apiV26.projectTransfers.create({
-        from_warehouse_id: whId,
-        to_project_id: toProjectId,
-        material_id: mid,
-        brand_id: bid || null,
-        unit_id: uid,
-        quantity: n,
-        specs: finalSpecs,
-        note,
-        transfer_date: toServerIso(),
-      }, user?.project_id);
-
-      toast.success("انتقال بین کارگاهی ثبت شد و از انبار مبدأ کسر گردید ✓");
-      notifyDataChanged("inventory");
-      setQty("");
-      setSpecsChips([]);
-      setNote("");
-      setMatTxt("");
-      setBrandTxt("");
-      setUnitTxt("");
-      setToProjectId("");
-      await data.refresh();
-      await loadTransfers();
-    } catch (err) {
-      toast.error(err instanceof Error ? err.message : "خطا در ثبت انتقال بین کارگاهی");
-    } finally {
-      setBusy(false);
-    }
-  };
-
   const submitList = async (t: TransactionType) => {
-    if (t === "WITHDRAWAL" && !deliveredTo.trim()) {
-      return toast.error("نام تحویل‌گیرنده اقلام الزامی است");
-    }
     const ops: Record<string, unknown>[] = rows
       .map((r, i): Record<string, unknown> | null => {
         const n = parseNum(r.qty);
@@ -428,18 +244,7 @@ export function ChangeInventoryPage() {
         if (t === "STOCK_COUNT") {
           return { transaction_type: "STOCK_COUNT", warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, physical_qty: n, note: r.note, transaction_date: toServerIso() };
         }
-        return {
-          transaction_type: t,
-          warehouse_id: whId,
-          material_id: rec.material.id,
-          brand_id: rec.brand?.id || null,
-          quantity: n,
-          unit_id: rec.unit?.id ?? null,
-          specs: rec.specs || {},
-          note: r.note,
-          delivered_to: t === "WITHDRAWAL" ? deliveredTo.trim() : undefined,
-          transaction_date: toServerIso(),
-        };
+        return { transaction_type: t, warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, quantity: n, unit_id: rec.unit?.id ?? null, specs: rec.specs || {}, note: r.note, transaction_date: toServerIso() };
       })
       .filter((x): x is Record<string, unknown> => x !== null);
     if (!ops.length) return toast.error("هیچ ردیفی پر نشده است");
@@ -551,7 +356,6 @@ export function ChangeInventoryPage() {
   const doSubmit = () => {
     try {
       if (type === "PURCHASE") void submitPurchase();
-      else if (type === "PROJECT_TRANSFER") void submitProjectTransfer();
       else if (type === "RETURN") void submitReturn();
       else if (type === "TRANSFER") void submitTransfer();
       else if (type === "FOUND") void submitFound();
@@ -566,12 +370,6 @@ export function ChangeInventoryPage() {
     if (type === "PURCHASE") {
       return !!(whId && matTxt.trim() && brandTxt.trim() && unitTxt.trim() && parseNum(qty) > 0 && specsComplete);
     }
-    if (type === "WITHDRAWAL") {
-      return !!(whId && deliveredTo.trim() && rows.some((r) => parseNum(r.qty) > 0));
-    }
-    if (type === "PROJECT_TRANSFER") {
-      return !!(whId && toProjectId && matTxt.trim() && unitTxt.trim() && parseNum(qty) > 0);
-    }
     if (type === "TRANSFER") return !!(fromId && toId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
     if (type === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
     if (type === "FOUND") {
@@ -665,47 +463,7 @@ export function ChangeInventoryPage() {
 
         <div className="rounded-xl border border-line bg-panel p-3 sm:p-4 w-full shadow-2xs">
           {/* انتخاب انبارها (چیپ‌های لمسی به جای سلکت خام) */}
-          {type === "PROJECT_TRANSFER" ? (
-            <div className="mb-3 grid gap-3 md:grid-cols-2">
-              <div className="flex flex-col gap-1.5">
-                <label className="text-xs font-semibold text-muted">از (انبار مبدأ این پروژه) *</label>
-                <div className="flex flex-wrap gap-1.5 mt-1">
-                  {whOpts.map((w) => (
-                    <button
-                      key={w.id}
-                      type="button"
-                      onClick={() => { setWhId(w.id); }}
-                      className={cn(
-                        "rounded-lg px-3 py-1.5 text-xs font-medium transition-colors",
-                        whId === w.id
-                          ? "bg-rose-600 text-white font-bold shadow-xs"
-                          : "border border-line bg-bg/50 text-ink hover:bg-panel"
-                      )}
-                    >
-                      {w.name}
-                    </button>
-                  ))}
-                </div>
-              </div>
-              <div className="flex flex-col gap-1.5">
-                <label className="text-xs font-semibold text-muted">به (پروژه مقصد) *</label>
-                <select
-                  className="mt-1 h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm font-medium"
-                  value={toProjectId}
-                  onChange={(e) => setToProjectId(e.target.value)}
-                >
-                  <option value="">— انتخاب پروژه مقصد —</option>
-                  {(allProjects || [])
-                    .filter((p) => p.id !== user?.project_id)
-                    .map((p) => (
-                      <option key={p.id} value={p.id}>
-                        {p.name}
-                      </option>
-                    ))}
-                </select>
-              </div>
-            </div>
-          ) : !isTransfer ? (
+          {!isTransfer ? (
             <div className="mb-3 flex flex-col gap-3">
               <div className="flex flex-col gap-1.5">
                 <label className="text-xs font-semibold text-muted">انبار *</label>
@@ -728,36 +486,7 @@ export function ChangeInventoryPage() {
                 </div>
               </div>
 
-              {type === "WITHDRAWAL" && (
-                <div className="grid gap-3 sm:grid-cols-2">
-                  <div className="field">
-                    <label className="text-xs font-semibold text-muted">جستجو در متریال‌ها (اختیاری)</label>
-                    <input
-                      list="dl-mat"
-                      className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
-                      placeholder="فیلتر بر اساس نام متریال، برند یا مشخصه (خالی = نمایش همه)…"
-                      value={matTxt}
-                      onChange={(e) => { setMatTxt(e.target.value); setRows([]); }}
-                    />
-                    <datalist id="dl-mat">
-                      {data.lookup.materials.map((m) => <option key={m.id} value={m.name} />)}
-                    </datalist>
-                  </div>
-                  <div className="field">
-                    <label className="text-xs font-semibold text-muted">
-                      تحویل به (تحویل‌گیرنده) <span className="text-rose-500 font-bold">*</span>
-                    </label>
-                    <input
-                      className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
-                      placeholder="نام فرد، اکیپ یا پیمانکار تحویل‌گیرنده اقلام…"
-                      value={deliveredTo}
-                      onChange={(e) => setDeliveredTo(e.target.value)}
-                    />
-                  </div>
-                </div>
-              )}
-
-              {(type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
+              {(type === "WITHDRAWAL" || type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
                 <div className="field">
                   <label className="text-xs font-semibold text-muted">{type === "FOUND" ? "متریال (خالی = همه مفقودی‌ها)" : "متریال *"}</label>
                   <input
@@ -832,72 +561,9 @@ export function ChangeInventoryPage() {
             </div>
           )}
 
-          {/* فرم خرید / موجودی اولیه یا انتقال بین کارگاهی */}
-          {(type === "PURCHASE" || type === "PROJECT_TRANSFER") && (
+          {/* فرم خرید / موجودی اولیه */}
+          {type === "PURCHASE" && (
             <div className="grid gap-3 md:grid-cols-2">
-              {/* چیپ‌های انتخاب سریع از موجودی‌های انبار مبدأ */}
-              {type === "PROJECT_TRANSFER" && whId && (
-                <div className="field md:col-span-2 rounded-xl border border-rose-500/20 bg-rose-500/5 p-3.5">
-                  <div className="flex items-center justify-between gap-2 mb-2">
-                    <span className="text-xs font-bold text-foreground flex items-center gap-1.5">
-                      <span>📦</span>
-                      <span>موجودی‌های موجود در {whName(warehouses, whId)} — برای پر کردن خودکار فرم کلیک کنید:</span>
-                    </span>
-                    <span className="text-[11px] text-muted">{faNum(whStock.length)} قلم کالا</span>
-                  </div>
-                  {whStock.length === 0 ? (
-                    <div className="text-xs text-muted py-1">هیچ کالایی با موجودی مثبت در این انبار یافت نشد.</div>
-                  ) : (
-                    <div className="flex flex-wrap gap-2">
-                      {whStock.map((r) => {
-                        const isSelected = matTxt === r.material.name && (brandTxt === (r.brand?.name || "") || (!brandTxt && !r.brand));
-                        const specsSummary = Object.entries(r.specs || {})
-                          .map(([k, v]) => (v ? `${v}` : k.replace(/^spec_/, "")))
-                          .filter(Boolean)
-                          .join(" · ");
-                        return (
-                          <button
-                            key={r.id}
-                            type="button"
-                            onClick={() => {
-                              setMatTxt(r.material.name);
-                              setBrandTxt(r.brand?.name || "");
-                              setUnitTxt(unitName(data.lookup.units, r.unit?.id) || "");
-                              const chips = Object.entries(r.specs || {})
-                                .map(([k, v]) => (v ? `${v}` : k.replace(/^spec_/, "")))
-                                .filter(Boolean);
-                              setSpecsChips(chips);
-                            }}
-                            className={cn(
-                              "flex items-center gap-2 rounded-lg border px-3 py-1.5 text-xs text-start transition-all shadow-2xs",
-                              isSelected
-                                ? "border-rose-500 bg-rose-600 text-white font-bold ring-2 ring-rose-500/30"
-                                : "border-line bg-panel hover:border-ink/40 text-ink"
-                            )}
-                          >
-                            <span className="font-bold">{r.material.name}</span>
-                            <span className={isSelected ? "text-white/80" : "text-muted font-normal"}>
-                              ({r.brand?.name || "بدون برند"})
-                            </span>
-                            {specsSummary && (
-                              <span className={isSelected ? "text-white/90" : "text-muted text-[11px]"}>
-                                [{specsSummary}]
-                              </span>
-                            )}
-                            <span className={cn(
-                              "rounded-md px-1.5 py-0.5 text-[11.5px] font-black",
-                              isSelected ? "bg-white/20 text-white" : "bg-bg text-foreground"
-                            )}>
-                              {faNum(r.quantity_number)} {unitName(data.lookup.units, r.unit?.id)}
-                            </span>
-                          </button>
-                        );
-                      })}
-                    </div>
-                  )}
-                </div>
-              )}
-
               <div className="field md:col-span-2">
                 <label className="text-xs font-semibold text-muted">متریال *</label>
                 <Combobox
@@ -916,15 +582,13 @@ export function ChangeInventoryPage() {
                 )}
               </div>
               <div className="field">
-                <label className="text-xs font-semibold text-muted">
-                  برند {type === "PROJECT_TRANSFER" ? "(اختیاری)" : "*"}
-                </label>
+                <label className="text-xs font-semibold text-muted">برند *</label>
                 <Combobox
                   value={brandTxt}
                   items={data.lookup.brands.map((b) => b.name)}
                   allowAdd
                   addSuffix="به عنوان برند جدید"
-                  placeholder={type === "PROJECT_TRANSFER" ? "نام برند (اختیاری — برای اقلام بدون برند خالی بگذارید)" : "نام برند — از فهرست انتخاب یا نام جدید تایپ کنید"}
+                  placeholder="نام برند — از فهرست انتخاب یا نام جدید تایپ کنید"
                   onInputChange={setBrandTxt}
                   onChange={(it) => setBrandTxt(it.label)}
                 />
@@ -961,13 +625,11 @@ export function ChangeInventoryPage() {
                 />
               </div>
               <div className="field md:col-span-2">
-                <label className="text-xs font-semibold text-muted">
-                  مشخصه‌های فنی {type === "PROJECT_TRANSFER" ? "(اختیاری)" : "*"}
-                </label>
+                <label className="text-xs font-semibold text-muted">مشخصه‌های فنی *</label>
                 <MultiSelectCombobox
                   values={specsChips}
                   onChange={setSpecsChips}
-                  placeholder={type === "PROJECT_TRANSFER" ? "مشخصات فنی (اختیاری — مثلاً مسی، سایز و…)" : "نام مشخصه را تایپ کنید و Enter بزنید (مثلاً سایز)"}
+                  placeholder="نام مشخصه را تایپ کنید و Enter بزنید (مثلاً سایز)"
                   className="w-full"
                 />
               </div>
@@ -975,7 +637,7 @@ export function ChangeInventoryPage() {
                 <label className="text-xs font-semibold text-muted">یادداشت</label>
                 <textarea
                   className="w-full rounded-lg border border-line bg-panel px-3 py-2 text-xs sm:text-sm"
-                  placeholder={type === "PROJECT_TRANSFER" ? "توضیحات بار ارسالی، شماره بارنامه، راننده…" : "شماره فاکتور، تأمین‌کننده، توضیحات…"}
+                  placeholder="شماره فاکتور، تأمین‌کننده، توضیحات…"
                   value={note}
                   onChange={(e) => setNote(e.target.value)}
                 />
@@ -991,11 +653,10 @@ export function ChangeInventoryPage() {
               setRows={setRows}
               records={formRecords}
               unitNameFn={(id) => unitName(data.lookup.units, id)}
-              showMaterial={type === "WITHDRAWAL" || !matTxt.trim()}
               emptyMsg={
                 !whId ? "برای نمایش رکوردها، ابتدا انبار را انتخاب کنید."
-                  : (type !== "WITHDRAWAL" && !matTxt.trim()) ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
-                  : !formRecords.length ? (matTxt.trim() ? "برای این عبارت در انبار انتخابی رکوردی یافت نشد." : "هیچ کالای دارای موجودی در این انبار یافت نشد.")
+                  : !matTxt.trim() ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
+                  : !formRecords.length ? "برای این نام متریال در انبار انتخابی رکوردی وجود ندارد. ابتدا «موجودی اولیه» ثبت کنید."
                   : ""
               }
             />
@@ -1012,7 +673,6 @@ export function ChangeInventoryPage() {
               setRows={setRows}
               records={formRecords}
               unitNameFn={(id) => unitName(data.lookup.units, id)}
-              showMaterial={!matTxt.trim()}
               emptyMsg={
                 !fromId || !toId ? "برای نمایش موجودی‌ها، انبار مبدأ، مقصد و نام متریال را وارد کنید."
                   : !matTxt.trim() ? "نام متریال را تایپ کنید…"
@@ -1042,234 +702,11 @@ export function ChangeInventoryPage() {
               className="w-full sm:w-auto rounded-lg px-5 py-2.5 text-xs sm:text-[13px] font-bold text-white disabled:opacity-40 shadow-xs transition-transform active:scale-95"
               style={{ background: meta.color }}
             >
-              ✓ {busy ? "در حال ثبت…" : meta.label === "انتقال" ? "ثبت انتقال" : meta.label === "انتقال بین کارگاهی" ? "ثبت انتقال بین کارگاهی و کسر از انبار" : meta.label === "برگشت" ? "ثبت برگشت" : meta.label === "پیدا شده" ? "ثبت پیدا شدن" : `ثبت ${meta.label}`}
+              ✓ {busy ? "در حال ثبت…" : meta.label === "انتقال" ? "ثبت انتقال" : meta.label === "برگشت" ? "ثبت برگشت" : meta.label === "پیدا شده" ? "ثبت پیدا شدن" : `ثبت ${meta.label}`}
             </button>
           </div>
         </div>
 
-        {/* بخش سوابق انتقال‌های بین کارگاهی این پروژه */}
-        {type === "PROJECT_TRANSFER" && (
-          <div className="rounded-xl border border-line bg-panel p-3 sm:p-4 w-full shadow-2xs">
-            <div className="flex flex-wrap items-center justify-between gap-2 border-b border-line pb-3">
-              <div>
-                <h3 className="text-sm font-bold text-foreground">📋 سوابق انتقال‌های بین کارگاهی این پروژه</h3>
-                <p className="mt-0.5 text-[11.5px] text-muted">
-                  مصالح ارسالی به سایر پروژه‌ها؛ تا زمان تأیید تحویل در مقصد می‌توانید آن‌ها را ویرایش یا لغو کنید.
-                </p>
-              </div>
-              <button
-                type="button"
-                onClick={() => void loadTransfers()}
-                className="rounded-lg border border-line px-3 py-1.5 text-xs font-medium hover:bg-bg transition-colors"
-              >
-                🔄 به‌روزرسانی لیست
-              </button>
-            </div>
-
-            {loadingTransfers ? (
-              <div className="py-8 text-center text-xs text-muted">در حال بارگذاری سوابق…</div>
-            ) : !(transfers || []).length ? (
-              <div className="py-8 text-center text-xs text-muted">هیچ انتقال بین کارگاهی از این پروژه ثبت نشده است.</div>
-            ) : (
-              <div className="mt-3 overflow-x-auto">
-                <table className="w-full text-right text-xs min-w-[650px]">
-                  <thead>
-                    <tr className="border-b border-line text-muted">
-                      <th className="py-2.5 pe-3">تاریخ انتقال</th>
-                      <th className="py-2.5 pe-3">متریال / برند</th>
-                      <th className="py-2.5 pe-3">مشخصات فنی</th>
-                      <th className="py-2.5 pe-3">مقدار</th>
-                      <th className="py-2.5 pe-3">مبدأ → مقصد</th>
-                      <th className="py-2.5 pe-3">وضعیت</th>
-                      <th className="py-2.5 text-center">عملیات</th>
-                    </tr>
-                  </thead>
-                  <tbody className="divide-y divide-line/50">
-                    {(transfers || []).map((t) => {
-                      const isInTransit = t.status === "in_transit";
-                      return (
-                        <tr key={t.id} className="hover:bg-bg/40">
-                          <td className="py-3 pe-3 text-muted">{fmtDate(t.transfer_date)}</td>
-                          <td className="py-3 pe-3 font-semibold">
-                            <div>{t.material?.name}</div>
-                            <div className="text-[11px] text-muted font-normal">{t.brand?.name || "بدون برند"}</div>
-                          </td>
-                          <td className="py-3 pe-3 text-muted text-[11.5px]">
-                            {t.specs && Object.keys(t.specs).length > 0
-                              ? Object.entries(t.specs).map(([k, v]) => `${k}: ${v}`).join(" · ")
-                              : "—"}
-                          </td>
-                          <td className="py-3 pe-3 font-bold text-foreground">
-                            {faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code}
-                          </td>
-                          <td className="py-3 pe-3">
-                            <div className="text-[11px] text-muted">از: {t.from_warehouse?.name}</div>
-                            <div className="text-[12px] font-medium text-foreground">به: {t.to_project?.name}</div>
-                          </td>
-                          <td className="py-3 pe-3">
-                            {isInTransit ? (
-                              <span className="inline-flex items-center gap-1 rounded-full bg-amber-500/10 px-2.5 py-0.5 text-[11px] font-bold text-amber-700 border border-amber-500/20">
-                                🟡 در انتظار تأیید مقصد
-                              </span>
-                            ) : (
-                              <div className="flex flex-col gap-0.5">
-                                <span className="inline-flex items-center gap-1 rounded-full bg-emerald-500/10 px-2.5 py-0.5 text-[11px] font-bold text-emerald-700 border border-emerald-500/20">
-                                  🟢 تحویل‌شده در مقصد
-                                </span>
-                                {t.to_warehouse?.name && (
-                                  <span className="text-[10.5px] text-muted">انبار: {t.to_warehouse.name}</span>
-                                )}
-                              </div>
-                            )}
-                          </td>
-                          <td className="py-3 text-center">
-                            {isInTransit ? (
-                              <div className="flex items-center justify-center gap-1.5">
-                                <button
-                                  type="button"
-                                  onClick={() => {
-                                    setEditingTransfer(t);
-                                    setEditQty(String(t.quantity));
-                                    setEditToProjectId(t.to_project?.id || "");
-                                    setEditNote(t.note || "");
-                                  }}
-                                  className="rounded-lg border border-line px-2.5 py-1 text-[11.5px] font-medium hover:bg-bg transition-colors"
-                                  title="ویرایش انتقال"
-                                >
-                                  ✏️ ویرایش
-                                </button>
-                                <button
-                                  type="button"
-                                  onClick={() => setDeleteConfirmTransfer(t)}
-                                  className="rounded-lg border border-rose-200 bg-rose-50 px-2.5 py-1 text-[11.5px] font-medium text-rose-700 hover:bg-rose-100 transition-colors"
-                                  title="لغو انتقال"
-                                >
-                                  ✕ لغو
-                                </button>
-                              </div>
-                            ) : (
-                              <span className="inline-flex items-center gap-1 text-[11px] text-muted font-medium">
-                                🔒 قفل
-                              </span>
-                            )}
-                          </td>
-                        </tr>
-                      );
-                    })}
-                  </tbody>
-                </table>
-              </div>
-            )}
-          </div>
-        )}
-
-        {/* مودال ویرایش انتقال */}
-        {editingTransfer && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !editBusy && setEditingTransfer(null)}>
-            <div className="w-full max-w-md rounded-xl border border-line bg-panel p-4 sm:p-5 shadow-xl" onClick={(e) => e.stopPropagation()}>
-              <h3 className="mb-2 text-[14px] font-bold">✏️ ویرایش انتقال بین کارگاهی</h3>
-              <p className="mb-3 text-[11.5px] text-muted">
-                تغییر تعداد در انبار مبدأ تعدیل می‌گردد. پس از تحویل در مقصد، ویرایش غیرفعال خواهد شد.
-              </p>
-
-              <div className="flex flex-col gap-3">
-                <div className="rounded-lg border border-line bg-bg/50 p-2.5 text-xs">
-                  <div>متریال: <b>{editingTransfer.material?.name}</b></div>
-                  <div className="text-muted mt-0.5">انبار مبدأ: {editingTransfer.from_warehouse?.name}</div>
-                </div>
-
-                <div className="field">
-                  <label className="text-xs font-semibold text-muted">پروژه مقصد *</label>
-                  <select
-                    className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm font-medium"
-                    value={editToProjectId}
-                    onChange={(e) => setEditToProjectId(e.target.value)}
-                  >
-                    {(allProjects || [])
-                      .filter((p) => p.id !== user?.project_id)
-                      .map((p) => (
-                        <option key={p.id} value={p.id}>
-                          {p.name}
-                        </option>
-                      ))}
-                  </select>
-                </div>
-
-                <div className="field">
-                  <label className="text-xs font-semibold text-muted">
-                    تعداد ({editingTransfer.unit?.name_fa || editingTransfer.unit?.code}) *
-                  </label>
-                  <input
-                    inputMode="decimal"
-                    className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm ltr"
-                    value={editQty}
-                    onChange={(e) => setEditQty(e.target.value)}
-                  />
-                </div>
-
-                <div className="field">
-                  <label className="text-xs font-semibold text-muted">یادداشت</label>
-                  <textarea
-                    className="w-full rounded-lg border border-line bg-panel px-3 py-2 text-xs sm:text-sm"
-                    value={editNote}
-                    onChange={(e) => setEditNote(e.target.value)}
-                  />
-                </div>
-              </div>
-
-              <div className="mt-4 flex items-center justify-end gap-2 border-t border-line pt-3">
-                <button
-                  type="button"
-                  className="rounded-lg border border-line px-4 py-2 text-[12.5px]"
-                  onClick={() => setEditingTransfer(null)}
-                  disabled={editBusy}
-                >
-                  انصراف
-                </button>
-                <button
-                  type="button"
-                  className="rounded-lg bg-blue-600 px-4 py-2 text-[12.5px] font-bold text-white hover:bg-blue-700 disabled:opacity-50"
-                  onClick={() => void handleSaveEdit()}
-                  disabled={editBusy}
-                >
-                  {editBusy ? "در حال ذخیره…" : "ذخیره تغییرات"}
-                </button>
-              </div>
-            </div>
-          </div>
-        )}
-
-        {/* دیالوگ تأیید لغو انتقال */}
-        {deleteConfirmTransfer && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !deleteBusy && setDeleteConfirmTransfer(null)}>
-            <div className="w-full max-w-sm rounded-xl border border-line bg-panel p-4 sm:p-5 shadow-xl" onClick={(e) => e.stopPropagation()}>
-              <h3 className="mb-2 text-[14px] font-bold text-rose-600">⚠️ لغو انتقال بین کارگاهی</h3>
-              <p className="mb-3 text-[12px] leading-6 text-foreground">
-                آیا از لغو این انتقال اطمینان دارید؟ با لغو انتقال، مقدار <b>{faNum(deleteConfirmTransfer.quantity)} {deleteConfirmTransfer.unit?.name_fa || deleteConfirmTransfer.unit?.code}</b> از متریال <b>{deleteConfirmTransfer.material?.name}</b> فوراً به انبار مبدأ ({deleteConfirmTransfer.from_warehouse?.name}) بازگردانده خواهد شد.
-              </p>
-
-              <div className="mt-4 flex items-center justify-end gap-2 border-t border-line pt-3">
-                <button
-                  type="button"
-                  className="rounded-lg border border-line px-4 py-2 text-[12.5px]"
-                  onClick={() => setDeleteConfirmTransfer(null)}
-                  disabled={deleteBusy}
-                >
-                  انصراف
-                </button>
-                <button
-                  type="button"
-                  className="rounded-lg bg-rose-600 px-4 py-2 text-[12.5px] font-bold text-white hover:bg-rose-700 disabled:opacity-50"
-                  onClick={() => void handleConfirmDelete()}
-                  disabled={deleteBusy}
-                >
-                  {deleteBusy ? "در حال لغو…" : "بله، لغو و بازگشت موجودی"}
-                </button>
-              </div>
-            </div>
-          </div>
-        )}
-
         {/* مودال تأیید شمارش موجودی */}
         {countConfirm && (
           <div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !countBusy && setCountConfirm(null)}>
@@ -1334,80 +771,64 @@ export function ChangeInventoryPage() {
         )}
 
         <div className="text-[11px] text-muted">
-          {type === "PROJECT_TRANSFER"
-            ? "انتقال بین کارگاهی: موجودی فوراً از انبار مبدأ کسر شده و پس از تأیید تحویل توسط مدیر پروژه مقصد، وارد انبار مقصد می‌شود."
-            : isTransfer
-              ? "انتقال فقط بین انبارهای یک پروژه ممکن است. با ثبت، خروجی از مبدأ و ورودی به مقصد هم‌زمان ثبت می‌شود."
-              : `تاریخ انتخابی: ${jalDateLabel(new Date(dateInput))} — با «${jalDateLabel(new Date())}» برابر است.`}
+          {isTransfer ? "انتقال فقط بین انبارهای یک پروژه ممکن است. با ثبت، خروجی از مبدأ و ورودی به مقصد هم‌زمان ثبت می‌شود." : `تاریخ انتخابی: ${jalDateLabel(new Date(dateInput))} — با «${jalDateLabel(new Date())}» برابر است.`}
         </div>
       </PageLayout>
     </div>
   );
 }
 
-function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg, showMaterial = true }: {
+function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg }: {
   isCount: boolean;
   rows: RowDraft[];
   setRows: (r: RowDraft[]) => void;
-  records: { id: string; material?: { id: string; name: string }; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
+  records: { id: string; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
   unitNameFn: (id: number | null | undefined) => string;
   emptyMsg: string;
-  showMaterial?: boolean;
 }) {
   if (emptyMsg) return <div className="rounded-lg border border-dashed border-line p-4 text-[12.5px] text-muted">{emptyMsg}</div>;
   return (
-    <div>
-      <div className="overflow-x-auto max-h-[420px] overflow-y-auto border border-line rounded-lg">
-        <table className="w-full text-[12.5px] min-w-[560px]">
-          <thead className="sticky top-0 bg-panel z-10 shadow-2xs border-b border-line">
-            <tr className="text-right text-muted">
-              {showMaterial && <th className="py-2.5 px-3">متریال</th>}
-              <th className="py-2.5 px-3">مشخصه‌ها</th>
-              <th className="py-2.5 px-3">برند</th>
-              <th className="py-2.5 px-3">واحد</th>
-              <th className="py-2.5 px-3">موجودی فعلی</th>
-              <th className="py-2.5 px-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
-              <th className="py-2.5 px-3">یادداشت</th>
+    <div className="overflow-x-auto">
+      <table className="w-full text-[12.5px] min-w-[500px]">
+        <thead>
+          <tr className="border-b border-line text-right text-muted">
+            <th className="py-2 pe-3">مشخصه‌ها</th>
+            <th className="py-2 pe-3">برند</th>
+            <th className="py-2 pe-3">واحد</th>
+            <th className="py-2 pe-3">موجودی فعلی</th>
+            <th className="py-2 pe-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
+            <th className="py-2">یادداشت</th>
+          </tr>
+        </thead>
+        <tbody>
+          {records.map((r, i) => (
+            <tr key={r.id} className="border-b border-line/50">
+              <td className="py-2 pe-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
+              <td className="py-2 pe-3">{r.brand?.name || "—"}</td>
+              <td className="py-2 pe-3">{unitNameFn(r.unit?.id)}</td>
+              <td className="py-2 pe-3 font-bold">{faNum(r.quantity_number)}</td>
+              <td className="py-2 pe-3">
+                <input
+                  inputMode="decimal"
+                  className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr"
+                  placeholder={isCount ? "شمارش‌شده" : "۰"}
+                  value={isCount && rows[i]?.qty === "" ? String(r.quantity_number) : (rows[i]?.qty || "")}
+                  onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, qty: e.target.value } : x)))}
+                />
+              </td>
+              <td className="py-2">
+                <input
+                  className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm"
+                  placeholder="توضیح (اختیاری)"
+                  value={rows[i]?.note || ""}
+                  onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
+                />
+              </td>
             </tr>
-          </thead>
-          <tbody className="divide-y divide-line/40">
-            {records.map((r, i) => (
-              <tr key={r.id} className="hover:bg-bg/40 transition-colors">
-                {showMaterial && (
-                  <td className="py-2 px-3 font-bold text-ink">
-                    {r.material?.name || "—"}
-                  </td>
-                )}
-                <td className="py-2 px-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
-                <td className="py-2 px-3">{r.brand?.name || "—"}</td>
-                <td className="py-2 px-3">{unitNameFn(r.unit?.id)}</td>
-                <td className="py-2 px-3 font-bold text-ink">{faNum(r.quantity_number)}</td>
-                <td className="py-2 px-3">
-                  <input
-                    inputMode="decimal"
-                    className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr focus:border-accent"
-                    placeholder={isCount ? "شمارش‌شده" : "۰"}
-                    value={isCount && rows[i]?.qty === "" ? String(r.quantity_number) : (rows[i]?.qty || "")}
-                    onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, qty: e.target.value } : x)))}
-                  />
-                </td>
-                <td className="py-2 px-3">
-                  <input
-                    className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm focus:border-accent"
-                    placeholder="توضیح (اختیاری)"
-                    value={rows[i]?.note || ""}
-                    onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
-                  />
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
-      <div className="mt-2 flex items-center justify-between text-[11px] text-muted">
-        <span>ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</span>
-        <span>{faNum(records.length)} قلم کالا</span>
-      </div>
+          ))}
+        </tbody>
+      </table>
+      <div className="mt-2 text-[11px] text-muted">ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</div>
     </div>
   );
 }

frontend/src/pages/Inventory/DailyControlPage.tsx

@@ -129,10 +129,9 @@ export function DailyControlPage() {
   const wGroups = useMemo(() => {
     const gmap = new Map<string, { recId: string; q: number; last: string; tx: InventoryTransaction }>();
     withdrawals.forEach((t) => {
-      const gKey = `${t.inventory_id}__${t.delivered_to || ""}`;
-      const g = gmap.get(gKey);
+      const g = gmap.get(t.inventory_id);
       if (!g) {
-        gmap.set(gKey, { recId: gKey, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
+        gmap.set(t.inventory_id, { recId: t.inventory_id, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
       } else {
         g.q += Math.abs(t.quantity_number || 0);
         if (t.transaction_date > g.last) g.last = t.transaction_date;
@@ -325,12 +324,6 @@ export function DailyControlPage() {
                             whName(data.warehouses, g.tx.warehouse_id)
                           ].filter(Boolean).join(" · ")}
                         </span>
-                        {g.tx.delivered_to && (
-                          <span className="inline-flex items-center gap-1 mt-1.5 text-[11px] font-semibold text-blue-700 bg-blue-50/80 border border-blue-200/60 rounded px-1.5 py-0.5 w-fit">
-                            <span className="text-slate-500 font-normal">تحویل به:</span>
-                            <span>{g.tx.delivered_to}</span>
-                          </span>
-                        )}
                       </span>
                       <span className="text-xs font-bold text-rose-600 tabular-nums">
                         {faNum(g.q)} {unitName(data.lookup.units, g.tx.unit?.id)}

frontend/src/pages/Units/UnitsPage.tsx

@@ -1,6 +1,8 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
+import { Link } from "react-router-dom";
 import { toast } from "sonner";
 import {
+  Building2,
   ChevronDown,
   Link2,
   Pencil,
@@ -12,7 +14,7 @@ import {
   TriangleAlert,
 } from "lucide-react";
 import type { StandardConversion } from "../../lib/types";
-import { api, apiV26, nextId, type BrandLinkRow, type MaterialUnitRow } from "../../lib/api";
+import { api, apiV26, nextId, type BrandLinkRow, type MaterialSupplier, type MaterialUnitRow } from "../../lib/api";
 import {
   refreshProcurementStore,
   useDeleteStandardConversion,
@@ -102,6 +104,12 @@ export function UnitsPage() {
   const [rowsLoading, setRowsLoading] = useState(false);
   const [brandLinks, setBrandLinks] = useState<BrandLinkRow[]>([]);
 
+  // تأمین‌کننده‌های متریال انتخاب‌شده — داده از GET /materials/{id}/suppliers
+  const [materialSuppliers, setMaterialSuppliers] = useState<MaterialSupplier[]>([]);
+  const [suppliersLoading, setSuppliersLoading] = useState(false);
+  // کلید پیشگیری از flicker: قبل از رسیدن پاسخ جدید، empty state نشان نمی‌دهیم
+  const [suppliersLoadedId, setSuppliersLoadedId] = useState<string | null>(null);
+
   // واحدها و برندهای سراسری (فهرست دیتابیس)
   const [units, setUnits] = useState<UnitLite[]>([]);
   const [allBrands, setAllBrands] = useState<string[]>([]);
@@ -253,6 +261,7 @@ export function UnitsPage() {
     if (!materialId) {
       setRows([]);
       setBrandLinks([]);
+      setMaterialSuppliers([]);
       return;
     }
     void loadRows(materialId);
@@ -263,6 +272,33 @@ export function UnitsPage() {
     setFormBrand("");
   }, [materialId, loadRows]);
 
+  // واکشی تأمین‌کننده‌های متصل به متریال انتخاب‌شده
+  useEffect(() => {
+    if (!materialId) {
+      setMaterialSuppliers([]);
+      setSuppliersLoadedId(null);
+      return;
+    }
+    let alive = true;
+    setSuppliersLoading(true);
+    api.materials
+      .listSuppliers(materialId)
+      .then((list) => {
+        if (alive) {
+          setMaterialSuppliers(list);
+          setSuppliersLoadedId(materialId);
+        }
+      })
+      .catch((err: unknown) => {
+        if (!alive) return;
+        setMaterialSuppliers([]);
+        setSuppliersLoadedId(materialId);
+        toast.error(err instanceof Error ? err.message : "خواندن تأمین‌کننده‌های متریال ناموفق بود");
+      })
+      .finally(() => { if (alive) setSuppliersLoading(false); });
+    return () => { alive = false; };
+  }, [materialId]);
+
   const brandNameFor = (row: MaterialUnitRow): string => {
     if (!row.brand_material_id) return "";
     return brandLinks.find((b) => b.id === row.brand_material_id)?.brand_name || "";
@@ -449,7 +485,7 @@ export function UnitsPage() {
   return (
     <div className="min-h-screen">
       <Header
-        title="ضرایب تبدیل"
+        title="اقلام و ضرایب"
         sub="متریال را انتخاب کنید — واحد مرجع و ضریب تبدیل همان متریال"
         backTo="/"
         backLabel="بازگشت به دفتر"
@@ -546,6 +582,77 @@ export function UnitsPage() {
               </div>
             ) : (
               <>
+                {/* ── تامین‌کنندگان متریال ── */}
+                <div className="mb-5 overflow-hidden rounded-xl border border-line bg-panel shadow-sm">
+                  {/* سرصفحه — همیشه نمایش داده می‌شود */}
+                  <div className="border-b border-line px-4 py-3">
+                    <h4 className="text-[14px] font-bold text-gray-900">تامین‌کنندگان متریال</h4>
+                  </div>
+
+                  {/* محتوا — min-h برای جلوگیری از layout shift */}
+                  <div className="min-h-[80px] p-4 transition-opacity duration-300 ease-in-out">
+                    {suppliersLoading || materialId !== suppliersLoadedId ? (
+                      /* اسپینر — نه empty state — تا پاسخ API برسد */
+                      <div className="flex h-[80px] items-center justify-center">
+                        <span className="h-5 w-5 animate-spin rounded-full border-2 border-muted border-t-transparent" />
+                      </div>
+                    ) : materialSuppliers.length === 0 ? (
+                      <p className="flex h-[80px] items-center justify-center text-sm text-muted">
+                        تامین‌کننده‌ای برای این متریال ثبت نشده است
+                      </p>
+                    ) : (
+                      <div className="flex flex-col gap-3 mt-4 max-h-[320px] overflow-y-auto">
+                        {materialSuppliers.map((s) => (
+                          <div
+                            key={s.id}
+                            className="flex flex-col md:flex-row md:items-center justify-between p-4 bg-white border border-gray-200 rounded-xl shadow-sm gap-4 w-full"
+                          >
+                            {/* نام تامین‌کننده */}
+                            <div className="flex-1 flex flex-col gap-1 text-right">
+                              <span className="text-xs font-medium text-gray-900">نام تامین‌کننده</span>
+                              <Link
+                                to={`/suppliers/${s.id}`}
+                                className="font-medium text-accent hover:underline decoration-dashed"
+                              >
+                                {s.name}
+                              </Link>
+                            </div>
+                            {/* نام مسئول */}
+                            <div className="flex-1 flex flex-col gap-1 text-right">
+                              <span className="text-xs font-medium text-gray-900">نام مسئول</span>
+                              <span className="text-gray-500">
+                                {s.contact_person || <span className="text-gray-500">ثبت نشده</span>}
+                              </span>
+                            </div>
+                            {/* تلفن */}
+                            <div className="flex-1 flex flex-col gap-1 text-right">
+                              <span className="text-xs font-medium text-gray-900">تلفن</span>
+                              {s.phone ? (
+                                <a
+                                  href={`tel:${s.phone}`}
+                                  dir="ltr"
+                                  className="font-medium text-accent hover:underline decoration-dashed"
+                                >
+                                  {s.phone}
+                                </a>
+                              ) : (
+                                <span className="text-gray-500">ثبت نشده</span>
+                              )}
+                            </div>
+                            {/* محل */}
+                            <div className="flex-1 flex flex-col gap-1 text-right">
+                              <span className="text-xs font-medium text-gray-900">محل</span>
+                              <span className="text-gray-500">
+                                {s.location || <span className="text-gray-500">ثبت نشده</span>}
+                              </span>
+                            </div>
+                          </div>
+                        ))}
+                      </div>
+                    )}
+                  </div>
+                </div>
+
                 {/* واحد مرجع متریال */}
                 <div className="ref-unit-box">
                   <div className="ref-title">
@@ -587,119 +694,6 @@ export function UnitsPage() {
                   </div>
                 </div>
 
-                {/* ضرایب متریال */}
-                <h4 className="sec-title">
-                  <Repeat className="me-1 inline h-4 w-4 text-accent" /> ضریب‌های تبدیل
-                </h4>
-                {rowsLoading ? (
-                  <div className="conv-empty">در حال بارگذاری…</div>
-                ) : !rows.length ? (
-                  <div className="conv-empty">هنوز ضریبی برای این متریال ثبت نشده است.</div>
-                ) : (
-                  rows.map((r) => (
-                    <div key={r.id}>
-                      <div className="cg-head">
-                        {unitDisplay(r.unit) || `واحد #${r.unit_id}`} ← {ref}
-                      </div>
-                      <div className="conv-row">
-                        <span className="cv-brand">{brandNameFor(r) || "همه برندها"}</span>
-                        <span className="cv-factor">{faNum(r.conversion_factor)}</span>
-                        <span className="cv-arrow">×</span>
-                        <span className="cv-unit">{ref}</span>
-                        <span className="conv-actions">
-                          <button type="button" title="ویرایش" onClick={() => startEdit(r)}>
-                            <Pencil className="h-3.5 w-3.5" />
-                          </button>
-                          <button type="button" title="حذف" onClick={() => void deleteMu(r)}>
-                            <Trash2 className="h-3.5 w-3.5" />
-                          </button>
-                        </span>
-                      </div>
-                    </div>
-                  ))
-                )}
-
-                {/* فرم افزودن ضریب */}
-                <div className="add-conv">
-                  <h4 className="mb-2 text-[13.5px] font-bold">
-                    {editingId ? (
-                      <>
-                        <Pencil className="me-1 inline h-3.5 w-3.5" /> ویرایش ضریب تبدیل
-                      </>
-                    ) : (
-                      <>
-                        <Plus className="me-1 inline h-3.5 w-3.5" /> افزودن ضریب تبدیل
-                      </>
-                    )}
-                  </h4>
-                  <div className="grid grid-cols-1 gap-2 sm:grid-cols-[1.2fr_0.6fr_1fr_0.8fr_auto] sm:items-end">
-                    <div className="field">
-                      <label>واحد پیشنهادشده</label>
-                      <Combobox
-                        value={formUnit}
-                        onChange={(it) => setFormUnit(it.label)}
-                        items={units.map((u) => unitDisplay(u)).filter(Boolean)}
-                        allowAdd
-                        addSuffix="به عنوان واحد جدید"
-                        placeholder="مثلاً حلقه"
-                        onInputChange={setFormUnit}
-                      />
-                    </div>
-                    <div className="field">
-                      <label>ضریب</label>
-                      <NumberInput
-                        value={factorNum()}
-                        onChange={(n) => setFormFactor(n != null ? String(n) : "")}
-                        placeholder="مثلاً 0.98"
-                        inputMode="decimal"
-                      />
-                    </div>
-                    <div className="field">
-                      <label>برند (خالی = همه برندها)</label>
-                      <Combobox
-                        value={formBrand}
-                        onChange={(it) => setFormBrand(it.label)}
-                        items={allBrands}
-                        allowAdd
-                        disabled={!!editingId}
-                        addSuffix="به عنوان برند جدید"
-                        placeholder="مثلاً راجین"
-                        onInputChange={setFormBrand}
-                      />
-                    </div>
-                    <div className="field">
-                      <label>به واحد (مرجع)</label>
-                      <input
-                        type="text"
-                        className="h-9 w-full rounded-lg border border-line bg-slate-bg px-3 text-sm text-muted"
-                        value={ref || "مرجع"}
-                        placeholder="مرجع"
-                        readOnly
-                      />
-                    </div>
-                    <div className="flex items-center gap-1.5">
-                      <Button size="sm" onClick={() => void saveConv()}>
-                        {editingId ? "ذخیره تغییرات" : "افزودن"}
-                      </Button>
-                      {editingId && (
-                        <Button
-                          size="sm"
-                          variant="slate"
-                          onClick={() => {
-                            setEditingId(null);
-                            setFormUnit("");
-                            setFormFactor("");
-                            setFormBrand("");
-                          }}
-                        >
-                          انصراف
-                        </Button>
-                      )}
-                    </div>
-                  </div>
-                  <div className="conv-live">{convLive}</div>
-                </div>
-
                 {/* واحدهای ناشناخته */}
                 {unknownUnits.length > 0 && (
                   <>
@@ -829,6 +823,121 @@ export function UnitsPage() {
                     تبدیل ثابت برای همه‌ی متریال‌ها اعمال می‌شود؛ ضریب یعنی: ۱ از واحد = ضریب × به واحد
                   </div>
                 </div>
+
+
+                {/* ضرایب متریال */}
+                <h4 className="sec-title">
+                  <Repeat className="me-1 inline h-4 w-4 text-accent" /> ضریب‌های تبدیل
+                </h4>
+                {rowsLoading ? (
+                  <div className="conv-empty">در حال بارگذاری…</div>
+                ) : !rows.length ? (
+                  <div className="conv-empty">هنوز ضریبی برای این متریال ثبت نشده است.</div>
+                ) : (
+                  rows.map((r) => (
+                    <div key={r.id}>
+                      <div className="cg-head">
+                        {unitDisplay(r.unit) || `واحد #${r.unit_id}`} ← {ref}
+                      </div>
+                      <div className="conv-row">
+                        <span className="cv-brand">{brandNameFor(r) || "همه برندها"}</span>
+                        <span className="cv-factor">{faNum(r.conversion_factor)}</span>
+                        <span className="cv-arrow">×</span>
+                        <span className="cv-unit">{ref}</span>
+                        <span className="conv-actions">
+                          <button type="button" title="ویرایش" onClick={() => startEdit(r)}>
+                            <Pencil className="h-3.5 w-3.5" />
+                          </button>
+                          <button type="button" title="حذف" onClick={() => void deleteMu(r)}>
+                            <Trash2 className="h-3.5 w-3.5" />
+                          </button>
+                        </span>
+                      </div>
+                    </div>
+                  ))
+                )}
+
+                {/* فرم افزودن ضریب */}
+                <div className="add-conv">
+                  <h4 className="mb-2 text-[13.5px] font-bold">
+                    {editingId ? (
+                      <>
+                        <Pencil className="me-1 inline h-3.5 w-3.5" /> ویرایش ضریب تبدیل
+                      </>
+                    ) : (
+                      <>
+                        <Plus className="me-1 inline h-3.5 w-3.5" /> افزودن ضریب تبدیل
+                      </>
+                    )}
+                  </h4>
+                  <div className="grid grid-cols-1 gap-2 sm:grid-cols-[1.2fr_0.6fr_1fr_0.8fr_auto] sm:items-end">
+                    <div className="field">
+                      <label>واحد پیشنهادشده</label>
+                      <Combobox
+                        value={formUnit}
+                        onChange={(it) => setFormUnit(it.label)}
+                        items={units.map((u) => unitDisplay(u)).filter(Boolean)}
+                        allowAdd
+                        addSuffix="به عنوان واحد جدید"
+                        placeholder="مثلاً حلقه"
+                        onInputChange={setFormUnit}
+                      />
+                    </div>
+                    <div className="field">
+                      <label>ضریب</label>
+                      <NumberInput
+                        value={factorNum()}
+                        onChange={(n) => setFormFactor(n != null ? String(n) : "")}
+                        placeholder="مثلاً 0.98"
+                        inputMode="decimal"
+                      />
+                    </div>
+                    <div className="field">
+                      <label>برند (خالی = همه برندها)</label>
+                      <Combobox
+                        value={formBrand}
+                        onChange={(it) => setFormBrand(it.label)}
+                        items={allBrands}
+                        allowAdd
+                        disabled={!!editingId}
+                        addSuffix="به عنوان برند جدید"
+                        placeholder="مثلاً راجین"
+                        onInputChange={setFormBrand}
+                      />
+                    </div>
+                    <div className="field">
+                      <label>به واحد (مرجع)</label>
+                      <input
+                        type="text"
+                        className="h-9 w-full rounded-lg border border-line bg-slate-bg px-3 text-sm text-muted"
+                        value={ref || "مرجع"}
+                        placeholder="مرجع"
+                        readOnly
+                      />
+                    </div>
+                    <div className="flex items-center gap-1.5">
+                      <Button size="sm" onClick={() => void saveConv()}>
+                        {editingId ? "ذخیره تغییرات" : "افزودن"}
+                      </Button>
+                      {editingId && (
+                        <Button
+                          size="sm"
+                          variant="slate"
+                          onClick={() => {
+                            setEditingId(null);
+                            setFormUnit("");
+                            setFormFactor("");
+                            setFormBrand("");
+                          }}
+                        >
+                          انصراف
+                        </Button>
+                      )}
+                    </div>
+                  </div>
+                  <div className="conv-live">{convLive}</div>
+                </div>
+
               </>
             )}
           </section>

frontend/tsconfig.app.json

@@ -1,10 +1,11 @@
 {
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "es2023",
-    "lib": ["ES2023", "DOM"],
+    "target": "ESNext",
+    "lib": ["ESNext", "DOM"],
     "module": "esnext",
     "types": ["vite/client"],
+    "strict": true,
     "allowArbitraryExtensions": true,
     "skipLibCheck": true,
 
@@ -23,4 +24,4 @@
     "noFallthroughCasesInSwitch": true
   },
   "include": ["src"]
-}
+}

sql/migration.sql

@@ -455,7 +455,6 @@ CREATE TABLE inventory_transactions (
     physical_qty          NUMERIC(18,6),
     transfer_pair_id      UUID,
     performed_by          TEXT,
-    delivered_to          TEXT,
     transaction_date      TIMESTAMPTZ                  NOT NULL DEFAULT now(),
     note                  TEXT,
     created_at            TIMESTAMPTZ                  NOT NULL DEFAULT now()
@@ -552,35 +551,6 @@ CREATE TABLE standard_conversions (
     CONSTRAINT uq_standard_conversion UNIQUE (from_unit, to_unit)
 );
 
--- Inter-project material transfers
-CREATE TABLE project_transfers (
-    id                  UUID            NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
-    from_project_id     UUID            NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
-    from_warehouse_id   UUID            NOT NULL REFERENCES warehouses(id) ON DELETE RESTRICT,
-    to_project_id       UUID            NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
-    material_id         UUID            NOT NULL REFERENCES materials(id) ON DELETE RESTRICT,
-    brand_id            UUID            REFERENCES brands(id) ON DELETE SET NULL,
-    unit_id             INTEGER         NOT NULL REFERENCES units(id) ON DELETE RESTRICT,
-    quantity            NUMERIC(18,6)   NOT NULL CHECK (quantity > 0),
-    specs               JSONB           NOT NULL DEFAULT '{}'::jsonb,
-    specs_hash          TEXT            NOT NULL DEFAULT 'default',
-    note                TEXT,
-    status              TEXT            NOT NULL DEFAULT 'in_transit' CHECK (status IN ('in_transit', 'received', 'cancelled')),
-    out_transaction_id  UUID            REFERENCES inventory_transactions(id) ON DELETE SET NULL,
-    transfer_date       TIMESTAMPTZ     NOT NULL DEFAULT now(),
-    transferred_by      TEXT,
-    received_at         TIMESTAMPTZ,
-    received_by         TEXT,
-    to_warehouse_id     UUID            REFERENCES warehouses(id) ON DELETE SET NULL,
-    receipt_allocations JSONB,
-    created_at          TIMESTAMPTZ     NOT NULL DEFAULT now(),
-    updated_at          TIMESTAMPTZ     NOT NULL DEFAULT now()
-);
-
-CREATE INDEX idx_project_transfers_from ON project_transfers(from_project_id, status);
-CREATE INDEX idx_project_transfers_to ON project_transfers(to_project_id, status);
-
-
 -- ============================================================================
 -- UPDATED_AT TRIGGER (auto-set updated_at on row modification)
 -- ============================================================================
@@ -609,10 +579,6 @@ CREATE TRIGGER trg_quote_attachments_updated_at
     BEFORE UPDATE ON quote_attachments
     FOR EACH ROW EXECUTE FUNCTION set_updated_at();
 
-CREATE TRIGGER trg_project_transfers_updated_at
-    BEFORE UPDATE ON project_transfers
-    FOR EACH ROW EXECUTE FUNCTION set_updated_at();
-
 -- ============================================================================
 -- AUTOMATION TRIGGERS (v2.5 + v2.6)
 -- ============================================================================