v1.6.8: remove offer exchange rate, add invoice item description, offer filters, table animations

- Remove exchange_rate and exchange_rate_date from quotations (schema, service, PDF, form)
- Add item_description field to invoice_items (schema, migration, service, form, PDF)
- Add offer status/customer/order filters with tab-based UI
- Clean up offer statuses to active/ordered/invalidated
- Allow invalidate action for non-ordered offers (not just expired)
- Add fade animations on offers and invoices table data changes

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-ts",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "",
   "main": "dist/server.js",
   "scripts": {
@@ -18,7 +18,6 @@
     "db:studio": "prisma studio",
     "test": "vitest run",
     "test:watch": "vitest",
-    "bones": "boneyard-js build http://localhost:3000",
     "seed": "tsx prisma/seed.ts"
   },
   "prisma": {
@@ -42,7 +41,6 @@
     "@tanstack/react-query": "^5.100.5",
     "@types/jsdom": "^28.0.1",
     "bcryptjs": "^3.0.3",
-    "boneyard-js": "^1.8.1",
     "date-fns": "^4.1.0",
     "dompurify": "^3.3.3",
     "dotenv": "^17.3.1",

prisma/migrations/20260528000000_remove_offer_exchange_rate/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE `quotations` DROP COLUMN `exchange_rate`;
+ALTER TABLE `quotations` DROP COLUMN `exchange_rate_date`;

prisma/migrations/20260528000001_add_invoice_item_description/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `invoice_items` ADD COLUMN `item_description` TEXT NULL;

prisma/schema.prisma

@@ -154,6 +154,7 @@ model invoice_items {
   id          Int      @id @default(autoincrement())
   invoice_id  Int
   description       String?  @db.VarChar(500)
+  item_description String?  @db.Text
   quantity          Decimal? @default(1.000) @db.Decimal(12, 3)
   unit        String?  @db.VarChar(20)
   unit_price  Decimal? @default(0.00) @db.Decimal(12, 2)
@@ -397,8 +398,6 @@ model quotations {
   language           String?           @default("cs") @db.VarChar(5)
   vat_rate           Decimal?          @default(21.00) @db.Decimal(5, 2)
   apply_vat          Boolean?          @default(true)
-  exchange_rate      Decimal?          @default(1.0000) @db.Decimal(10, 4)
-  exchange_rate_date DateTime?         @db.Date
   order_id           Int?
   status             String            @default("active") @db.VarChar(20)
   scope_title        String?           @db.VarChar(500)

src/admin/lib/queries/invoices.ts

@@ -34,7 +34,7 @@ export interface InvoiceStats {
 export interface InvoiceItem {
   id?: number;
   description: string;
-  item_description?: string;
+  item_description: string;
   quantity: number;
   unit: string;
   unit_price: number;

src/admin/lib/queries/offers.ts

@@ -70,6 +70,9 @@ export const offerListOptions = (filters: {
   order?: string;
   page?: number;
   perPage?: number;
+  status?: string;
+  customer_id?: number;
+  has_order?: string;
 }) =>
   queryOptions({
     queryKey: ["offers", "list", filters],
@@ -80,6 +83,10 @@ export const offerListOptions = (filters: {
       if (filters.order) params.set("order", filters.order);
       if (filters.page) params.set("page", String(filters.page));
       if (filters.perPage) params.set("per_page", String(filters.perPage));
+      if (filters.status) params.set("status", filters.status);
+      if (filters.customer_id)
+        params.set("customer_id", String(filters.customer_id));
+      if (filters.has_order) params.set("has_order", filters.has_order);
       const qs = params.toString();
       return paginatedJsonQuery(`/api/admin/offers${qs ? `?${qs}` : ""}`);
     },
@@ -127,7 +134,6 @@ export interface OfferDetailData {
   language: string;
   vat_rate: number;
   apply_vat: boolean;
-  exchange_rate: string;
   scope_title: string;
   scope_description: string;
   items?: OfferItemData[];

src/admin/offers.css

@@ -627,3 +627,33 @@
   margin-top: 0.2rem;
   opacity: 0.8;
 }
+
+/* Filters */
+.admin-filters {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1rem;
+  align-items: flex-start;
+}
+
+.admin-filter-group {
+  display: flex;
+  flex-direction: column;
+  gap: 0.35rem;
+}
+
+.admin-filter-label {
+  font-size: 0.75rem;
+  font-weight: 600;
+  color: var(--text-tertiary);
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+}
+
+.admin-filter-group .admin-tabs {
+  flex-wrap: wrap;
+}
+
+.admin-filter-group .admin-form-select {
+  min-width: 10rem;
+}

src/admin/pages/InvoiceDetail.tsx

@@ -10,8 +10,6 @@ import DOMPurify from "dompurify";
 import { useAlert } from "../context/AlertContext";
 import { useAuth } from "../context/AuthContext";
 import Forbidden from "../components/Forbidden";
-import { Skeleton } from "boneyard-js/react";
-import InvoiceDetailFixture from "../fixtures/InvoiceDetailFixture";
 import FormField from "../components/FormField";
 import AdminDatePicker from "../components/AdminDatePicker";
 import ConfirmModal from "../components/ConfirmModal";
@@ -74,6 +72,7 @@ interface InvoiceItem {
   id?: number;
   _key: string;
   description: string;
+  item_description: string;
   quantity: number;
   unit: string;
   unit_price: number;
@@ -166,7 +165,10 @@ function SortableInvoiceRow({
         </button>
       </td>
       <td className="text-tertiary text-center fw-500">{index + 1}</td>
-      <td>
+      <td style={{ verticalAlign: "top" }}>
+        <div
+          style={{ display: "flex", flexDirection: "column", gap: "0.25rem" }}
+        >
           <input
             type="text"
             value={item.description}
@@ -174,6 +176,17 @@ function SortableInvoiceRow({
             className="admin-form-input fw-500"
             placeholder="Popis položky..."
           />
+          <input
+            type="text"
+            value={item.item_description}
+            onChange={(e) =>
+              onUpdate(index, "item_description", e.target.value)
+            }
+            className="admin-form-input"
+            placeholder="Podrobný popis (volitelný)"
+            style={{ fontSize: "0.8rem", opacity: 0.8 }}
+          />
+        </div>
       </td>
       <td>
         <input
@@ -281,6 +294,7 @@ export default function InvoiceDetail() {
     (): InvoiceItem => ({
       _key: `inv-${++keyCounterRef.current}`,
       description: "",
+      item_description: "",
       quantity: 1,
       unit: "ks",
       unit_price: 0,
@@ -508,6 +522,7 @@ export default function InvoiceDetail() {
             _key: `inv-${++keyCounterRef.current}`,
             id: item.id,
             description: item.description || "",
+            item_description: item.item_description || "",
             quantity: Number(item.quantity) || 1,
             unit: item.unit || "",
             unit_price: Number(item.unit_price) || 0,
@@ -587,6 +602,7 @@ export default function InvoiceDetail() {
           orderItems.map((item) => ({
             _key: `inv-${++keyCounterRef.current}`,
             description: (item.description as string) || "",
+            item_description: (item.item_description as string) || "",
             quantity: Number(item.quantity) || 1,
             unit: (item.unit as string) || "",
             unit_price: Number(item.unit_price) || 0,
@@ -910,12 +926,14 @@ export default function InvoiceDetail() {
   if (isEdit && !invoice) return null;
 
   if (isPaid && invoice) {
+    if (!dataReady) {
+      return (
+        <div className="admin-loading">
+          <div className="admin-spinner" />
+        </div>
+      );
+    }
     return (
-      <Skeleton
-        name="invoice-detail"
-        loading={!dataReady}
-        fixture={<InvoiceDetailFixture />}
-      >
       <div>
         {/* Header */}
         <motion.div
@@ -1124,23 +1142,29 @@ export default function InvoiceDetail() {
                           </td>
                           <td className="fw-500">
                             {item.description || "\u2014"}
+                            {item.item_description && (
+                              <div
+                                style={{
+                                  fontSize: "0.8rem",
+                                  opacity: 0.8,
+                                  marginTop: 2,
+                                }}
+                              >
+                                {item.item_description}
+                              </div>
+                            )}
                           </td>
                           <td className="text-center">
                             {item.quantity}{" "}
                             {item.unit && (
-                                <span className="text-tertiary">
+                              <span className="text-tertiary">{item.unit}</span>
-                                  {item.unit}
-                                </span>
                             )}
                           </td>
                           <td className="text-center">
                             {item.unit || "\u2014"}
                           </td>
                           <td className="admin-mono text-right">
-                              {formatCurrency(
+                            {formatCurrency(item.unit_price, invoice.currency)}
-                                item.unit_price,
-                                invoice.currency,
-                              )}
                           </td>
                           <td className="text-center">
                             {Number(invoice.apply_vat)
@@ -1172,14 +1196,12 @@ export default function InvoiceDetail() {
                 </span>
               </div>
               {Number(invoice.apply_vat) > 0 &&
-                  Object.entries(createTotals.vatByRate).map(
+                Object.entries(createTotals.vatByRate).map(([rate, amount]) => (
-                    ([rate, amount]) => (
                   <div key={rate} className="admin-totals-row">
                     <span>DPH {rate}%:</span>
                     <span>{formatCurrency(amount, invoice.currency)}</span>
                   </div>
-                    ),
+                ))}
-                  )}
               <div className="admin-totals-row admin-totals-total">
                 <span>Celkem k úhradě:</span>
                 <span>
@@ -1220,19 +1242,20 @@ export default function InvoiceDetail() {
           loading={deleting}
         />
       </div>
-      </Skeleton>
     );
   }
 
   // ═══════════════════════════════════════════════════════════
   // CREATE MODE + EDIT (not paid) — shared form
   // ═══════════════════════════════════════════════════════════
+  if (!dataReady) {
+    return (
+      <div className="admin-loading">
+        <div className="admin-spinner" />
+      </div>
+    );
+  }
   return (
-    <Skeleton
-      name="invoice-detail"
-      loading={!dataReady}
-      fixture={<InvoiceDetailFixture />}
-    >
     <div>
       <motion.div
         className="admin-page-header"
@@ -1386,11 +1409,7 @@ export default function InvoiceDetail() {
                   }}
                 />
               </FormField>
-                <FormField
+              <FormField label="Odběratel" error={errors.customer_id} required>
-                  label="Odběratel"
-                  error={errors.customer_id}
-                  required
-                >
                 {form.customer_id ? (
                   <div className="admin-customer-selected">
                     <span>{form.customer_name}</span>
@@ -1732,19 +1751,15 @@ export default function InvoiceDetail() {
                 </span>
               </div>
               {form.apply_vat &&
-                  Object.entries(createTotals.vatByRate).map(
+                Object.entries(createTotals.vatByRate).map(([rate, amount]) => (
-                    ([rate, amount]) => (
                   <div key={rate} className="admin-totals-row">
                     <span>DPH {rate}%:</span>
                     <span>{formatCurrency(amount, form.currency)}</span>
                   </div>
-                    ),
+                ))}
-                  )}
               <div className="admin-totals-row admin-totals-total">
                 <span>Celkem k úhradě:</span>
-                  <span>
+                <span>{formatCurrency(createTotals.total, form.currency)}</span>
-                    {formatCurrency(createTotals.total, form.currency)}
-                  </span>
               </div>
             </div>
           </div>
@@ -1800,6 +1815,5 @@ export default function InvoiceDetail() {
         </>
       )}
     </div>
-    </Skeleton>
   );
 }

src/admin/pages/Invoices.tsx

@@ -20,9 +20,6 @@ import {
   type CurrencyAmount,
 } from "../lib/queries/invoices";
 import Pagination from "../components/Pagination";
-import { Skeleton } from "boneyard-js/react";
-import InvoicesFixture from "../fixtures/InvoicesFixture";
-import ReceivedInvoicesFixture from "../fixtures/ReceivedInvoicesFixture";
 
 const ReceivedInvoices = lazy(() => import("./ReceivedInvoices"));
 const API_BASE = "/api/admin";
@@ -283,13 +280,9 @@ export default function Invoices() {
 
   if (initialLoad) {
     return (
-      <Skeleton
+      <div className="admin-loading">
-        name="invoices"
+        <div className="admin-spinner" />
-        loading={initialLoad}
+      </div>
-        fixture={<InvoicesFixture />}
-      >
-        <div />
-      </Skeleton>
     );
   }
 
@@ -420,13 +413,9 @@ export default function Invoices() {
         >
           <Suspense
             fallback={
-              <Skeleton
+              <div className="admin-loading">
-                name="invoices-received-kpi"
+                <div className="admin-spinner" />
-                loading={true}
+              </div>
-                fixture={<ReceivedInvoicesFixture />}
-              >
-                <div />
-              </Skeleton>
             }
           >
             <ReceivedInvoices
@@ -445,13 +434,9 @@ export default function Invoices() {
             transition={{ duration: 0.25, delay: 0.1 }}
           >
             {statsQuery.isPending && !hasLoadedOnce.current ? (
-              <Skeleton
+              <div className="admin-loading">
-                name="invoices-kpi"
+                <div className="admin-spinner" />
-                loading={statsQuery.isPending && !hasLoadedOnce.current}
+              </div>
-                fixture={<InvoicesFixture />}
-              >
-                <div />
-              </Skeleton>
             ) : (
               stats && (
                 <div style={{ overflow: "hidden", marginBottom: "1.5rem" }}>
@@ -632,6 +617,14 @@ export default function Invoices() {
                 />
               </div>
 
+              <AnimatePresence mode="wait">
+                <motion.div
+                  key={`${statusFilter}-${search}-${statsMonth}-${statsYear}-${page}-${invoices.length}`}
+                  initial={{ opacity: 0, y: 6 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  exit={{ opacity: 0 }}
+                  transition={{ duration: 0.15 }}
+                >
                   {invoices.length === 0 && !(draft && !statusFilter) ? (
                     <div className="admin-empty-state">
                       <div className="admin-empty-icon">
@@ -723,18 +716,23 @@ export default function Invoices() {
                                 <span className="offers-draft-row-label">
                                   Koncept
                                   {draft.savedAt && (
-                                <span style={{ fontWeight: 400, opacity: 0.8 }}>
+                                    <span
+                                      style={{ fontWeight: 400, opacity: 0.8 }}
+                                    >
                                       {" · "}
-                                  {new Date(draft.savedAt).toLocaleTimeString(
+                                      {new Date(
-                                    "cs-CZ",
+                                        draft.savedAt,
-                                    { hour: "2-digit", minute: "2-digit" },
+                                      ).toLocaleTimeString("cs-CZ", {
-                                  )}
+                                        hour: "2-digit",
+                                        minute: "2-digit",
+                                      })}
                                     </span>
                                   )}
                                 </span>
                               </td>
                               <td>
-                            {(draft.form.customer_name as string) || "\u2014"}
+                                {(draft.form.customer_name as string) ||
+                                  "\u2014"}
                               </td>
                               <td>{"\u2014"}</td>
                               <td className="admin-mono">
@@ -799,7 +797,9 @@ export default function Invoices() {
                             return (
                               <tr
                                 key={inv.id}
-                            className={isOverdue ? "offers-expired-row" : ""}
+                                className={
+                                  isOverdue ? "offers-expired-row" : ""
+                                }
                               >
                                 <td className="admin-mono">
                                   <Link
@@ -834,7 +834,10 @@ export default function Invoices() {
                                   className="admin-mono"
                                   style={
                                     inv.status === "overdue"
-                                  ? { color: "var(--danger)", fontWeight: 600 }
+                                      ? {
+                                          color: "var(--danger)",
+                                          fontWeight: 600,
+                                        }
                                       : undefined
                                   }
                                 >
@@ -842,7 +845,10 @@ export default function Invoices() {
                                 </td>
                                 <td
                                   className="admin-mono"
-                              style={{ textAlign: "right", fontWeight: 500 }}
+                                  style={{
+                                    textAlign: "right",
+                                    fontWeight: 500,
+                                  }}
                                 >
                                   {formatCurrency(inv.total, inv.currency)}
                                 </td>
@@ -852,10 +858,14 @@ export default function Invoices() {
                                       to={`/invoices/${inv.id}`}
                                       className="admin-btn-icon"
                                       title={
-                                    inv.status === "paid" ? "Detail" : "Upravit"
+                                        inv.status === "paid"
+                                          ? "Detail"
+                                          : "Upravit"
                                       }
                                       aria-label={
-                                    inv.status === "paid" ? "Detail" : "Upravit"
+                                        inv.status === "paid"
+                                          ? "Detail"
+                                          : "Upravit"
                                       }
                                     >
                                       {inv.status === "paid" ? (
@@ -911,8 +921,18 @@ export default function Invoices() {
                                           >
                                             <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
                                             <polyline points="14 2 14 8 20 8" />
-                                        <line x1="16" y1="13" x2="8" y2="13" />
+                                            <line
-                                        <line x1="16" y1="17" x2="8" y2="17" />
+                                              x1="16"
+                                              y1="13"
+                                              x2="8"
+                                              y2="13"
+                                            />
+                                            <line
+                                              x1="16"
+                                              y1="17"
+                                              x2="8"
+                                              y2="17"
+                                            />
                                           </svg>
                                         )}
                                       </button>
@@ -950,6 +970,8 @@ export default function Invoices() {
                       </table>
                     </div>
                   )}
+                </motion.div>
+              </AnimatePresence>
               <Pagination pagination={pagination} onPageChange={setPage} />
             </div>
           </motion.div>

src/admin/pages/OfferDetail.tsx

@@ -54,8 +54,6 @@ import useModalLock from "../hooks/useModalLock";
 import useDebounce from "../hooks/useDebounce";
 import apiFetch from "../utils/api";
 import { formatCurrency } from "../utils/formatters";
-import { Skeleton } from "boneyard-js/react";
-import OfferDetailFixture from "../fixtures/OfferDetailFixture";
 import {
   companySettingsOptions,
   type CompanySettingsData,
@@ -92,7 +90,6 @@ interface OfferForm {
   language: string;
   vat_rate: number;
   apply_vat: boolean;
-  exchange_rate: string;
   scope_title: string;
   scope_description: string;
 }
@@ -114,7 +111,6 @@ const emptyForm: OfferForm = {
   language: "EN",
   vat_rate: 21,
   apply_vat: false,
-  exchange_rate: "",
   scope_title: "",
   scope_description: "",
 };
@@ -354,8 +350,6 @@ export default function OfferDetail() {
         language: (draft.form.language as string) || emptyForm.language,
         vat_rate: (draft.form.vat_rate as number) ?? emptyForm.vat_rate,
         apply_vat: (draft.form.apply_vat as boolean) ?? emptyForm.apply_vat,
-        exchange_rate:
-          (draft.form.exchange_rate as string) || emptyForm.exchange_rate,
         scope_title:
           (draft.form.scope_title as string) || emptyForm.scope_title,
         scope_description:
@@ -433,13 +427,7 @@ export default function OfferDetail() {
   const isCompleted = orderInfo?.status === "dokoncena";
   const isLockedByOther = !!lockedBy;
   const readOnly = isInvalidated || isLockedByOther || isCompleted;
-  const isExpiredNotInvalidated =
+  const canInvalidate = isEdit && !isInvalidated && !isCompleted && !orderInfo;
-    isEdit &&
-    !isInvalidated &&
-    !isCompleted &&
-    !orderInfo &&
-    form.valid_until &&
-    new Date(form.valid_until) < new Date(new Date().toDateString());
 
   // Sync offer detail data to form state on first load (edit mode)
   const formInitializedRef = useRef(false);
@@ -457,7 +445,6 @@ export default function OfferDetail() {
       language: d.language || "EN",
       vat_rate: d.vat_rate ?? companySettings?.default_vat_rate ?? 21,
       apply_vat: !!d.apply_vat,
-      exchange_rate: d.exchange_rate || "",
       scope_title: d.scope_title || "",
       scope_description: d.scope_description || "",
     };
@@ -592,7 +579,6 @@ export default function OfferDetail() {
           language: data.form.language ?? "EN",
           vat_rate: data.form.vat_rate ?? 21,
           apply_vat: data.form.apply_vat ?? false,
-          exchange_rate: data.form.exchange_rate ?? "",
         },
         items: data.items,
         sections: data.sections,
@@ -855,12 +841,14 @@ export default function OfferDetail() {
   const requiredPerm = getRequiredPerm();
   if (!hasPermission(requiredPerm)) return <Forbidden />;
 
+  if (loading) {
+    return (
+      <div className="admin-loading">
+        <div className="admin-spinner" />
+      </div>
+    );
+  }
   return (
-    <Skeleton
-      name="offer-detail"
-      loading={loading}
-      fixture={<OfferDetailFixture />}
-    >
     <div>
       {/* Header */}
       <motion.div
@@ -968,7 +956,7 @@ export default function OfferDetail() {
               Objednávka {orderInfo.order_number}
             </Link>
           )}
-            {isExpiredNotInvalidated && hasPermission("offers.edit") && (
+          {canInvalidate && hasPermission("offers.edit") && (
             <button
               onClick={() => setInvalidateConfirm(true)}
               className="admin-btn admin-btn-secondary"
@@ -1160,11 +1148,7 @@ export default function OfferDetail() {
                 />
               )}
             </FormField>
-              <FormField
+            <FormField label="Platnost do" error={errors.valid_until} required>
-                label="Platnost do"
-                error={errors.valid_until}
-                required
-              >
               {readOnly ? (
                 <input
                   type="text"
@@ -1235,9 +1219,7 @@ export default function OfferDetail() {
                   disabled={readOnly}
                 >
                   {(
-                      companySettings?.available_vat_rates || [
+                    companySettings?.available_vat_rates || [0, 10, 12, 15, 21]
-                        0, 10, 12, 15, 21,
-                      ]
                   ).map((r) => (
                     <option key={r} value={r}>
                       {r}%
@@ -1248,26 +1230,13 @@ export default function OfferDetail() {
                   <input
                     type="checkbox"
                     checked={form.apply_vat}
-                      onChange={(e) =>
+                    onChange={(e) => updateForm("apply_vat", e.target.checked)}
-                        updateForm("apply_vat", e.target.checked)
-                      }
                     disabled={readOnly}
                   />
                   <span>Účtovat DPH</span>
                 </label>
               </div>
             </FormField>
-              <FormField label="Směnný kurz">
-                <input
-                  type="number"
-                  value={form.exchange_rate}
-                  onChange={(e) => updateForm("exchange_rate", e.target.value)}
-                  className="admin-form-input"
-                  placeholder="Volitelný"
-                  step="0.0001"
-                  readOnly={readOnly}
-                />
-              </FormField>
           </div>
         </div>
       </motion.div>
@@ -1329,16 +1298,10 @@ export default function OfferDetail() {
                         #
                       </th>
                       <th className="offers-col-desc">Popis</th>
-                        <th
+                      <th className="offers-col-qty" style={{ width: "5rem" }}>
-                          className="offers-col-qty"
-                          style={{ width: "5rem" }}
-                        >
                         Množství
                       </th>
-                        <th
+                      <th className="offers-col-unit" style={{ width: "5rem" }}>
-                          className="offers-col-unit"
-                          style={{ width: "5rem" }}
-                        >
                         Jednotka
                       </th>
                       <th
@@ -1522,9 +1485,7 @@ export default function OfferDetail() {
                       {(form.language === "CZ"
                         ? section.title_cz
                         : section.title) && (
-                          <span
+                        <span style={{ fontWeight: 400, marginLeft: "0.5rem" }}>
-                            style={{ fontWeight: 400, marginLeft: "0.5rem" }}
-                          >
                           —{" "}
                           {form.language === "CZ"
                             ? section.title_cz || section.title
@@ -1835,6 +1796,5 @@ export default function OfferDetail() {
         loading={deleting}
       />
     </div>
-    </Skeleton>
   );
 }

src/admin/pages/Offers.tsx

@@ -5,16 +5,14 @@ import { Link, useNavigate } from "react-router-dom";
 import { motion, AnimatePresence } from "framer-motion";
 import ConfirmModal from "../components/ConfirmModal";
 import Forbidden from "../components/Forbidden";
-import { Skeleton } from "boneyard-js/react";
-import OffersFixture from "../fixtures/OffersFixture";
 
 import apiFetch from "../utils/api";
 import { formatCurrency, formatDate, czechPlural } from "../utils/formatters";
 import SortIcon from "../components/SortIcon";
 import useTableSort from "../hooks/useTableSort";
-import { useQueryClient } from "@tanstack/react-query";
+import { useQueryClient, useQuery } from "@tanstack/react-query";
 import { usePaginatedQuery } from "../hooks/usePaginatedQuery";
-import { offerListOptions } from "../lib/queries/offers";
+import { offerListOptions, offerCustomersOptions } from "../lib/queries/offers";
 import useModalLock from "../hooks/useModalLock";
 import Pagination from "../components/Pagination";
 import FormField from "../components/FormField";
@@ -22,6 +20,19 @@ import FormField from "../components/FormField";
 const API_BASE = "/api/admin";
 const DRAFT_KEY = "boha_offer_draft";
 
+const STATUS_FILTERS = [
+  { value: "", label: "Vše" },
+  { value: "active", label: "Aktivní" },
+  { value: "ordered", label: "Objednaná" },
+  { value: "invalidated", label: "Zneplatněná" },
+];
+
+const ORDER_FILTERS = [
+  { value: "", label: "Vše" },
+  { value: "yes", label: "S objednávkou" },
+  { value: "no", label: "Bez objednávky" },
+];
+
 interface Quotation {
   id: number;
   quotation_number: string;
@@ -57,6 +68,11 @@ export default function Offers() {
     useTableSort("quotation_number");
   const [search, setSearch] = useState("");
   const [page, setPage] = useState(1);
+  const [statusFilter, setStatusFilter] = useState("");
+  const [customerFilter, setCustomerFilter] = useState<number | "">("");
+  const [orderFilter, setOrderFilter] = useState("");
+
+  const { data: customers } = useQuery(offerCustomersOptions());
 
   const [deleteConfirm, setDeleteConfirm] = useState<{
     show: boolean;
@@ -107,7 +123,15 @@ export default function Offers() {
     isPending,
     isFetching,
   } = usePaginatedQuery<Quotation>(
-    offerListOptions({ search, sort, order, page }),
+    offerListOptions({
+      search,
+      sort,
+      order,
+      page,
+      status: statusFilter || undefined,
+      customer_id: customerFilter || undefined,
+      has_order: orderFilter || undefined,
+    }),
   );
 
   const discardDraft = () => {
@@ -279,8 +303,15 @@ export default function Offers() {
     }
   };
 
+  if (isPending) {
+    return (
+      <div className="admin-loading">
+        <div className="admin-spinner" />
+      </div>
+    );
+  }
+
   return (
-    <Skeleton name="offers" loading={isPending} fixture={<OffersFixture />}>
     <div>
       <motion.div
         className="admin-page-header"
@@ -339,11 +370,32 @@ export default function Offers() {
         </div>
       </motion.div>
 
+      <motion.div
+        initial={{ opacity: 0, y: 12 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.25, delay: 0.1 }}
+      >
+        <div className="admin-tabs mb-6">
+          {STATUS_FILTERS.map((f) => (
+            <button
+              key={f.value}
+              className={`admin-tab ${statusFilter === f.value ? "active" : ""}`}
+              onClick={() => {
+                setStatusFilter(f.value);
+                setPage(1);
+              }}
+            >
+              {f.label}
+            </button>
+          ))}
+        </div>
+      </motion.div>
+
       <motion.div
         className="admin-card"
         initial={{ opacity: 0, y: 12 }}
         animate={{ opacity: 1, y: 0 }}
-          transition={{ duration: 0.25, delay: 0.06 }}
+        transition={{ duration: 0.25, delay: 0.15 }}
         style={{ opacity: isFetching ? 0.6 : 1, transition: "opacity 0.2s" }}
       >
         <div className="admin-card-body">
@@ -360,6 +412,54 @@ export default function Offers() {
             />
           </div>
 
+          <div className="admin-filters mb-4">
+            <div className="admin-filter-group">
+              <label className="admin-filter-label">Zákazník</label>
+              <select
+                value={customerFilter}
+                onChange={(e) => {
+                  setCustomerFilter(
+                    e.target.value ? Number(e.target.value) : "",
+                  );
+                  setPage(1);
+                }}
+                className="admin-form-select"
+              >
+                <option value="">Všichni</option>
+                {customers?.map((c) => (
+                  <option key={c.id} value={c.id}>
+                    {c.name}
+                  </option>
+                ))}
+              </select>
+            </div>
+            <div className="admin-filter-group">
+              <label className="admin-filter-label">Objednávka</label>
+              <select
+                value={orderFilter}
+                onChange={(e) => {
+                  setOrderFilter(e.target.value);
+                  setPage(1);
+                }}
+                className="admin-form-select"
+              >
+                {ORDER_FILTERS.map((f) => (
+                  <option key={f.value} value={f.value}>
+                    {f.label}
+                  </option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          <AnimatePresence mode="wait">
+            <motion.div
+              key={`${statusFilter}-${customerFilter}-${orderFilter}-${search}-${page}-${quotations.length}`}
+              initial={{ opacity: 0, y: 6 }}
+              animate={{ opacity: 1, y: 0 }}
+              exit={{ opacity: 0 }}
+              transition={{ duration: 0.15 }}
+            >
               {quotations.length === 0 && !draft ? (
                 <div className="admin-empty-state">
                   <div className="admin-empty-icon">
@@ -609,7 +709,8 @@ export default function Offers() {
                                     </svg>
                                   )}
                                 </Link>
-                              {!readOnly && hasPermission("offers.create") && (
+                                {!readOnly &&
+                                  hasPermission("offers.create") && (
                                     <button
                                       onClick={() => handleDuplicate(q)}
                                       className="admin-btn-icon"
@@ -702,15 +803,26 @@ export default function Offers() {
                                         >
                                           <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
                                           <polyline points="14 2 14 8 20 8" />
-                                        <line x1="12" y1="11" x2="12" y2="17" />
+                                          <line
-                                        <line x1="9" y1="14" x2="15" y2="14" />
+                                            x1="12"
+                                            y1="11"
+                                            x2="12"
+                                            y2="17"
+                                          />
+                                          <line
+                                            x1="9"
+                                            y1="14"
+                                            x2="15"
+                                            y2="14"
+                                          />
                                         </svg>
                                       )}
                                     </button>
                                   )
                                 )}
-                              {isExpired &&
+                                {!isInvalidated &&
-                                !isInvalidated &&
+                                  !isCompleted &&
+                                  !q.order_id &&
                                   hasPermission("offers.edit") && (
                                     <button
                                       onClick={() =>
@@ -817,6 +929,8 @@ export default function Offers() {
                   </table>
                 </div>
               )}
+            </motion.div>
+          </AnimatePresence>
           <Pagination pagination={pagination} onPageChange={setPage} />
         </div>
       </motion.div>
@@ -997,6 +1111,5 @@ export default function Offers() {
         )}
       </AnimatePresence>
     </div>
-    </Skeleton>
   );
 }

src/routes/admin/invoices-pdf.ts

@@ -450,10 +450,11 @@ export default async function invoicesPdfRoutes(
             const lineVat = applyVat ? (lineSubtotal * vatRate) / 100 : 0;
             const lineTotal = lineSubtotal + lineVat;
             const qtyDecimals = Math.floor(qty) === qty ? 0 : 2;
+            const subDesc = item.item_description || "";
 
             return `<tr>
             <td class="row-num">${i + 1}</td>
-            <td class="desc">${escapeHtml(item.description)}</td>
+            <td class="desc">${escapeHtml(item.description)}${subDesc ? `<div class="item-subdesc">${escapeHtml(subDesc)}</div>` : ""}</td>
             <td class="center">${formatNum(qty, qtyDecimals)}${item.unit ? ` / ${escapeHtml(item.unit)}` : ""}</td>
             <td class="right">${formatNum(unitPrice)}</td>
             <td class="right">${formatNum(lineSubtotal)}</td>
@@ -693,6 +694,11 @@ export default async function invoicesPdfRoutes(
     font-weight: 600;
     color: #1a1a1a;
   }
+  .item-subdesc {
+    font-size: 9pt;
+    color: #646464;
+    margin-top: 2px;
+  }
   table.items tbody td.total-cell { font-weight: 700; }
 
   /* Soucet + total - styl z nabidek */

src/routes/admin/offers-pdf.ts

@@ -199,7 +199,6 @@ const TRANSLATIONS: Record<string, Record<string, string>> = {
   subtotal: { EN: "Subtotal", CZ: "Mezisou\u010Det" },
   vat: { EN: "VAT", CZ: "DPH" },
   total_to_pay: { EN: "Total to pay", CZ: "Celkem k \u00FAhrad\u011B" },
-  exchange_rate: { EN: "Exchange rate", CZ: "Sm\u011Bnn\u00FD kurz" },
   ico: { EN: "ID", CZ: "I\u010CO" },
   dic: { EN: "VAT ID", CZ: "DI\u010C" },
   page: { EN: "Page", CZ: "Strana" },
@@ -262,8 +261,6 @@ export default async function offersPdfRoutes(
         const vatRate = Number(quotation.vat_rate) || 21;
         const vatAmount = applyVat ? subtotal * (vatRate / 100) : 0;
         const totalToPay = subtotal + vatAmount;
-        const exchangeRate = Number(quotation.exchange_rate) || 0;
-
         let hasScopeContent = false;
         for (const s of quotation.scope_sections) {
           if ((s.content || "").trim() || (s.title || "").trim()) {
@@ -331,10 +328,6 @@ export default async function offersPdfRoutes(
       <span class="label">${escapeHtml(t("total_to_pay"))}</span>
       <span class="value">${formatCurrency(totalToPay, currency)}</span>
     </div>`;
-        if (exchangeRate > 0) {
-          totalsHtml += `<div class="exchange-rate">${escapeHtml(t("exchange_rate"))}: ${formatNum(exchangeRate, 4)}</div>`;
-        }
-
         const quotationNumber = escapeHtml(quotation.quotation_number);
 
         let scopeHtml = "";

src/routes/admin/quotations.ts

@@ -42,6 +42,7 @@ export default async function quotationsRoutes(
         search,
         status: query.status ? String(query.status) : undefined,
         customer_id: query.customer_id ? Number(query.customer_id) : undefined,
+        has_order: query.has_order ? String(query.has_order) : undefined,
       });
 
       return paginated(

src/schemas/invoices.schema.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 
 const InvoiceItemSchema = z.object({
   description: z.string().nullish(),
+  item_description: z.string().nullish(),
   quantity: z
     .union([z.number(), z.string()])
     .transform((v) => {

src/schemas/offers.schema.ts

@@ -59,16 +59,10 @@ export const CreateQuotationSchema = z.object({
     .preprocess((v) => v === true || v === 1 || v === "1", z.boolean())
     .optional()
     .default(true),
-  exchange_rate: z
-    .union([z.number(), z.string()])
-    .transform((v) => Number(v))
-    .refine((v) => !Number.isNaN(v), { message: "Must be a valid number" })
-    .optional()
-    .default(1.0),
   status: z
-    .enum(["nova", "odeslana", "prijata", "odmitnuta", "dokoncena", "active"])
+    .enum(["active", "ordered", "invalidated"])
     .optional()
-    .default("nova"),
+    .default("active"),
   scope_title: z.string().nullish(),
   scope_description: z.string().nullish(),
   items: z.array(QuotationItemSchema).optional(),
@@ -93,14 +87,7 @@ export const UpdateQuotationSchema = z.object({
   apply_vat: z
     .preprocess((v) => v === true || v === 1 || v === "1", z.boolean())
     .optional(),
-  exchange_rate: z
+  status: z.enum(["active", "ordered", "invalidated"]).optional(),
-    .union([z.number(), z.string()])
-    .transform((v) => Number(v))
-    .refine((v) => !Number.isNaN(v), { message: "Must be a valid number" })
-    .optional(),
-  status: z
-    .enum(["nova", "odeslana", "prijata", "odmitnuta", "dokoncena", "active"])
-    .optional(),
   scope_title: z.string().nullish(),
   scope_description: z.string().nullish(),
   items: z.array(QuotationItemSchema).optional(),

src/services/invoices.service.ts

@@ -23,6 +23,7 @@ const ALLOWED_SORT_FIELDS = [
 
 interface InvoiceItemInput {
   description?: string;
+  item_description?: string;
   quantity?: number;
   unit?: string;
   unit_price?: number;
@@ -374,6 +375,7 @@ export async function createInvoice(body: Record<string, any>) {
       data: (body.items as InvoiceItemInput[]).map((item, i) => ({
         invoice_id: invoice.id,
         description: item.description ?? null,
+        item_description: item.item_description ?? null,
         quantity: item.quantity ?? 1,
         unit: item.unit ?? null,
         unit_price: item.unit_price ?? 0,
@@ -471,6 +473,7 @@ export async function updateInvoice(id: number, body: Record<string, any>) {
         data: (body.items as InvoiceItemInput[]).map((item, i) => ({
           invoice_id: id,
           description: item.description ?? null,
+          item_description: item.item_description ?? null,
           quantity: item.quantity ?? 1,
           unit: item.unit ?? null,
           unit_price: item.unit_price ?? 0,

src/services/offers.service.ts

@@ -44,6 +44,7 @@ interface ListOffersParams {
   search: string;
   status?: string;
   customer_id?: number;
+  has_order?: string;
 }
 
 function enrichQuotation(q: any) {
@@ -72,13 +73,24 @@ function enrichQuotation(q: any) {
 }
 
 export async function listOffers(params: ListOffersParams) {
-  const { page, limit, skip, sort, order, search, status, customer_id } =
+  const {
-    params;
+    page,
+    limit,
+    skip,
+    sort,
+    order,
+    search,
+    status,
+    customer_id,
+    has_order,
+  } = params;
   const sortField = ALLOWED_SORT_FIELDS.includes(sort) ? sort : "id";
 
   const where: Record<string, unknown> = {};
   if (status) where.status = status;
   if (customer_id) where.customer_id = customer_id;
+  if (has_order === "yes") where.order_id = { not: null };
+  if (has_order === "no") where.order_id = null;
   if (search) {
     where.OR = [
       { quotation_number: { contains: search } },
@@ -184,7 +196,6 @@ export async function createOffer(body: Record<string, any>) {
         language: body.language ? String(body.language) : "cs",
         vat_rate: body.vat_rate != null ? Number(body.vat_rate) : 21.0,
         apply_vat: body.apply_vat !== false,
-        exchange_rate: body.exchange_rate ? Number(body.exchange_rate) : 1.0,
         status: body.status ? String(body.status) : "active",
         scope_title: body.scope_title ? String(body.scope_title) : null,
         scope_description: body.scope_description
@@ -255,8 +266,6 @@ export async function updateOffer(id: number, body: Record<string, any>) {
           body.apply_vat === 1 ||
           body.apply_vat === "1"
         : undefined,
-    exchange_rate:
-      body.exchange_rate !== undefined ? Number(body.exchange_rate) : undefined,
     status: body.status !== undefined ? String(body.status) : undefined,
     project_code:
       body.project_code !== undefined
@@ -354,7 +363,6 @@ export async function duplicateOffer(id: number) {
         language: original.language,
         vat_rate: original.vat_rate,
         apply_vat: original.apply_vat,
-        exchange_rate: original.exchange_rate,
         status: "active",
         scope_title: original.scope_title,
         scope_description: original.scope_description,

src/services/orders.service.ts

@@ -206,7 +206,6 @@ export async function createOrderFromQuotation(
         language: quotation.language || "cs",
         vat_rate: quotation.vat_rate ?? 21.0,
         apply_vat: quotation.apply_vat ?? true,
-        exchange_rate: quotation.exchange_rate ?? 1.0,
         scope_title: quotation.scope_title,
         scope_description: quotation.scope_description,
         attachment_data: attachmentBuffer