diff --git a/client/src/components/finance/FinanceBottomNav.tsx b/.superpowers/sdd/di2-restyle/FinanceBottomNav.reference.tsx
similarity index 100%
rename from client/src/components/finance/FinanceBottomNav.tsx
rename to .superpowers/sdd/di2-restyle/FinanceBottomNav.reference.tsx
diff --git a/.superpowers/sdd/di2-restyle/ledger.md b/.superpowers/sdd/di2-restyle/ledger.md
new file mode 100644
index 0000000..8140d48
--- /dev/null
+++ b/.superpowers/sdd/di2-restyle/ledger.md
@@ -0,0 +1,8 @@
+# SDD ledger — plan: di2-restyle
+
+BASE: 6bcf4df
+
+- [ ] Этап 1 — удаление старого модуля финансов
+- [ ] Этап 2 — мост тем/скинов
+- [ ] Этап 3 — визуальный рестайл
+- [ ] Этап 4 — проверка, деплой, документация
diff --git a/.superpowers/sdd/di2-restyle/plan.md b/.superpowers/sdd/di2-restyle/plan.md
new file mode 100644
index 0000000..b5c4dc0
--- /dev/null
+++ b/.superpowers/sdd/di2-restyle/plan.md
@@ -0,0 +1,90 @@
+# План: удаление старого модуля финансов + рестайл DI2 под дизайн iistwin
+
+Репозиторий: `C:\1Ai\1iistwin\1Project` (main, автодеплой через push). Субапп DI2 уже в проде на `/di2` (server/finance-di2 + client-di2).
+
+Решения пользователя (зафиксированы): /salary удалить и вести на /di2; рестайл = мост токенов + точечные правки (без замены 45 shadcn-компонентов); мобильная навигация = нижняя панель.
+
+---
+
+## Этап 1 — Удаление старого модуля финансов
+
+### 1.1 Сервер
+1. **Перенос пула БД**: содержимое `server/finance/db-client.ts` → новый `server/finance-di2/db-core.ts` (правка внутренних импортов: там только fs/path/pg). Обновить `server/finance-di2/db-client.ts`: реэкспорт из `./db-core` вместо `../finance/db-client`. Удалить папку `server/finance/` целиком (19 файлов).
+2. **Шедулер аудита**: создать `server/finance-di2/audit-scheduler.ts` — порт `startAuditScheduler` (cron 03:00 МСК) из удаляемого `server/finance/audit.ts:524`, но вызывающий DI2-функцию `runIntegrityAudit` из `./audit-agent`. Запускать из `registerDi2Routes` (server/finance-di2/index.ts). Реализация — setInterval-проверка времени (как в оригинале) или порт через обычный таймер; node-cron НЕ добавлять.
+3. **Персистентность истории аудита**: в `server/finance-di2/audit-agent.ts` добавить загрузку/запись `data/finance-audit-history.json` (порт логики из старого audit.ts): загрузка при старте модуля, append после каждого `runIntegrityAudit`. Сейчас история в памяти и теряется при рестарте.
+4. **Регистрация**: `server/routes/index.ts` — убрать `import { registerFinanceRoutes }` (стр. 33) и вызов (стр. 116), оставить `registerDi2Routes`.
+5. **Env сервера** (проверка, не код): DI2 Google-флоу использует `GOOGLE_CLIENT_ID`/`GOOGLE_CLIENT_SECRET` — проверить наличие в `.env` сервера; старый `FINANCE_GOOGLE_REDIRECT_URI` больше не нужен.
+
+### 1.2 Клиент (основное приложение)
+1. Удалить: `client/src/pages/finance/` (14 файлов), `client/src/components/finance/` (22 файла), `client/src/hooks/useFinance.ts`, `client/src/hooks/useColumnLabels.ts`, `client/src/lib/format.ts`, `client/src/pages/salary.tsx`.
+   - Перед удалением: `grep -rn "lib/format\|useFinance" client/src --include=*.tsx --include=*.ts` — все внешние импорты должны отсутствовать (по разведке используются только удаляемыми файлами — перепроверить!).
+2. `client/src/index.css` — удалить блок `.hover-elevate`/`.hover-elevate-2` (строки ~343-374, использовался только finance DataTable).
+3. `client/src/App.tsx`:
+   - Убрать lazy-импорты finance-страниц (строки 61-72) и роуты `/finance`, `/finance/debt`, `/finance/calculations`, `/finance/audit`, `/income*`, `/expenses*`, `/salary` (строки 117-120, 187-200).
+   - ROUTE_TITLES: убрать записи этих путей.
+4. Навигация:
+   - `client/src/components/Sidebar.tsx` (строки 1084-1122, 1544, 1641-1645): `FinanceNavItem` и пункт «Финансы» в меню профиля → внешняя ссылка `<a href="/di2" target="_blank" rel="noopener">` (паттерн как в FinanceSidebar.tsx:88-99), гейт `moduleAccess.finance !== false && (isAdmin || hasPermission('finance.view'))` сохранить.
+   - `client/src/components/MobileBottomNav.tsx` (строки 383-389): пункт «Финансы» → `/di2`.
+5. **Не трогать**: сиды прав `finance.view/manage` (`server/storage/roles.storage.ts:300-301` — gate DI2 ломается без них), `finance_access` (shared/schema.ts, module-access, Users.tsx матрица доступа).
+
+### 1.3 Проверка этапа
+`npm run check` + `npm run build` чисто; ключевые API DI2 авторизованно 200 (список из этапа 4).
+
+---
+
+## Этап 2 — Мост тем/скинов iistwin в DI2
+
+Ключевая несовместимость: DI2 ждёт голые HSL-тройки (`hsl(var(--x) / <alpha>)`), скины iistwin генерируют полные значения (`hsl(...)`). Решение — перевод DI2 на формат основного клиента + общий generated-skins.css + свой провайдер.
+
+### 2.1 Общий код тем
+- Vite-алиас в `vite.config.di2.ts`: `"@skin": path.resolve(import.meta.dirname, "client/src/themes")` (через `../client` → фактически `1Project/client/src/themes`); пути в `client-di2/tsconfig.json`: `"@skin/*": ["../client/src/themes/*"]`.
+- Импортируемые модули (чистый TS, без React): `tokens.ts` (`generateSkinCss`, `Skin` типы), `skins/index.ts` (`BUILT_IN_SKINS`, `DEFAULT_SKIN_ID`, `getBuiltInSkinById`), `styles/generated-skins.css` — через CSS-`@import` в index.css (путь `../../client/src/themes/styles/generated-skins.css` первой строкой).
+
+### 2.2 Di2ThemeProvider — `client-di2/src/themes/Di2ThemeProvider.tsx`
+Порт логики `client/src/themes/ThemeProvider.tsx` (строки 75-92, 151-209) минус useAuth/useQuery:
+- Приоритет скина: `localStorage['skin']` (если id валиден среди BUILT_IN_SKINS + кастомных с сервера) → `GET /api/organization/current-skin` (`{skinId, skin}`) → `'iistwin'`.
+- Кастомные скины: список через `GET /api/organization/skins`, токены через `GET /api/organization/skins/:id` (только для не-встроенного текущего).
+- Тема: `localStorage['theme']` → `prefers-color-scheme` + слушатель.
+- На `<html>`: `data-skin`, `data-theme`, класс `light|dark`; для кастомного скина — `<style id="skin-runtime">` с `generateSkinCss(skin, theme)`.
+- Ключи localStorage `'skin'`/`'theme'` — **те же**, что в основном приложении: выбор пользователя синхронизируется между iistwin и /di2 автоматически.
+- В `client-di2/src/main.tsx`: `<Router base="/di2"><Di2ThemeProvider><App/></Di2ThemeProvider></Router>`.
+
+### 2.3 Перевод DI2 на полный формат токенов
+1. `client-di2/tailwind.config.ts`: все цвета `hsl(var(--x) / <alpha-value>)` → `var(--x)` (как в корневом `tailwind.config.ts`); `borderRadius`: хардкод lg/md/sm → `var(--radius)` + каскад `calc(var(--radius) - 2px)`/`-4px` (скопировать блок из корневого конфига); добавить `warning/success/info` из var(--warning) и т.д. Если DI2 использует alpha-модификаторы семантических цветов (`bg-primary/50`) — заменить на `color-mix(in oklab, var(--primary) 50%, transparent)` (grep при исполнении).
+2. `client-di2/src/index.css`:
+   - Заменить собственные `:root`/`.dark` HSL-тройки (строки 9-169) на fallback-блоки, скопированные из `client/src/index.css:13-80` (iistwin light/dark до гидратации).
+   - DI2-only переменные — переопределить от семантических токенов через `color-mix`: `--card-border`/`--popover-border` → `var(--border)`; `--primary-border`, `--secondary-border`, `--muted-border`, `--accent-border`, `--destructive-border`, `--sidebar-primary-border`, `--sidebar-accent-border` → `color-mix(in oklab, var(--X) 82%, black)`; `--button-outline` → `color-mix(in oklab, var(--primary) 35%, transparent)`; `--badge-outline` → `color-mix(in oklab, var(--muted-foreground) 35%, transparent)`; `--elevate-1/2` → `rgba(0,0,0,.05/.08)` (в `.dark` — светлые значения). Убрать `--opaque-button-border-intensity` и `hsl(from ...)` relative-color вычисления.
+3. `client-di2/index.html`: `lang="ru"`; убрать оба preconnect и мега-link Google Fonts (23 семейства) → оставить только Inter (+DM Mono) как в `client/index.html:23`; viewport — убрать `maximum-scale=1`, добавить `interactive-widget=resizes-content` (паттерн фикса 2026-08-26).
+4. Шрифты приходят из скина: `generateSkinCss` эмитит `--font-sans`/`--font-mono` — в index.css DI2 удалить жёсткие `--font-sans: Open Sans`.
+
+### 2.4 Проверка этапа
+`npm run check`, `npm run build`; визуально: `/di2` рендерится, светлая/тёмная тема переключается; смена скина в `/settings/appearance` основного приложения меняет вид `/di2` после обновления (проверить `data-skin` на `<html>`).
+
+---
+
+## Этап 3 — Визуальный рестайл (точечный)
+
+1. **Графики recharts**: заменить hex-палитры (77 вхождений: `#2563eb` и т.п. в income/expenses-overview, debt, calculations, planning, dashboard, heatmap, salary) на `var(--chart-1..5)` для палитр и `var(--success)`/`var(--destructive)`/`var(--warning)` для семантики. Recharts принимает CSS-переменные в fill/stroke.
+2. **Хардкод Tailwind-цветов** (133 вхождения `text-red-500`, `bg-amber-50`, `text-green-600` и т.п.): заменить на семантические классы (`text-destructive`, `text-success`, `bg-warning/10` + парные `dark:` где отсутствуют). Механическая замена по всем страницам client-di2.
+3. **Таблицы по UI Style Guide**: `client-di2/src/components/ui/table.tsx` — шапка `bg-muted/50 text-[12px] font-medium text-muted-foreground`, строки `h-[var(--table-row-height,40px)]`, hover `bg-muted/40`, ячейки `px-3` (как в основном клиенте). Density из Темы 2.0 подхватится автоматически.
+4. **Контролы**: скопировать `client/src/components/fields/field-styles.ts` в `client-di2/src/lib/field-styles.ts` (зависит только от `cn`), применить `fieldControlClass` в кастомных компонентах DI2 (column-filter, draggable-column-list, copyable-cell) — density/control-вид скина применится.
+5. **app-sidebar**: активный пункт через `sidebar-accent` (уже так), убраить лишние отступы, привести брендинг-блок к нашему виду (оставить «ОмегаПром / Финансы»).
+6. **Мобильная нижняя панель** — новый `client-di2/src/components/bottom-nav.tsx` по образцу `client/src/components/finance/FinanceBottomNav.tsx` (удаляемого — скопировать логику до удаления): три кнопки «Обзор» (дашборд), «Разделы» (dropdown: Доходы, Расходы, Дебиторка, Расчёты, Планирование, Зарплата, Аудит, Прибыльность, Тепловая карта), «Настройки»; видна только `<md`, контент получает `pb-20 md:pb-0`, сайдбар на мобильном скрывается (`hidden md:flex` на обёртке + отключить Sheet-триггер). Переходы — wouter Link (base-aware).
+7. **Переключатель темы** в хедере DI2 (App.tsx): кнопка Sun/Moon, пишет `localStorage['theme']` и дергает перерендер Di2ThemeProvider (через кастомное событие/контекст — проще: Di2ThemeProvider экспортирует контекст с toggleTheme, как основной ThemeProvider).
+8. Хедер/страницы: page-gutter через `var(--page-gutter, 1rem)` где уместно; крупные заголовки страниц — `text-lg font-semibold` (как основной клиент).
+
+---
+
+## Этап 4 — Проверка, деплой, документация
+
+1. `npm run check` (оба tsc) + `npm run build` (main → di2 → server) — чисто.
+2. Авторизованный smoke прод-API DI2: `/api/di2/dashboard`, `/api/income/tree-summary`, `/api/debt/analytics`, `/api/connection`, `/api/audit/history` — 200.
+3. После деплоя: `/finance`, `/salary`, `/income` → 404/редирект (страниц нет); «Финансы» в Sidebar/MobileBottomNav открывает `/di2`; `/di2` светлая+тёмная, скин организации применяется; мобильная нижняя панель на телефоне.
+4. Документация: AGENTS.md — удалить устаревшие разделы старого модуля (мобильная навигация финансов, деревья категорий, баг дебиторки, Google-флоу `/api/finance/google/*`) и дописать раздел про /di2 (мост тем, Di2ThemeProvider, нижняя панель); новая Obsidian-заметка `Features/2026-09-0X — Finance module replaced by Data-Insight2 subapp.md` + ссылка в Agent Guide Index; пометить устаревшей заметку `2026-09-05 — Finance debt calculations audit and Data-Insight2 migration`.
+5. **Ручной шаг пользователя** (вне кода): Google Cloud Console — в OAuth-клиент добавить redirect URI `https://iistwin.ru/api/auth/google/callback` (нужен для синхронизации зарплаты из Google Sheets в DI2; старый `/api/finance/google/callback` удаляется вместе с модулем).
+
+## Риски и ограничения
+- Удаление `lib/format.ts`/`useFinance.ts` — только после grep-подтверждения отсутствия внешних импортов.
+- `/api/finance-settings`, `/api/audit/status`, customer-sync/contract-sync, `/api/finance/google/*` умирают с модулем — потребителей кроме удаляемого UI нет (по разведке).
+- Docker-compose не меняется → бэкап serverfix не нужен; миграций БД нет (iistwin-БД не трогаем; внешняя финансовая БД — только чтение + override-таблицы DI2, которые уже созданы).
+- Если замена хардкод-цветов в графиках сломает читаемость в тёмной теме — вернуть семантические пары вручную (проверить глазами ключевые страницы).
diff --git a/client/src/App.tsx b/client/src/App.tsx
index 0ff3eae..ed31657 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -58,24 +58,11 @@ const SuperAdminResetPassword = safeLazy(() => import("@/pages/SuperAdminResetPa
 const SuperAdminDashboard = safeLazy(() => import("@/pages/SuperAdminDashboard"));
 const SuperAdminOrgDetail = safeLazy(() => import("@/pages/SuperAdminOrgDetail"));
 const Billing = safeLazy(() => import("@/pages/Billing"));
-const FinanceDashboard = safeLazy(() => import("@/pages/finance/dashboard"));
-const IncomeOverview = safeLazy(() => import("@/pages/finance/income-overview"));
-const ExpensesOverview = safeLazy(() => import("@/pages/finance/expenses-overview"));
-const IncomeDetail = safeLazy(() => import("@/pages/finance/income"));
-const ExpensesDetail = safeLazy(() => import("@/pages/finance/expenses"));
-const IncomeCategories = safeLazy(() => import("@/pages/finance/income-categories"));
-const ExpenseCategories = safeLazy(() => import("@/pages/finance/expense-categories"));
-
-const FinanceSettingsPage = safeLazy(() => import("@/pages/finance/settings"));
-const DebtPage = safeLazy(() => import("@/pages/finance/debt"));
-const CalculationsPage = safeLazy(() => import("@/pages/finance/calculations"));
-const AuditPage = safeLazy(() => import("@/pages/finance/audit"));
 const DocumentsPage = safeLazy(() => import("@/pages/documents/DocumentsPage").then(m => ({ default: m.DocumentsPage })));
 const TemplateEditorPage = safeLazy(() => import("@/pages/documents/TemplateEditorPage").then(m => ({ default: m.TemplateEditorPage })));
 const GenerationHistoryPage = safeLazy(() => import("@/pages/documents/GenerationHistoryPage").then(m => ({ default: m.GenerationHistoryPage })));
 const AssetsPage = safeLazy(() => import("@/pages/documents/AssetsPage").then(m => ({ default: m.AssetsPage })));
 const PackagesPage = safeLazy(() => import("@/pages/documents/PackagesPage").then(m => ({ default: m.PackagesPage })));
-const SalaryPage = safeLazy(() => import("@/pages/salary"));
 const ChatPage = safeLazy(() => import("@/pages/Chat"));
 const HomePage = safeLazy(() => import("@/pages/Home"));
 const DashboardPage = safeLazy(() => import("@/pages/DashboardPage"));
@@ -114,15 +101,10 @@ const ROUTE_TITLES: Array<[RegExp, string]> = [
   [/^\/settings/, 'Настройки'],
   [/^\/profile/, 'Профиль'],
   [/^\/billing/, 'Подписка и биллинг'],
-  [/^\/finance\/debt/, 'Дебиторка'],
-  [/^\/finance\/calculations/, 'Расчёты'],
-  [/^\/finance\/audit/, 'Аудит'],
-  [/^\/finance/, 'Финансы'],
   [/^\/documents/, 'Документы'],
   [/^\/reports/, 'Отчёты'],
   [/^\/projects/, 'Проекты'],
   [/^\/bots/, 'Боты'],
-  [/^\/salary/, 'Зарплата'],
   [/^\/login/, 'Вход'],
   [/^\/register/, 'Регистрация'],
 ];
@@ -184,27 +166,12 @@ function Router() {  return (
         <Route path="/gps" component={GpsPage} />
         <Route path="/gps/:tab" component={GpsPage} />
         <Route path="/billing" component={Billing} />
-        <Route path="/finance" component={FinanceDashboard} />
-        <Route path="/finance/debt" component={DebtPage} />
-        <Route path="/finance/calculations" component={CalculationsPage} />
-        <Route path="/finance/audit" component={AuditPage} />
-        <Route path="/income" component={IncomeOverview} />
-        <Route path="/income/uncategorized" component={IncomeDetail} />
-        <Route path="/income/categories" component={IncomeCategories} />
-        <Route path="/income/:categoryId" component={IncomeDetail} />
-        <Route path="/expenses" component={ExpensesOverview} />
-        <Route path="/expenses/uncategorized" component={ExpensesDetail} />
-        <Route path="/expenses/categories" component={ExpenseCategories} />
-        <Route path="/expenses/:categoryId" component={ExpensesDetail} />
-
-        <Route path="/finance/settings" component={FinanceSettingsPage} />
         <Route path="/documents" component={DocumentsPage} />
         <Route path="/documents/templates/new" component={TemplateEditorPage} />
         <Route path="/documents/templates/:id/edit" component={TemplateEditorPage} />
         <Route path="/documents/history" component={GenerationHistoryPage} />
         <Route path="/documents/assets" component={AssetsPage} />
         <Route path="/documents/packages" component={PackagesPage} />
-        <Route path="/salary" component={SalaryPage} />
         <Route path="/chat/:conversationId" component={ChatPage} />
         <Route path="/chat" component={ChatPage} />
         <Route path="/share-target" component={ShareTarget} />
diff --git a/client/src/components/MobileBottomNav.tsx b/client/src/components/MobileBottomNav.tsx
index 334d8d2..fc8d97a 100644
--- a/client/src/components/MobileBottomNav.tsx
+++ b/client/src/components/MobileBottomNav.tsx
@@ -28,7 +28,7 @@ import { queryClient } from '@/lib/queryClient';
 import { useEvents } from '@/hooks/useEvents';
 import { useInboxCount } from '@/hooks/useInboxCount';
 import { canInstallPWA, installPWA, isPWAInstalled } from '@/lib/pwa';
-import { isAdmin } from '@/lib/permissions';
+import { isAdmin, hasPermission } from '@/lib/permissions';
 
 interface MobileFolderItemProps {
   folder: BookmarkFolderType;
@@ -380,13 +380,13 @@ export function MobileBottomNav() {
                 Шаблоны полей
               </DropdownMenuItem>
             </Link>
-            {isAdmin(user) && (user as any)?.moduleAccess?.finance !== false && (
-              <Link href="/finance">
+            {(isAdmin(user) || hasPermission(user, 'finance.view')) && (user as any)?.moduleAccess?.finance !== false && (
+              <a href="/di2" target="_blank" rel="noopener">
                 <DropdownMenuItem className="text-xs">
                   <PiggyBank className="w-3.5 h-3.5 mr-2" />
                   Финансы
                 </DropdownMenuItem>
-              </Link>
+              </a>
             )}
             {gpsAllowed && (
               <Link href="/gps">
diff --git a/client/src/components/Sidebar.tsx b/client/src/components/Sidebar.tsx
index 3985c27..522e244 100644
--- a/client/src/components/Sidebar.tsx
+++ b/client/src/components/Sidebar.tsx
@@ -56,6 +56,7 @@ import {
   X,
   WifiOff,
   PiggyBank,
+  ExternalLink,
   LayoutDashboard,
   ChartGantt,
   HeartPulse,
@@ -1083,10 +1084,9 @@ function MessengerNavItem({ collapsed }: { collapsed: boolean }) {
 
 function FinanceNavItem({ collapsed }: { collapsed: boolean }) {
   const { user } = useAuth();
-  const [location] = useLocation();
-  const isActive = location === '/finance' || location.startsWith('/finance/');
 
-  // Доступ к финансам: app-role право + флаг модуля (user/роль) из /api/auth/me
+  // Доступ к финансам: app-role право + флаг модуля (user/роль) из /api/auth/me.
+  // Старый модуль финансов удалён — пункт ведёт на субапп Data-Insight2 (/di2).
   const moduleAllowed = (user as any)?.moduleAccess?.finance !== false;
   if (!user || !moduleAllowed || (!isAdmin(user) && !hasPermission(user, 'finance.view'))) return null;
 
@@ -1094,30 +1094,25 @@ function FinanceNavItem({ collapsed }: { collapsed: boolean }) {
     return (
       <Tooltip delayDuration={100}>
         <TooltipTrigger asChild>
-          <Link href="/finance">
-            <div className={cn(
-              "flex items-center justify-center p-1.5 rounded transition-colors cursor-pointer",
-              isActive ? "bg-muted text-foreground" : "text-muted-foreground hover:bg-muted/50 hover:text-foreground"
-            )}>
+          <a href="/di2" target="_blank" rel="noopener" title="Финансы (Data-Insight)">
+            <div className="flex items-center justify-center p-1.5 rounded transition-colors cursor-pointer text-muted-foreground hover:bg-muted/50 hover:text-foreground">
               <PiggyBank className="w-4 h-4 shrink-0" />
             </div>
-          </Link>
+          </a>
         </TooltipTrigger>
-        <TooltipContent side="right" sideOffset={8} className="text-xs">Финансы</TooltipContent>
+        <TooltipContent side="right" sideOffset={8} className="text-xs">Финансы (Data-Insight)</TooltipContent>
       </Tooltip>
     );
   }
 
   return (
-    <Link href="/finance">
-      <div className={cn(
-        "w-full flex items-center gap-2 p-1.5 rounded text-xs transition-colors cursor-pointer",
-        isActive ? "bg-muted text-foreground font-medium" : "text-muted-foreground hover:bg-muted/50 hover:text-foreground"
-      )}>
+    <a href="/di2" target="_blank" rel="noopener" className="block">
+      <div className="w-full flex items-center gap-2 p-1.5 rounded text-xs transition-colors cursor-pointer text-muted-foreground hover:bg-muted/50 hover:text-foreground">
         <PiggyBank className="w-4 h-4 shrink-0" />
         <span className="truncate">Финансы</span>
+        <ExternalLink className="w-3 h-3 ml-auto shrink-0 opacity-50" />
       </div>
-    </Link>
+    </a>
   );
 }
 
@@ -1636,14 +1631,17 @@ export function Sidebar({ children }: SidebarProps) {
                   </DropdownMenuItem>
                 </Link>
                 <DropdownMenuSeparator />
+                {(user as any)?.moduleAccess?.finance !== false && (isAdmin(user) || hasPermission(user, 'finance.view')) && (
+                  <a href="/di2" target="_blank" rel="noopener" className="block">
+                    <DropdownMenuItem className="text-xs" data-testid="item-finance">
+                      <PiggyBank className="w-3.5 h-3.5 mr-2" />
+                      Финансы
+                      <ExternalLink className="w-3 h-3 ml-auto shrink-0 opacity-50" />
+                    </DropdownMenuItem>
+                  </a>
+                )}
                 {isAdmin(user) && (
                   <>
-                    <Link href="/finance">
-                      <DropdownMenuItem className="text-xs" data-testid="item-finance">
-                        <PiggyBank className="w-3.5 h-3.5 mr-2" />
-                        Финансы
-                      </DropdownMenuItem>
-                    </Link>
                     <Link href="/documents">
                       <DropdownMenuItem className="text-xs" data-testid="item-documents">
                         <FileSignature className="w-3.5 h-3.5 mr-2" />
diff --git a/client/src/components/finance/AnalyticsChart.tsx b/client/src/components/finance/AnalyticsChart.tsx
deleted file mode 100644
index d4f6727..0000000
--- a/client/src/components/finance/AnalyticsChart.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
-  BarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-  Legend,
-} from "recharts";
-import { formatCurrency, formatKOrM } from "@/lib/format";
-import type { TreeNode } from "@/hooks/useFinance";
-
-interface AnalyticsChartProps {
-  data: Array<Record<string, any>>;
-  series: Array<{ key: string; label: string }>;
-  periods: string[];
-  layout?: "vertical" | "horizontal";
-  barMode?: "stacked" | "grouped";
-  colors?: string[];
-  onBarClick?: (seriesKey: string) => void;
-}
-
-const DEFAULT_COLORS = [
-  "#2563eb", "#e11d48", "#16a34a", "#f59e0b", "#8b5cf6",
-  "#06b6d4", "#ea580c", "#84cc16", "#ec4899", "#14b8a6",
-  "#a855f7", "#eab308", "#6366f1", "#f43f5e", "#10b981",
-  "#d946ef", "#0ea5e9", "#f97316", "#22c55e", "#e879f9",
-];
-
-export function AnalyticsChart({
-  data,
-  series,
-  layout = "horizontal",
-  barMode = "stacked",
-  colors = DEFAULT_COLORS,
-  onBarClick,
-}: AnalyticsChartProps) {
-  const isVertical = layout === "vertical";
-  const stackId = barMode === "stacked" && !isVertical ? "a" : undefined;
-
-  return (
-    <ResponsiveContainer width="100%" height={400}>
-      <BarChart
-        data={data}
-        layout={layout}
-        margin={{ top: 4, right: 20, left: isVertical ? 0 : 0, bottom: 4 }}
-      >
-        <CartesianGrid strokeDasharray="3 3" stroke="hsl(var(--border))" />
-        {isVertical ? (
-          <>
-            <XAxis type="number" tickFormatter={(v) => formatKOrM(Number(v))} fontSize={11} />
-            <YAxis dataKey={data[0] && "employee" in data[0] ? "employee" : "name"} type="category" width={180} tick={{ fontSize: 12, fill: "hsl(var(--foreground))" }} />
-          </>
-        ) : (
-          <>
-            <XAxis dataKey="period" tick={{ fontSize: 11, fill: "hsl(var(--muted-foreground))" }} axisLine={false} tickLine={false} />
-            <YAxis tickFormatter={(v) => formatKOrM(Number(v))} fontSize={11} axisLine={false} tickLine={false} />
-          </>
-        )}
-        <Tooltip
-          content={({ active, payload, label }) => {
-            if (!active || !payload?.length) return null;
-            const total = payload.reduce((s, p) => s + (Number(p.value) || 0), 0);
-            return (
-              <div className="bg-popover border rounded-md px-3 py-2 shadow-md text-xs max-h-[300px] overflow-y-auto">
-                <div className="font-medium mb-1">{label}</div>
-                <div className="font-bold mb-1">Итого: {formatCurrency(total)}</div>
-                {payload
-                  .filter((p) => p.value && Number(p.value) > 0)
-                  .sort((a, b) => Number(b.value) - Number(a.value))
-                  .map((p, idx) => (
-                    <div key={idx} className="flex items-center gap-1.5">
-                      <span className="w-2 h-2 rounded-sm shrink-0" style={{ backgroundColor: p.color }} />
-                      <span className="flex-1 truncate max-w-[200px]">{p.name}</span>
-                      <span className="font-medium">{formatCurrency(Number(p.value))}</span>
-                    </div>
-                  ))}
-              </div>
-            );
-          }}
-        />
-        <Legend wrapperStyle={{ fontSize: 11 }} />
-        {series.map((s, idx) => (
-          <Bar
-            key={s.key}
-            dataKey={s.key}
-            name={s.label}
-            fill={colors[idx % colors.length]}
-            stackId={stackId}
-            radius={barMode === "grouped" && !isVertical ? [3, 3, 0, 0] : undefined}
-            cursor="pointer"
-            onClick={() => onBarClick?.(s.key)}
-          />
-        ))}
-      </BarChart>
-    </ResponsiveContainer>
-  );
-}
diff --git a/client/src/components/finance/CategoryManager.tsx b/client/src/components/finance/CategoryManager.tsx
deleted file mode 100644
index f259bf9..0000000
--- a/client/src/components/finance/CategoryManager.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import { useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from "@/components/ui/dialog";
-import { Plus, Trash2, Pencil, Folder, ChevronRight, ChevronDown } from "lucide-react";
-import { cn } from "@/lib/utils";
-import type { Category } from "@/hooks/useFinance";
-
-interface CategoryManagerProps {
-  categories: Category[];
-  onCreate: (cat: Partial<Category>) => void;
-  onUpdate: (id: string, cat: Partial<Category>) => void;
-  onDelete: (id: string) => void;
-  loading?: boolean;
-  typeLabel: string;
-}
-
-function CategoryNode({
-  node,
-  depth,
-  onEdit,
-  onDelete,
-}: {
-  node: Category;
-  depth: number;
-  onEdit: (n: Category) => void;
-  onDelete: (id: string) => void;
-}) {
-  const [expanded, setExpanded] = useState(false);
-  const hasChildren = node.children && node.children.length > 0;
-
-  return (
-    <div className={cn(depth > 0 && "ml-4 border-l border-border pl-2")}>
-      <div className="flex items-center gap-1 py-1 group">
-        <button
-          className="w-4 h-4 flex items-center justify-center shrink-0"
-          onClick={() => setExpanded((e) => !e)}
-        >
-          {hasChildren ? (
-            expanded ? (
-              <ChevronDown className="w-3 h-3 text-muted-foreground" />
-            ) : (
-              <ChevronRight className="w-3 h-3 text-muted-foreground" />
-            )
-          ) : (
-            <span className="w-3" />
-          )}
-        </button>
-        <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-        <span className="text-xs flex-1 truncate">{node.name}</span>
-        <div className="flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity">
-          <button
-            onClick={() => onEdit(node)}
-            className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-foreground"
-            title="Редактировать"
-          >
-            <Pencil className="w-3 h-3" />
-          </button>
-          <button
-            onClick={() => {
-              if (window.confirm(`Удалить категорию "${node.name}"?`)) onDelete(node.id);
-            }}
-            className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-destructive"
-            title="Удалить"
-          >
-            <Trash2 className="w-3 h-3" />
-          </button>
-        </div>
-      </div>
-      {hasChildren && expanded && (
-        <div>
-          {node.children.map((child) => (
-            <CategoryNode
-              key={child.id}
-              node={child}
-              depth={depth + 1}
-              onEdit={onEdit}
-              onDelete={onDelete}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-export function CategoryManager({
-  categories,
-  onCreate,
-  onUpdate,
-  onDelete,
-  loading,
-  typeLabel,
-}: CategoryManagerProps) {
-  const [dialogOpen, setDialogOpen] = useState(false);
-  const [editing, setEditing] = useState<Category | null>(null);
-  const [name, setName] = useState("");
-
-  const openCreate = () => {
-    setEditing(null);
-    setName("");
-    setDialogOpen(true);
-  };
-
-  const openEdit = (cat: Category) => {
-    setEditing(cat);
-    setName(cat.name);
-    setDialogOpen(true);
-  };
-
-  const handleSave = () => {
-    if (!name.trim()) return;
-    if (editing) {
-      onUpdate(editing.id, { name: name.trim() });
-    } else {
-      onCreate({ name: name.trim(), rules: [], children: [] });
-    }
-    setDialogOpen(false);
-  };
-
-  return (
-    <div className="space-y-3">
-      <div className="flex items-center justify-between">
-        <h3 className="text-sm font-semibold">{typeLabel}</h3>
-        <Button size="sm" className="h-7 text-xs" onClick={openCreate}>
-          <Plus className="w-3.5 h-3.5 mr-1" />
-          Добавить
-        </Button>
-      </div>
-
-      {loading ? (
-        <div className="text-xs text-muted-foreground py-4">Загрузка...</div>
-      ) : categories.length === 0 ? (
-        <div className="text-xs text-muted-foreground py-4">Нет категорий</div>
-      ) : (
-        <div className="rounded border bg-card p-2 space-y-0.5">
-          {categories.map((cat) => (
-            <CategoryNode
-              key={cat.id}
-              node={cat}
-              depth={0}
-              onEdit={openEdit}
-              onDelete={onDelete}
-            />
-          ))}
-        </div>
-      )}
-
-      <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-        <DialogContent className="sm:max-w-md">
-          <DialogHeader>
-            <DialogTitle className="text-sm">
-              {editing ? "Редактировать категорию" : "Новая категория"}
-            </DialogTitle>
-          </DialogHeader>
-          <div className="py-2">
-            <Label className="text-xs">Название</Label>
-            <Input
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder="Название категории"
-              className="h-8 text-xs mt-1"
-              autoFocus
-              onKeyDown={(e) => {
-                if (e.key === "Enter") handleSave();
-              }}
-            />
-          </div>
-          <DialogFooter>
-            <Button variant="outline" size="sm" className="text-xs h-7" onClick={() => setDialogOpen(false)}>
-              Отмена
-            </Button>
-            <Button size="sm" className="text-xs h-7" onClick={handleSave}>
-              Сохранить
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/CategoryOverrideDialog.tsx b/client/src/components/finance/CategoryOverrideDialog.tsx
deleted file mode 100644
index 64edb92..0000000
--- a/client/src/components/finance/CategoryOverrideDialog.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useState, useMemo } from "react";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Search, RotateCcw, ChevronRight, ChevronDown, Folder, FolderOpen } from "lucide-react";
-import { cn } from "@/lib/utils";
-import type { Category } from "@/hooks/useFinance";
-
-interface CategoryOverrideDialogProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  recordId: string;
-  recordType: "income" | "expense";
-  currentOverrideCategoryId?: string | null;
-  categories: Category[];
-  onAssign: (recordId: string, categoryId: string) => void;
-  onReset: (recordId: string) => void;
-}
-
-function flattenCategories(cats: Category[], depth = 0): Array<{ cat: Category; depth: number }> {
-  const result: Array<{ cat: Category; depth: number }> = [];
-  for (const cat of cats) {
-    result.push({ cat, depth });
-    if (cat.children) {
-      result.push(...flattenCategories(cat.children, depth + 1));
-    }
-  }
-  return result;
-}
-
-export function CategoryOverrideDialog({
-  open,
-  onOpenChange,
-  recordId,
-  currentOverrideCategoryId,
-  categories,
-  onAssign,
-  onReset,
-}: CategoryOverrideDialogProps) {
-  const [search, setSearch] = useState("");
-  const [expanded, setExpanded] = useState<Set<string>>(new Set());
-
-  const flat = useMemo(() => flattenCategories(categories), [categories]);
-
-  const filtered = useMemo(() => {
-    if (!search.trim()) return flat;
-    const term = search.toLowerCase();
-    return flat.filter(({ cat }) => cat.name.toLowerCase().includes(term));
-  }, [flat, search]);
-
-  const toggleExpand = (id: string) => {
-    const next = new Set(expanded);
-    if (next.has(id)) next.delete(id);
-    else next.add(id);
-    setExpanded(next);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-md max-h-[80vh] flex flex-col">
-        <DialogHeader>
-          <DialogTitle className="text-sm">Назначить категорию</DialogTitle>
-        </DialogHeader>
-
-        <div className="relative my-2">
-          <Search className="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
-          <Input
-            value={search}
-            onChange={(e) => setSearch(e.target.value)}
-            placeholder="Поиск..."
-            className="h-8 text-xs pl-8"
-          />
-          {search && (
-            <button
-              className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-              onClick={() => setSearch("")}
-            >
-              ×
-            </button>
-          )}
-        </div>
-
-        {currentOverrideCategoryId && (
-          <div className="flex items-center gap-2 mb-2">
-            <Badge variant="secondary" className="text-[10px]">Назначена вручную</Badge>
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-7 text-xs gap-1"
-              onClick={() => onReset(recordId)}
-            >
-              <RotateCcw className="w-3 h-3" /> Сбросить
-            </Button>
-          </div>
-        )}
-
-        <div className="flex-1 overflow-y-auto border rounded-md">
-          {filtered.length === 0 ? (
-            <div className="px-4 py-8 text-center text-sm text-muted-foreground">Нет категорий</div>
-          ) : (
-            <div className="py-1">
-              {filtered.map(({ cat, depth }) => {
-                const hasChildren = cat.children && cat.children.length > 0;
-                const isExpanded = expanded.has(cat.id);
-                const isSelected = currentOverrideCategoryId === cat.id;
-                return (
-                  <div
-                    key={cat.id}
-                    className={cn(
-                      "flex items-center gap-1 py-1.5 px-3 cursor-pointer transition-colors",
-                      isSelected && "bg-primary/10 text-primary",
-                      !isSelected && "hover:bg-muted/50"
-                    )}
-                    style={{ paddingLeft: 12 + depth * 16 }}
-                    onClick={() => {
-                      if (hasChildren) toggleExpand(cat.id);
-                      else onAssign(recordId, cat.id);
-                    }}
-                  >
-                    {hasChildren ? (
-                      <span className="w-4 flex items-center justify-center shrink-0">
-                        {isExpanded ? (
-                          <ChevronDown className="w-3 h-3 text-muted-foreground" />
-                        ) : (
-                          <ChevronRight className="w-3 h-3 text-muted-foreground" />
-                        )}
-                      </span>
-                    ) : (
-                      <span className="w-4" />
-                    )}
-                    {hasChildren ? (
-                      isExpanded ? (
-                        <FolderOpen className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-                      ) : (
-                        <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-                      )
-                    ) : (
-                      <Folder className="w-3.5 h-3.5 text-muted-foreground shrink-0" />
-                    )}
-                    <span className="text-xs truncate flex-1">{cat.name}</span>
-                    {cat.autoDetected && (
-                      <Badge variant="outline" className="text-[10px] shrink-0">авто</Badge>
-                    )}
-                    {isSelected && (
-                      <Badge className="text-[10px] shrink-0">текущая</Badge>
-                    )}
-                  </div>
-                );
-              })}
-            </div>
-          )}
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/client/src/components/finance/CategoryTree.tsx b/client/src/components/finance/CategoryTree.tsx
deleted file mode 100644
index bdc2dd5..0000000
--- a/client/src/components/finance/CategoryTree.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-import { useState, useCallback } from "react";
-import { ChevronRight, ChevronDown, Folder, FolderOpen, EyeOff, Wand2, ChevronsUpDown, ChevronsDownUp } from "lucide-react";
-import { cn, formatCurrency } from "@/lib/utils";
-import type { TreeNode } from "@/hooks/useFinance";
-
-interface CategoryTreeProps {
-  trees: TreeNode[];
-  onSelect?: (id: string, name: string) => void;
-  selectedId?: string | null;
-  /** Нераспределённые суммы (серая строка внизу, как в Data-Insight2) */
-  uncategorized?: { total: number; count: number } | null;
-  /** Ключ sessionStorage для персистентности развёрнутых узлов (по умолчанию не сохраняется) */
-  storageKey?: string;
-}
-
-const BAR_COLORS = ["bg-chart-1", "bg-chart-2", "bg-chart-3", "bg-chart-4", "bg-chart-5"];
-
-function loadExpanded(storageKey?: string): Set<string> {
-  // По умолчанию (как в Data-Insight2) всё свёрнуто
-  if (!storageKey) return new Set();
-  try {
-    const raw = sessionStorage.getItem(storageKey);
-    if (!raw) return new Set();
-    return new Set(JSON.parse(raw) as string[]);
-  } catch {
-    return new Set();
-  }
-}
-
-function collectIds(nodes: TreeNode[] | undefined, acc: string[] = []): string[] {
-  for (const n of nodes || []) {
-    acc.push(n.id);
-    collectIds(n.children, acc);
-  }
-  return acc;
-}
-
-function TreeNodeItem({
-  node,
-  depth,
-  onSelect,
-  selectedId,
-  expandedIds,
-  toggle,
-}: {
-  node: TreeNode;
-  depth: number;
-  onSelect?: (id: string, name: string) => void;
-  selectedId?: string | null;
-  expandedIds: Set<string>;
-  toggle: (id: string) => void;
-}) {
-  const hasChildren = node.children && node.children.length > 0;
-  const isExpanded = expandedIds.has(node.id);
-  const isSelected = selectedId === node.id;
-
-  return (
-    <div>
-      <div
-        className={cn(
-          "flex items-center gap-1 py-1 pr-2 rounded cursor-pointer transition-colors",
-          isSelected ? "bg-primary/10 text-primary" : "hover:bg-muted/50",
-          depth > 0 && "ml-4"
-        )}
-        onClick={() => {
-          if (hasChildren) toggle(node.id);
-          onSelect?.(node.id, node.name);
-        }}
-      >
-        <span className="w-4 h-4 flex items-center justify-center shrink-0">
-          {hasChildren ? (
-            isExpanded ? (
-              <ChevronDown className="w-3 h-3 text-muted-foreground" />
-            ) : (
-              <ChevronRight className="w-3 h-3 text-muted-foreground" />
-            )
-          ) : (
-            <span className="w-3" />
-          )}
-        </span>
-
-        {node.excluded ? (
-          <EyeOff className="w-3.5 h-3.5 text-muted-foreground shrink-0" />
-        ) : hasChildren ? (
-          isExpanded ? (
-            <FolderOpen className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-          ) : (
-            <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-          )
-        ) : (
-          <Folder className="w-3.5 h-3.5 text-muted-foreground shrink-0" />
-        )}
-
-        <span className={cn("text-xs truncate flex-1", node.excluded && "text-muted-foreground line-through")}>
-          {node.name}
-        </span>
-
-        {node.excluded && (
-          <span className="text-[9px] px-1 rounded border border-destructive/40 text-destructive/70 shrink-0">
-            Искл.
-          </span>
-        )}
-        {node.autoDetected && <Wand2 className="w-3 h-3 text-blue-400 shrink-0" />}
-
-        <span className="text-[11px] text-muted-foreground shrink-0 tabular-nums">
-          {formatCurrency(node.total)}
-        </span>
-        {node.count > 0 && (
-          <span className="text-[10px] text-muted-foreground/60 shrink-0 ml-1">
-            ({node.count})
-          </span>
-        )}
-      </div>
-
-      {hasChildren && isExpanded && (
-        <div>
-          {node.children!.map((child) => (
-            <TreeNodeItem
-              key={child.id}
-              node={child}
-              depth={depth + 1}
-              onSelect={onSelect}
-              selectedId={selectedId}
-              expandedIds={expandedIds}
-              toggle={toggle}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-export function CategoryTree({ trees, onSelect, selectedId, uncategorized, storageKey }: CategoryTreeProps) {
-  const [expandedIds, setExpandedIds] = useState<Set<string>>(() => loadExpanded(storageKey));
-
-  const persist = useCallback(
-    (next: Set<string>) => {
-      setExpandedIds(next);
-      if (storageKey) {
-        try {
-          sessionStorage.setItem(storageKey, JSON.stringify([...next]));
-        } catch {
-          // sessionStorage недоступен — игнорируем
-        }
-      }
-    },
-    [storageKey]
-  );
-
-  const toggle = useCallback(
-    (id: string) => {
-      setExpandedIds((prev) => {
-        const next = new Set(prev);
-        if (next.has(id)) next.delete(id);
-        else next.add(id);
-        persist(next);
-        return next;
-      });
-    },
-    [persist]
-  );
-
-  const setAll = useCallback(
-    (nodes: TreeNode[] | undefined, expand: boolean) => {
-      setExpandedIds((prev) => {
-        const next = new Set(prev);
-        for (const id of collectIds(nodes)) {
-          if (expand) next.add(id);
-          else next.delete(id);
-        }
-        persist(next);
-        return next;
-      });
-    },
-    [persist]
-  );
-
-  if (!trees || trees.length === 0) {
-    return <div className="text-xs text-muted-foreground py-2">Нет категорий</div>;
-  }
-
-  const maxTotal = Math.max(...trees.map((t) => t.total || 0), uncategorized?.total || 0, 1);
-
-  return (
-    <div className="space-y-1">
-      {trees.map((tree, idx) => (
-        <div key={tree.id} className="rounded border bg-card p-2">
-          <div className="flex items-center justify-between mb-1 gap-2">
-            <span className="text-xs font-semibold truncate flex items-center gap-1.5">
-              {tree.name}
-              {!tree.isPrimary && (
-                <span className="text-[9px] px-1 rounded bg-muted text-muted-foreground font-normal shrink-0">
-                  Отчет
-                </span>
-              )}
-            </span>
-            <div className="flex items-center gap-1 shrink-0">
-              <button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setAll(tree.nodes, true);
-                }}
-                title="Развернуть все"
-                className="p-0.5 rounded text-muted-foreground hover:text-foreground hover:bg-muted/60"
-              >
-                <ChevronsUpDown className="w-3 h-3" />
-              </button>
-              <button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setAll(tree.nodes, false);
-                }}
-                title="Свернуть все"
-                className="p-0.5 rounded text-muted-foreground hover:text-foreground hover:bg-muted/60"
-              >
-                <ChevronsDownUp className="w-3 h-3" />
-              </button>
-              <span className="text-[11px] text-muted-foreground tabular-nums">
-                {formatCurrency(tree.total)} ({tree.count})
-              </span>
-            </div>
-          </div>
-          <div className="h-1.5 bg-muted rounded-full overflow-hidden mb-2">
-            <div
-              className={cn("h-full rounded-full", BAR_COLORS[idx % BAR_COLORS.length])}
-              style={{ width: `${Math.min(100, ((tree.total || 0) / maxTotal) * 100)}%` }}
-            />
-          </div>
-          <div className="space-y-0.5">
-            {tree.nodes?.map((node) => (
-              <TreeNodeItem
-                key={node.id}
-                node={node}
-                depth={0}
-                onSelect={onSelect}
-                selectedId={selectedId}
-                expandedIds={expandedIds}
-                toggle={toggle}
-              />
-            ))}
-            {(!tree.nodes || tree.nodes.length === 0) && (
-              <div className="text-[10px] text-muted-foreground/60 py-1">Нет данных за период</div>
-            )}
-          </div>
-        </div>
-      ))}
-
-      {uncategorized && uncategorized.count > 0 && (
-        <div className="rounded border bg-card p-2">
-          <div className="flex items-center justify-between mb-1">
-            <span className="text-xs font-semibold text-muted-foreground">Нераспределённые</span>
-            <span className="text-[11px] text-muted-foreground tabular-nums">
-              {formatCurrency(uncategorized.total)} ({uncategorized.count})
-            </span>
-          </div>
-          <div className="h-1.5 bg-muted rounded-full overflow-hidden">
-            <div
-              className="h-full rounded-full bg-muted-foreground/30"
-              style={{ width: `${Math.min(100, ((uncategorized.total || 0) / maxTotal) * 100)}%` }}
-            />
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/client/src/components/finance/ColumnFilter.tsx b/client/src/components/finance/ColumnFilter.tsx
deleted file mode 100644
index 79ea2fb..0000000
--- a/client/src/components/finance/ColumnFilter.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useState, useEffect, useRef } from "react";
-import { Input } from "@/components/ui/input";
-import { Search, X } from "lucide-react";
-import { apiRequest } from "@/lib/queryClient";
-
-interface ColumnFilterProps {
-  column: string;
-  value: string;
-  onChange: (value: string) => void;
-  placeholder?: string;
-  apiEndpoint?: string; // e.g. "/api/income/column-values"
-  contextFilters?: Record<string, string>;
-}
-
-export function ColumnFilter({
-  column,
-  value,
-  onChange,
-  placeholder,
-  apiEndpoint,
-  contextFilters,
-}: ColumnFilterProps) {
-  const [search, setSearch] = useState(value);
-  const [suggestions, setSuggestions] = useState<string[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [open, setOpen] = useState(false);
-  const debounceRef = useRef<ReturnType<typeof setTimeout>>();
-  const containerRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    setSearch(value);
-  }, [value]);
-
-  useEffect(() => {
-    if (!apiEndpoint || !column) return;
-    clearTimeout(debounceRef.current);
-    debounceRef.current = setTimeout(async () => {
-      try {
-        setLoading(true);
-        const params = new URLSearchParams();
-        params.set("column", column);
-        if (search) params.set("search", search);
-        if (contextFilters) params.set("context", JSON.stringify(contextFilters));
-        const res = await apiRequest("GET", `${apiEndpoint}?${params.toString()}`);
-        const data = await res.json();
-        setSuggestions(data.values || []);
-        setOpen(true);
-      } catch {
-        setSuggestions([]);
-      } finally {
-        setLoading(false);
-      }
-    }, 250);
-    return () => clearTimeout(debounceRef.current);
-  }, [search, column, apiEndpoint, contextFilters]);
-
-  useEffect(() => {
-    function handleClick(e: MouseEvent) {
-      if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
-        setOpen(false);
-      }
-    }
-    document.addEventListener("mousedown", handleClick);
-    return () => document.removeEventListener("mousedown", handleClick);
-  }, []);
-
-  return (
-    <div ref={containerRef} className="relative">
-      <Search className="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground pointer-events-none" />
-      <Input
-        value={search}
-        onChange={(e) => {
-          setSearch(e.target.value);
-          onChange(e.target.value);
-        }}
-        onFocus={() => {
-          if (suggestions.length > 0) setOpen(true);
-        }}
-        placeholder={placeholder || "Фильтр..."}
-        className="h-7 text-xs pl-8 pr-7"
-      />
-      {search && (
-        <button
-          className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-          onClick={() => {
-            setSearch("");
-            onChange("");
-            setSuggestions([]);
-          }}
-        >
-          <X className="w-3 h-3" />
-        </button>
-      )}
-      {open && suggestions.length > 0 && (
-        <div className="absolute z-50 mt-1 w-full bg-popover border rounded-md shadow-md max-h-[200px] overflow-auto">
-          {suggestions.map((s, i) => (
-            <button
-              key={i}
-              className="w-full px-3 py-1.5 text-xs text-left hover:bg-accent transition-colors"
-              onClick={() => {
-                setSearch(s);
-                onChange(s);
-                setOpen(false);
-              }}
-            >
-              {s}
-            </button>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/client/src/components/finance/ConnectionStatus.tsx b/client/src/components/finance/ConnectionStatus.tsx
deleted file mode 100644
index 0ac8ae2..0000000
--- a/client/src/components/finance/ConnectionStatus.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Loader2, CheckCircle2, XCircle } from "lucide-react";
-import { useDbStatus } from "@/hooks/useFinance";
-
-export function ConnectionStatus() {
-  const { data, isLoading } = useDbStatus();
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
-        <Loader2 className="w-3.5 h-3.5 animate-spin" />
-        Проверка подключения...
-      </div>
-    );
-  }
-
-  const connected = data?.connected ?? false;
-
-  return (
-    <div className={`flex items-center gap-1.5 text-xs ${connected ? "text-emerald-600" : "text-red-600"}`}>
-      {connected ? <CheckCircle2 className="w-3.5 h-3.5" /> : <XCircle className="w-3.5 h-3.5" />}
-      {connected ? "Подключено к внешней БД" : "Нет подключения к внешней БД"}
-    </div>
-  );
-}
diff --git a/client/src/components/finance/ContractSyncDialog.tsx b/client/src/components/finance/ContractSyncDialog.tsx
deleted file mode 100644
index 0bc7c7a..0000000
--- a/client/src/components/finance/ContractSyncDialog.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { useState, useMemo } from "react";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Loader2, FileText, Check, AlertCircle } from "lucide-react";
-import {
-  useContractSyncPreview,
-  useContractSyncApply,
-} from "@/hooks/useFinance";
-
-interface ContractItem {
-  raw: string;
-  number: string;
-  date: string;
-  inn: string;
-  customerTaskId?: number;
-}
-
-export function ContractSyncDialog() {
-  const [open, setOpen] = useState(false);
-  const [selectedAuto, setSelectedAuto] = useState<Set<string>>(new Set());
-
-  const previewMutation = useContractSyncPreview();
-  const applyMutation = useContractSyncApply();
-
-  const preview = previewMutation.data;
-
-  const autoItems = preview?.auto || [];
-  const ambiguousItems = preview?.ambiguous || [];
-  const existingItems = preview?.existing || [];
-  const skippedCount = preview?.skipped || 0;
-
-  const totalToCreate = useMemo(() => {
-    return Array.from(selectedAuto).filter((key) =>
-      autoItems.some((a) => `${a.number}:${a.date}:${a.inn}` === key)
-    ).length;
-  }, [selectedAuto, autoItems]);
-
-  const handlePreview = () => {
-    setSelectedAuto(new Set());
-    previewMutation.mutate({ formId: 9 });
-  };
-
-  const handleApply = () => {
-    const contracts: Array<{ raw: string; number: string; date: string; inn: string; customerTaskId: number }> = [];
-
-    for (const item of autoItems) {
-      const key = `${item.number}:${item.date}:${item.inn}`;
-      if (selectedAuto.has(key) && item.customerTaskId) {
-        contracts.push({
-          raw: item.raw,
-          number: item.number,
-          date: item.date,
-          inn: item.inn,
-          customerTaskId: item.customerTaskId,
-        });
-      }
-    }
-
-    applyMutation.mutate(
-      { formId: 9, contracts },
-      {
-        onSuccess: () => {
-          setOpen(false);
-        },
-      }
-    );
-  };
-
-  const toggleAuto = (key: string) => {
-    setSelectedAuto((prev) => {
-      const next = new Set(prev);
-      if (next.has(key)) next.delete(key);
-      else next.add(key);
-      return next;
-    });
-  };
-
-  const selectAllAuto = () => {
-    setSelectedAuto(new Set(autoItems.map((a) => `${a.number}:${a.date}:${a.inn}`)));
-  };
-
-  const deselectAllAuto = () => {
-    setSelectedAuto(new Set());
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>
-        <Button variant="outline" size="sm" className="text-xs">
-          <FileText className="w-3.5 h-3.5 mr-1" />
-          Синхронизировать договоры
-        </Button>
-      </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle className="text-base">Синхронизация договоров</DialogTitle>
-        </DialogHeader>
-
-        {!preview && !previewMutation.isPending && (
-          <div className="py-4 text-center">
-            <p className="text-sm text-muted-foreground mb-3">
-              Система просканирует уникальные договоры из доходов,
-              проверит их наличие в форме «Договора» и предложит создать отсутствующие.
-            </p>
-            <Button onClick={handlePreview} size="sm">
-              <FileText className="w-3.5 h-3.5 mr-1" />
-              Начать анализ
-            </Button>
-          </div>
-        )}
-
-        {previewMutation.isPending && (
-          <div className="py-8 flex flex-col items-center gap-2">
-            <Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
-            <p className="text-sm text-muted-foreground">Анализируем договоры...</p>
-          </div>
-        )}
-
-        {preview && (
-          <div className="space-y-4">
-            {/* Статистика */}
-            <div className="grid grid-cols-4 gap-2 text-center">
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-green-600">{autoItems.length}</div>
-                <div className="text-xs text-muted-foreground">Авто</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-amber-600">{ambiguousItems.length}</div>
-                <div className="text-xs text-muted-foreground">Требуют выбора</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-blue-600">{existingItems.length}</div>
-                <div className="text-xs text-muted-foreground">Уже есть</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-gray-500">{skippedCount}</div>
-                <div className="text-xs text-muted-foreground">Без данных</div>
-              </div>
-            </div>
-
-            {/* Авто */}
-            {autoItems.length > 0 && (
-              <div>
-                <div className="flex items-center justify-between mb-2">
-                  <h4 className="text-sm font-semibold flex items-center gap-1">
-                    <Check className="w-4 h-4 text-green-600" />
-                    Автоматически ({autoItems.length})
-                  </h4>
-                  <div className="flex gap-1">
-                    <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={selectAllAuto}>
-                      Все
-                    </Button>
-                    <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={deselectAllAuto}>
-                      Ничего
-                    </Button>
-                  </div>
-                </div>
-                <div className="border rounded-md divide-y max-h-48 overflow-y-auto">
-                  {autoItems.map((item) => {
-                    const key = `${item.number}:${item.date}:${item.inn}`;
-                    return (
-                      <label
-                        key={key}
-                        className="flex items-start gap-2 p-2 hover:bg-muted/50 cursor-pointer"
-                      >
-                        <Checkbox
-                          checked={selectedAuto.has(key)}
-                          onCheckedChange={() => toggleAuto(key)}
-                          className="mt-0.5"
-                        />
-                        <div className="flex-1 min-w-0">
-                          <div className="text-sm font-medium truncate">
-                            Договор №{item.number}
-                          </div>
-                          <div className="text-xs text-muted-foreground">
-                            Дата: {item.date} · ИНН: {item.inn}
-                          </div>
-                          <div className="text-xs text-muted-foreground truncate">
-                            {item.raw}
-                          </div>
-                        </div>
-                      </label>
-                    );
-                  })}
-                </div>
-              </div>
-            )}
-
-            {/* Неоднозначные */}
-            {ambiguousItems.length > 0 && (
-              <div>
-                <h4 className="text-sm font-semibold flex items-center gap-1 mb-2">
-                  <AlertCircle className="w-4 h-4 text-amber-600" />
-                  Требуют внимания ({ambiguousItems.length})
-                </h4>
-                <div className="space-y-2 max-h-64 overflow-y-auto border rounded-md p-2">
-                  {ambiguousItems.map((item) => (
-                    <div key={item.raw} className="space-y-1">
-                      <div className="text-sm font-medium truncate">{item.raw}</div>
-                      <div className="text-xs text-amber-600">{item.reason}</div>
-                    </div>
-                  ))}
-                </div>
-              </div>
-            )}
-
-            {autoItems.length === 0 && ambiguousItems.length === 0 && (
-              <div className="text-center py-4 text-sm text-muted-foreground">
-                Все договоры уже есть в форме. Ничего синхронизировать.
-              </div>
-            )}
-
-            {/* Кнопки */}
-            <div className="flex justify-between items-center pt-2">
-              <Button variant="ghost" size="sm" onClick={handlePreview} disabled={previewMutation.isPending}>
-                Обновить анализ
-              </Button>
-              <Button
-                size="sm"
-                onClick={handleApply}
-                disabled={totalToCreate === 0 || applyMutation.isPending}
-              >
-                {applyMutation.isPending ? (
-                  <Loader2 className="w-3.5 h-3.5 animate-spin mr-1" />
-                ) : (
-                  <Check className="w-3.5 h-3.5 mr-1" />
-                )}
-                Создать {totalToCreate} договоров
-              </Button>
-            </div>
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/client/src/components/finance/CopyableCell.tsx b/client/src/components/finance/CopyableCell.tsx
deleted file mode 100644
index a5977b2..0000000
--- a/client/src/components/finance/CopyableCell.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useState, useRef, useEffect } from "react";
-import { cn } from "@/lib/utils";
-
-interface CopyableCellProps {
-  text: string;
-  className?: string;
-}
-
-export function CopyableCell({ text, className }: CopyableCellProps) {
-  const [open, setOpen] = useState(false);
-  const ref = useRef<HTMLSpanElement>(null);
-  const [isTruncated, setIsTruncated] = useState(false);
-
-  useEffect(() => {
-    const el = ref.current;
-    if (el) {
-      setIsTruncated(el.scrollWidth > el.clientWidth);
-    }
-  }, [text]);
-
-  return (
-    <>
-      <span
-        ref={ref}
-        className={cn(
-          "truncate inline-block max-w-[200px] cursor-pointer",
-          isTruncated && "hover:underline",
-          className
-        )}
-        onClick={() => isTruncated && setOpen(true)}
-        title={isTruncated ? text : undefined}
-      >
-        {text}
-      </span>
-      {open && (
-        <div
-          className="fixed inset-0 z-50 flex items-start justify-center pt-20 bg-black/20"
-          onClick={() => setOpen(false)}
-        >
-          <div
-            className="bg-popover border rounded-lg shadow-xl p-4 max-w-lg w-full mx-4"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <p className="text-sm break-words">{text}</p>
-            <button
-              className="mt-3 text-xs text-muted-foreground hover:text-foreground"
-              onClick={() => setOpen(false)}
-            >
-              Закрыть
-            </button>
-          </div>
-        </div>
-      )}
-    </>
-  );
-}
diff --git a/client/src/components/finance/CustomerSyncDialog.tsx b/client/src/components/finance/CustomerSyncDialog.tsx
deleted file mode 100644
index 2b01b59..0000000
--- a/client/src/components/finance/CustomerSyncDialog.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import { useState, useMemo } from "react";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Loader2, Users, Check, AlertCircle } from "lucide-react";
-import {
-  useCustomerSyncPreview,
-  useCustomerSyncApply,
-  type DadataCompany,
-} from "@/hooks/useFinance";
-import CompanyFieldInput from "@/components/CompanyFieldInput";
-
-interface SyncItem {
-  name: string;
-  inn: string;
-  selectedDadata?: DadataCompany;
-}
-
-export function CustomerSyncDialog() {
-  const [open, setOpen] = useState(false);
-  const [selectedAuto, setSelectedAuto] = useState<Set<string>>(new Set());
-  const [resolvedAmbiguous, setResolvedAmbiguous] = useState<Map<string, DadataCompany>>(new Map());
-
-  const previewMutation = useCustomerSyncPreview();
-  const applyMutation = useCustomerSyncApply();
-
-  const preview = previewMutation.data;
-
-  const autoItems = preview?.auto || [];
-  const ambiguousItems = preview?.ambiguous || [];
-  const existingItems = preview?.existing || [];
-  const skippedCount = preview?.skipped || 0;
-
-  const totalToCreate = useMemo(() => {
-    const autoCount = Array.from(selectedAuto).filter((inn) =>
-      autoItems.some((a) => a.inn === inn)
-    ).length;
-    const ambCount = ambiguousItems.filter((a) => resolvedAmbiguous.has(a.inn)).length;
-    return autoCount + ambCount;
-  }, [selectedAuto, resolvedAmbiguous, autoItems, ambiguousItems]);
-
-  const handlePreview = () => {
-    setSelectedAuto(new Set());
-    setResolvedAmbiguous(new Map());
-    previewMutation.mutate({ formId: 8 });
-  };
-
-  const handleApply = () => {
-    const customers: Array<{ name: string; inn: string; selectedDadata?: DadataCompany }> = [];
-
-    for (const item of autoItems) {
-      if (selectedAuto.has(item.inn)) {
-        customers.push({ name: item.name, inn: item.inn, selectedDadata: item.company });
-      }
-    }
-
-    for (const item of ambiguousItems) {
-      const resolved = resolvedAmbiguous.get(item.inn);
-      if (resolved) {
-        customers.push({ name: item.name, inn: item.inn, selectedDadata: resolved });
-      }
-    }
-
-    applyMutation.mutate(
-      { formId: 8, customers },
-      {
-        onSuccess: () => {
-          setOpen(false);
-        },
-      }
-    );
-  };
-
-  const toggleAuto = (inn: string) => {
-    setSelectedAuto((prev) => {
-      const next = new Set(prev);
-      if (next.has(inn)) next.delete(inn);
-      else next.add(inn);
-      return next;
-    });
-  };
-
-  const selectAllAuto = () => {
-    setSelectedAuto(new Set(autoItems.map((a) => a.inn)));
-  };
-
-  const deselectAllAuto = () => {
-    setSelectedAuto(new Set());
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>
-        <Button variant="outline" size="sm" className="text-xs">
-          <Users className="w-3.5 h-3.5 mr-1" />
-          Синхронизировать заказчиков
-        </Button>
-      </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle className="text-base">Синхронизация заказчиков</DialogTitle>
-        </DialogHeader>
-
-        {!preview && !previewMutation.isPending && (
-          <div className="py-4 text-center">
-            <p className="text-sm text-muted-foreground mb-3">
-              Система просканирует уникальных заказчиков из доходов по ИНН,
-              проверит их наличие в форме «Заказчик» и предложит создать отсутствующих.
-            </p>
-            <Button onClick={handlePreview} size="sm">
-              <Users className="w-3.5 h-3.5 mr-1" />
-              Начать анализ
-            </Button>
-          </div>
-        )}
-
-        {previewMutation.isPending && (
-          <div className="py-8 flex flex-col items-center gap-2">
-            <Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
-            <p className="text-sm text-muted-foreground">Анализируем заказчиков...</p>
-          </div>
-        )}
-
-        {preview && (
-          <div className="space-y-4">
-            {/* Статистика */}
-            <div className="grid grid-cols-4 gap-2 text-center">
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-green-600">{autoItems.length}</div>
-                <div className="text-xs text-muted-foreground">Авто</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-amber-600">{ambiguousItems.length}</div>
-                <div className="text-xs text-muted-foreground">Требуют выбора</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-blue-600">{existingItems.length}</div>
-                <div className="text-xs text-muted-foreground">Уже есть</div>
-              </div>
-              <div className="bg-muted rounded-lg p-2">
-                <div className="text-lg font-semibold text-gray-500">{skippedCount}</div>
-                <div className="text-xs text-muted-foreground">Без ИНН</div>
-              </div>
-            </div>
-
-            {/* Авто */}
-            {autoItems.length > 0 && (
-              <div>
-                <div className="flex items-center justify-between mb-2">
-                  <h4 className="text-sm font-semibold flex items-center gap-1">
-                    <Check className="w-4 h-4 text-green-600" />
-                    Автоматически ({autoItems.length})
-                  </h4>
-                  <div className="flex gap-1">
-                    <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={selectAllAuto}>
-                      Все
-                    </Button>
-                    <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={deselectAllAuto}>
-                      Ничего
-                    </Button>
-                  </div>
-                </div>
-                <div className="border rounded-md divide-y max-h-48 overflow-y-auto">
-                  {autoItems.map((item) => (
-                    <label
-                      key={item.inn}
-                      className="flex items-start gap-2 p-2 hover:bg-muted/50 cursor-pointer"
-                    >
-                      <Checkbox
-                        checked={selectedAuto.has(item.inn)}
-                        onCheckedChange={() => toggleAuto(item.inn)}
-                        className="mt-0.5"
-                      />
-                      <div className="flex-1 min-w-0">
-                        <div className="text-sm font-medium truncate">{item.name}</div>
-                        <div className="text-xs text-muted-foreground">
-                          ИНН: {item.inn}
-                          {item.company.data.address?.value && ` · ${item.company.data.address.value}`}
-                        </div>
-                      </div>
-                    </label>
-                  ))}
-                </div>
-              </div>
-            )}
-
-            {/* Неоднозначные */}
-            {ambiguousItems.length > 0 && (
-              <div>
-                <h4 className="text-sm font-semibold flex items-center gap-1 mb-2">
-                  <AlertCircle className="w-4 h-4 text-amber-600" />
-                  Требуют выбора ({ambiguousItems.length})
-                </h4>
-                <div className="space-y-2 max-h-64 overflow-y-auto border rounded-md p-2">
-                  {ambiguousItems.map((item) => (
-                    <div key={item.inn} className="space-y-1">
-                      <div className="text-sm font-medium">{item.name}</div>
-                      <div className="text-xs text-muted-foreground">ИНН: {item.inn}</div>
-                      <CompanyFieldInput
-                        value={resolvedAmbiguous.get(item.inn)?.value || ""}
-                        onChange={() => {}}
-                        onSelect={(company) => {
-                          setResolvedAmbiguous((prev) => {
-                            const next = new Map(prev);
-                            next.set(item.inn, company);
-                            return next;
-                          });
-                        }}
-                        placeholder="Начните вводить название компании..."
-                      />
-                      {item.suggestions.length > 1 && (
-                        <div className="text-xs text-muted-foreground">
-                          Найдено вариантов: {item.suggestions.length}. Выберите правильный через поле выше.
-                        </div>
-                      )}
-                      {item.suggestions.length === 0 && (
-                        <div className="text-xs text-red-500">
-                          По ИНН ничего не найдено. Выберите компанию вручную.
-                        </div>
-                      )}
-                    </div>
-                  ))}
-                </div>
-              </div>
-            )}
-
-            {autoItems.length === 0 && ambiguousItems.length === 0 && (
-              <div className="text-center py-4 text-sm text-muted-foreground">
-                Все заказчики с ИНН уже есть в форме. Ничего синхронизировать.
-              </div>
-            )}
-
-            {/* Кнопки */}
-            <div className="flex justify-between items-center pt-2">
-              <Button variant="ghost" size="sm" onClick={handlePreview} disabled={previewMutation.isPending}>
-                Обновить анализ
-              </Button>
-              <Button
-                size="sm"
-                onClick={handleApply}
-                disabled={totalToCreate === 0 || applyMutation.isPending}
-              >
-                {applyMutation.isPending ? (
-                  <Loader2 className="w-3.5 h-3.5 animate-spin mr-1" />
-                ) : (
-                  <Check className="w-3.5 h-3.5 mr-1" />
-                )}
-                Создать {totalToCreate} заказчиков
-              </Button>
-            </div>
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/client/src/components/finance/DarkModeToggle.tsx b/client/src/components/finance/DarkModeToggle.tsx
deleted file mode 100644
index 6aa6c27..0000000
--- a/client/src/components/finance/DarkModeToggle.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useState, useEffect } from "react";
-import { Button } from "@/components/ui/button";
-import { Moon, Sun } from "lucide-react";
-
-export function DarkModeToggle() {
-  const [isDark, setIsDark] = useState(() => {
-    if (typeof window === "undefined") return false;
-    return document.documentElement.classList.contains("dark");
-  });
-
-  useEffect(() => {
-    const root = document.documentElement;
-    if (isDark) {
-      root.classList.add("dark");
-    } else {
-      root.classList.remove("dark");
-    }
-    localStorage.setItem("omegaprom-finance-theme", isDark ? "dark" : "light");
-  }, [isDark]);
-
-  return (
-    <Button
-      variant="ghost"
-      size="icon"
-      className="h-7 w-7"
-      onClick={() => setIsDark((d) => !d)}
-      title={isDark ? "Светлая тема" : "Тёмная тема"}
-      data-testid="dark-mode-toggle"
-    >
-      {isDark ? (
-        <Sun className="w-3.5 h-3.5" />
-      ) : (
-        <Moon className="w-3.5 h-3.5" />
-      )}
-    </Button>
-  );
-}
diff --git a/client/src/components/finance/DataTable.tsx b/client/src/components/finance/DataTable.tsx
deleted file mode 100644
index ea1fe68..0000000
--- a/client/src/components/finance/DataTable.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { useState } from "react";
-import {
-  ChevronLeft,
-  ChevronRight,
-  ChevronsLeft,
-  ChevronsRight,
-  ArrowUpDown,
-  ArrowUp,
-  ArrowDown,
-} from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { cn, formatCurrency } from "@/lib/utils";
-import type { PaginatedResult } from "@/hooks/useFinance";
-
-interface DataTableProps {
-  data?: PaginatedResult<any>;
-  loading?: boolean;
-  columnLabels: Record<string, string>;
-  sumColumn: string;
-  visibleColumns?: string[];
-  sortBy: string;
-  sortDir: "asc" | "desc";
-  onSort: (col: string) => void;
-  filters: Record<string, string>;
-  onFilterChange: (col: string, val: string) => void;
-  page: number;
-  onPageChange: (p: number) => void;
-  pageSize: number;
-  onPageSizeChange?: (s: number) => void;
-}
-
-export function DataTable({
-  data,
-  loading,
-  columnLabels,
-  sumColumn,
-  visibleColumns,
-  sortBy,
-  sortDir,
-  onSort,
-  filters,
-  onFilterChange,
-  page,
-  onPageChange,
-  pageSize,
-  onPageSizeChange,
-}: DataTableProps) {
-  const rows = data?.rows ?? [];
-  const total = data?.total ?? 0;
-  const totalPages = data?.totalPages ?? 1;
-  const totalSum = data?.totalSum ?? 0;
-
-  const allColumns = Object.keys(columnLabels);
-  const cols = visibleColumns?.length ? visibleColumns.filter((c) => allColumns.includes(c)) : allColumns;
-
-  const getSortIcon = (col: string) => {
-    if (sortBy !== col) return <ArrowUpDown className="w-3 h-3 text-muted-foreground/50" />;
-    return sortDir === "asc" ? <ArrowUp className="w-3 h-3" /> : <ArrowDown className="w-3 h-3" />;
-  };
-
-  return (
-    <div className="space-y-2">
-      {/* Filters */}
-      <div className="flex flex-wrap gap-2">
-        {cols.slice(0, 4).map((col) => (
-          <Input
-            key={col}
-            placeholder={columnLabels[col] || col}
-            value={filters[col] || ""}
-            onChange={(e) => onFilterChange(col, e.target.value)}
-            className="h-7 text-xs w-40"
-          />
-        ))}
-      </div>
-
-      {/* Table */}
-      <div className="rounded-md border overflow-x-auto">
-        <table className="w-full text-xs">
-          <thead className="bg-muted">
-            <tr>
-              {cols.map((col) => (
-                <th
-                  key={col}
-                  className="px-2 py-1.5 text-left font-medium text-muted-foreground whitespace-nowrap cursor-pointer select-none"
-                  onClick={() => onSort(col)}
-                >
-                  <div className="flex items-center gap-1">
-                    {columnLabels[col] || col}
-                    {getSortIcon(col)}
-                  </div>
-                </th>
-              ))}
-            </tr>
-          </thead>
-          <tbody>
-            {loading && rows.length === 0 ? (
-              <tr>
-                <td colSpan={cols.length} className="px-2 py-8 text-center text-muted-foreground">
-                  Загрузка...
-                </td>
-              </tr>
-            ) : rows.length === 0 ? (
-              <tr>
-                <td colSpan={cols.length} className="px-2 py-8 text-center text-muted-foreground">
-                  Нет данных
-                </td>
-              </tr>
-            ) : (
-              rows.map((row, idx) => (
-                <tr
-                  key={row.id ?? idx}
-                  className={cn("border-t transition-colors hover:bg-muted/50", idx % 2 === 0 && "bg-muted/20")}
-                >
-                  {cols.map((col) => {
-                    const val = row[col];
-                    const isSum = col === sumColumn;
-                    return (
-                      <td
-                        key={col}
-                        className={cn(
-                          "px-2 py-1.5 whitespace-nowrap",
-                          isSum && "font-medium text-right"
-                        )}
-                      >
-                        {isSum && val != null
-                          ? formatCurrency(parseFloat(val) || 0)
-                          : val ?? "—"}
-                      </td>
-                    );
-                  })}
-                </tr>
-              ))
-            )}
-          </tbody>
-        </table>
-      </div>
-
-      {/* Footer */}
-      <div className="flex items-center justify-between">
-        <div className="text-[11px] text-muted-foreground">
-          {total} записей
-          {totalSum != null && (
-            <span className="ml-2 font-medium">Σ {formatCurrency(totalSum)}</span>
-          )}
-        </div>
-
-        <div className="flex items-center gap-1">
-          {onPageSizeChange && (
-            <select
-              value={pageSize}
-              onChange={(e) => onPageSizeChange(Number(e.target.value))}
-              className="h-7 text-xs rounded border bg-background px-1 mr-2"
-            >
-              <option value={25}>25</option>
-              <option value={50}>50</option>
-              <option value={100}>100</option>
-              <option value={200}>200</option>
-            </select>
-          )}
-          <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => onPageChange(1)} disabled={page <= 1}>
-            <ChevronsLeft className="w-3.5 h-3.5" />
-          </Button>
-          <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => onPageChange(page - 1)} disabled={page <= 1}>
-            <ChevronLeft className="w-3.5 h-3.5" />
-          </Button>
-          <span className="text-xs px-2">
-            {page} / {totalPages || 1}
-          </span>
-          <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => onPageChange(page + 1)} disabled={page >= totalPages}>
-            <ChevronRight className="w-3.5 h-3.5" />
-          </Button>
-          <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => onPageChange(totalPages)} disabled={page >= totalPages}>
-            <ChevronsRight className="w-3.5 h-3.5" />
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/DatabaseError.tsx b/client/src/components/finance/DatabaseError.tsx
deleted file mode 100644
index 4255eeb..0000000
--- a/client/src/components/finance/DatabaseError.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AlertCircle } from "lucide-react";
-import { Card, CardContent } from "@/components/ui/card";
-
-export function DatabaseError() {
-  return (
-    <Card className="border-destructive/30">
-      <CardContent className="py-8 flex flex-col items-center gap-3 text-center">
-        <AlertCircle className="w-8 h-8 text-destructive" />
-        <div>
-          <p className="text-sm font-medium">Ошибка подключения к базе данных</p>
-          <p className="text-xs text-muted-foreground mt-1">
-            Проверьте настройки подключения в разделе «Настройки»
-          </p>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/client/src/components/finance/DateRangeFilter.tsx b/client/src/components/finance/DateRangeFilter.tsx
deleted file mode 100644
index 63039eb..0000000
--- a/client/src/components/finance/DateRangeFilter.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useState } from "react";
-import { Button } from "@/components/ui/button";
-import { CalendarIcon } from "lucide-react";
-import { format } from "date-fns";
-import { ru } from "date-fns/locale";
-import { cn } from "@/lib/utils";
-import { Calendar } from "@/components/ui/calendar";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-
-export interface DateRange {
-  from?: Date;
-  to?: Date;
-}
-
-interface DateRangeFilterProps {
-  value: DateRange;
-  onChange: (range: DateRange) => void;
-}
-
-export function DateRangeFilter({ value, onChange }: DateRangeFilterProps) {
-  const [localRange, setLocalRange] = useState<DateRange>(value);
-
-  const handleApply = () => {
-    onChange(localRange);
-  };
-
-  const handleClear = () => {
-    setLocalRange({});
-    onChange({});
-  };
-
-  const hasRange = value.from || value.to;
-
-  return (
-    <div className="flex items-center gap-2">
-      <Popover>
-        <PopoverTrigger asChild>
-          <Button
-            variant="outline"
-            size="sm"
-            className={cn(
-              "justify-start text-left font-normal text-xs h-8",
-              !hasRange && "text-muted-foreground"
-            )}
-          >
-            <CalendarIcon className="mr-2 h-3.5 w-3.5" />
-            {value.from ? (
-              value.to ? (
-                <>
-                  {format(value.from, "dd.MM.yyyy", { locale: ru })} -{" "}
-                  {format(value.to, "dd.MM.yyyy", { locale: ru })}
-                </>
-              ) : (
-                format(value.from, "dd.MM.yyyy", { locale: ru })
-              )
-            ) : (
-              "Выберите период"
-            )}
-          </Button>
-        </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start">
-          <Calendar
-            initialFocus
-            mode="range"
-            defaultMonth={localRange.from}
-            selected={{
-              from: localRange.from,
-              to: localRange.to,
-            }}
-            onSelect={(range) => {
-              setLocalRange({
-                from: range?.from,
-                to: range?.to,
-              });
-            }}
-            numberOfMonths={2}
-            locale={ru}
-          />
-          <div className="flex items-center justify-end gap-2 p-2 border-t border-border">
-            <Button variant="ghost" size="sm" className="text-xs h-7" onClick={handleClear}>
-              Сбросить
-            </Button>
-            <Button size="sm" className="text-xs h-7" onClick={handleApply}>
-              Применить
-            </Button>
-          </div>
-        </PopoverContent>
-      </Popover>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/DraggableColumnList.tsx b/client/src/components/finance/DraggableColumnList.tsx
deleted file mode 100644
index 1eb0903..0000000
--- a/client/src/components/finance/DraggableColumnList.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useState } from "react";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Button } from "@/components/ui/button";
-import { GripVertical } from "lucide-react";
-import { cn } from "@/lib/utils";
-
-interface DraggableColumnListProps {
-  allColumns: { key: string; label: string }[];
-  columnOrder: string[];
-  visibleCols: string[];
-  onOrderChange: (order: string[]) => void;
-  onToggle: (key: string) => void;
-  onShowAll: () => void;
-  onReset: () => void;
-}
-
-export function DraggableColumnList({
-  allColumns,
-  columnOrder,
-  visibleCols,
-  onOrderChange,
-  onToggle,
-  onShowAll,
-  onReset,
-}: DraggableColumnListProps) {
-  const [dragging, setDragging] = useState<string | null>(null);
-  const order = columnOrder.length > 0 ? columnOrder : allColumns.map((c) => c.key);
-
-  const orderedCols = order
-    .map((k) => allColumns.find((c) => c.key === k))
-    .filter(Boolean) as { key: string; label: string }[];
-
-  const handleDragStart = (key: string) => {
-    setDragging(key);
-  };
-
-  const handleDragOver = (e: React.DragEvent, overKey: string) => {
-    e.preventDefault();
-    if (!dragging || dragging === overKey) return;
-    const newOrder = [...order];
-    const fromIdx = newOrder.indexOf(dragging);
-    const toIdx = newOrder.indexOf(overKey);
-    if (fromIdx < 0 || toIdx < 0) return;
-    newOrder.splice(fromIdx, 1);
-    newOrder.splice(toIdx, 0, dragging);
-    onOrderChange(newOrder);
-  };
-
-  const handleDragEnd = () => {
-    setDragging(null);
-  };
-
-  return (
-    <div className="space-y-1">
-      {orderedCols.map((col) => (
-        <div
-          key={col.key}
-          draggable
-          onDragStart={() => handleDragStart(col.key)}
-          onDragOver={(e) => handleDragOver(e, col.key)}
-          onDragEnd={handleDragEnd}
-          className={cn(
-            "flex items-center gap-2 py-1 px-1 rounded cursor-move transition-colors",
-            dragging === col.key ? "bg-accent opacity-60" : "hover:bg-muted/50"
-          )}
-        >
-          <GripVertical className="w-4 h-4 text-muted-foreground/50 shrink-0" />
-          <Checkbox
-            checked={visibleCols.includes(col.key)}
-            onCheckedChange={() => onToggle(col.key)}
-            className="shrink-0"
-          />
-          <span className="text-xs truncate">{col.label}</span>
-        </div>
-      ))}
-      <div className="border-t mt-2 pt-2 flex justify-between">
-        <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={onShowAll}>
-          Все
-        </Button>
-        <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={onReset}>
-          По умолчанию
-        </Button>
-      </div>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/FinanceHeader.tsx b/client/src/components/finance/FinanceHeader.tsx
deleted file mode 100644
index 8c6f2d6..0000000
--- a/client/src/components/finance/FinanceHeader.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Button } from "@/components/ui/button";
-import { ArrowLeft, RefreshCw, Loader2, PanelLeft } from "lucide-react";
-import { DarkModeToggle } from "./DarkModeToggle";
-import { useRefreshAll } from "@/hooks/useFinance";
-
-interface FinanceHeaderProps {
-  showBack?: boolean;
-  onToggleSidebar?: () => void;
-}
-
-export function FinanceHeader({ showBack, onToggleSidebar }: FinanceHeaderProps) {
-  const refreshAll = useRefreshAll();
-
-  return (
-    <header className="flex items-center justify-between px-4 h-12 border-b border-border bg-background shrink-0">
-      <div className="flex items-center gap-2">
-        <Button
-          variant="ghost"
-          size="icon"
-          className="h-7 w-7 hidden md:inline-flex"
-          onClick={onToggleSidebar}
-          title="Сайдбар"
-          data-testid="header-sidebar-toggle"
-        >
-          <PanelLeft className="w-4 h-4" />
-        </Button>
-        {showBack && (
-          <Button
-            variant="ghost"
-            size="icon"
-            className="h-7 w-7"
-            onClick={() => window.history.back()}
-            data-testid="header-back"
-          >
-            <ArrowLeft className="w-4 h-4" />
-          </Button>
-        )}
-      </div>
-
-      <div className="flex items-center gap-2">
-        <Button
-          size="sm"
-          variant="ghost"
-          className="h-7 text-xs gap-1.5"
-          onClick={() => refreshAll.mutate()}
-          disabled={refreshAll.isPending}
-          data-testid="header-refresh"
-        >
-          {refreshAll.isPending ? (
-            <Loader2 className="w-3.5 h-3.5 animate-spin" />
-          ) : (
-            <RefreshCw className="w-3.5 h-3.5" />
-          )}
-          Обновить данные
-        </Button>
-        <DarkModeToggle />
-      </div>
-    </header>
-  );
-}
diff --git a/client/src/components/finance/FinanceLayout.tsx b/client/src/components/finance/FinanceLayout.tsx
deleted file mode 100644
index cc252cd..0000000
--- a/client/src/components/finance/FinanceLayout.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useState } from "react";
-import { FinanceSidebar } from "./FinanceSidebar";
-import { FinanceHeader } from "./FinanceHeader";
-
-interface FinanceLayoutProps {
-  children: React.ReactNode;
-  showBack?: boolean;
-  /** Мобильная нижняя навигация (показывается только на телефонах) */
-  mobileNav?: React.ReactNode;
-}
-
-export function FinanceLayout({ children, showBack, mobileNav }: FinanceLayoutProps) {
-  const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
-
-  return (
-    <div className="flex h-screen w-screen overflow-hidden bg-background">
-      <div className="hidden md:block">
-        <FinanceSidebar collapsed={sidebarCollapsed} />
-      </div>
-      <div className="flex flex-col flex-1 min-w-0">
-        <FinanceHeader
-          showBack={showBack}
-          onToggleSidebar={() => setSidebarCollapsed((c) => !c)}
-        />
-        <main className="flex-1 overflow-y-auto p-4 pb-24 md:pb-4">
-          {children}
-        </main>
-      </div>
-      {mobileNav}
-    </div>
-  );
-}
diff --git a/client/src/components/finance/FinanceNav.tsx b/client/src/components/finance/FinanceNav.tsx
deleted file mode 100644
index 0d7be87..0000000
--- a/client/src/components/finance/FinanceNav.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Link } from "wouter";
-import { cn } from "@/lib/utils";
-import {
-  LayoutDashboard,
-  Tags,
-  Wallet,
-  Calculator,
-  ShieldCheck,
-} from "lucide-react";
-
-export type FinanceTab =
-  | "dashboard"
-  | "income"
-  | "expenses"
-  | "income-categories"
-  | "expense-categories"
-  | "settings"
-  | "salary"
-  | "debt"
-  | "calculations"
-  | "audit";
-
-interface FinanceNavProps {
-  active: FinanceTab;
-  onChange: (tab: FinanceTab) => void;
-}
-
-const items: { key: FinanceTab; label: string; icon: React.ReactNode; href?: string }[] = [
-  { key: "dashboard", label: "Обзор", icon: <LayoutDashboard className="w-4 h-4" /> },
-  { key: "debt", label: "Дебиторка", icon: <Wallet className="w-4 h-4" />, href: "/finance/debt" },
-  { key: "calculations", label: "Расчёты", icon: <Calculator className="w-4 h-4" />, href: "/finance/calculations" },
-  { key: "audit", label: "Аудит", icon: <ShieldCheck className="w-4 h-4" />, href: "/finance/audit" },
-  { key: "income-categories", label: "Категории доходов", icon: <Tags className="w-4 h-4" /> },
-  { key: "expense-categories", label: "Категории расходов", icon: <Tags className="w-4 h-4" /> },
-];
-
-export function FinanceNav({ active, onChange }: FinanceNavProps) {
-  return (
-    <div className="hidden md:flex items-center gap-1 border-b border-border pb-1 overflow-x-auto">
-      {items.map((item) => {
-        const isActive = active === item.key;
-        const className = cn(
-          "flex items-center gap-1.5 px-3 py-1.5 rounded-md text-xs font-medium transition-colors whitespace-nowrap",
-          isActive
-            ? "bg-primary text-primary-foreground"
-            : "text-muted-foreground hover:bg-muted hover:text-foreground"
-        );
-        if (item.href) {
-          return (
-            <Link key={item.key} href={item.href}>
-              <span className={className}>
-                {item.icon}
-                {item.label}
-              </span>
-            </Link>
-          );
-        }
-        return (
-          <button
-            key={item.key}
-            onClick={() => onChange(item.key)}
-            className={className}
-          >
-            {item.icon}
-            {item.label}
-          </button>
-        );
-      })}
-    </div>
-  );
-}
diff --git a/client/src/components/finance/FinanceSettings.tsx b/client/src/components/finance/FinanceSettings.tsx
deleted file mode 100644
index e5192ba..0000000
--- a/client/src/components/finance/FinanceSettings.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import { useState, useEffect } from "react";
-import { useLocation } from "wouter";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
-import { Loader2, Save, TestTube } from "lucide-react";
-import {
-  useConnectionConfig,
-  useTestConnection,
-  useSaveConnection,
-  useFinanceSettings,
-  useSaveFinanceSettings,
-} from "@/hooks/useFinance";
-import { CustomerSyncDialog } from "./CustomerSyncDialog";
-import { ContractSyncDialog } from "./ContractSyncDialog";
-
-export function FinanceSettingsPanel() {
-  const { data: configData, isLoading: configLoading } = useConnectionConfig();
-  const testMutation = useTestConnection();
-  const saveMutation = useSaveConnection();
-
-  const { data: financeSettingsData } = useFinanceSettings();
-  const saveFinanceSettings = useSaveFinanceSettings();
-
-  const [host, setHost] = useState("");
-  const [port, setPort] = useState("5432");
-  const [database, setDatabase] = useState("");
-  const [user, setUser] = useState("");
-  const [password, setPassword] = useState("");
-  const [ssl, setSsl] = useState(false);
-  const [refreshInterval, setRefreshInterval] = useState(60);
-  const [initialized, setInitialized] = useState(false);
-
-  // Sync with loaded config once
-  useEffect(() => {
-    if (initialized) return;
-    const loaded = configData?.config;
-    const loadedSettings = financeSettingsData?.settings;
-    if (!loaded && !loadedSettings) return;
-
-    if (loaded) {
-      setHost(loaded.host || "");
-      setPort(String(loaded.port || 5432));
-      setDatabase(loaded.database || "");
-      setUser(loaded.user || "");
-      setSsl(loaded.ssl || false);
-    }
-    if (loadedSettings?.refreshIntervalSeconds) {
-      setRefreshInterval(loadedSettings.refreshIntervalSeconds);
-    }
-    setInitialized(true);
-  }, [configData, financeSettingsData, initialized]);
-
-  const handleTest = () => {
-    testMutation.mutate({
-      host,
-      port: parseInt(port, 10) || 5432,
-      database,
-      user,
-      password,
-      ssl,
-    });
-  };
-
-  const [, setLocation] = useLocation();
-
-  const handleSave = () => {
-    saveMutation.mutate(
-      {
-        host,
-        port: parseInt(port, 10) || 5432,
-        database,
-        user,
-        password,
-        ssl,
-      },
-      {
-        onSuccess: () => {
-          setLocation("/finance");
-        },
-      }
-    );
-    saveFinanceSettings.mutate({ refreshIntervalSeconds: refreshInterval });
-  };
-
-  return (
-    <div className="max-w-md space-y-4">
-      <h3 className="text-sm font-semibold">Подключение к внешней базе данных</h3>
-
-      <div className="space-y-3">
-        <div className="grid grid-cols-2 gap-3">
-          <div className="space-y-1">
-            <Label className="text-xs">Хост</Label>
-            <Input value={host} onChange={(e) => setHost(e.target.value)} placeholder="localhost" className="h-8 text-xs" />
-          </div>
-          <div className="space-y-1">
-            <Label className="text-xs">Порт</Label>
-            <Input value={port} onChange={(e) => setPort(e.target.value)} placeholder="5432" className="h-8 text-xs" />
-          </div>
-        </div>
-
-        <div className="space-y-1">
-          <Label className="text-xs">База данных</Label>
-          <Input value={database} onChange={(e) => setDatabase(e.target.value)} placeholder="finance_db" className="h-8 text-xs" />
-        </div>
-
-        <div className="grid grid-cols-2 gap-3">
-          <div className="space-y-1">
-            <Label className="text-xs">Пользователь</Label>
-            <Input value={user} onChange={(e) => setUser(e.target.value)} placeholder="postgres" className="h-8 text-xs" />
-          </div>
-          <div className="space-y-1">
-            <Label className="text-xs">Пароль</Label>
-            <Input type="password" value={password} onChange={(e) => setPassword(e.target.value)} placeholder="••••" className="h-8 text-xs" />
-          </div>
-        </div>
-
-        <div className="flex items-center gap-2">
-          <Switch id="ssl" checked={ssl} onCheckedChange={setSsl} />
-          <Label htmlFor="ssl" className="text-xs cursor-pointer">SSL</Label>
-        </div>
-
-        <div className="space-y-1 pt-2 border-t">
-          <Label className="text-xs">Интервал автообновления, сек</Label>
-          <Input
-            type="number"
-            min={5}
-            max={3600}
-            value={refreshInterval}
-            onChange={(e) => setRefreshInterval(Math.max(5, Math.min(3600, parseInt(e.target.value) || 60)))}
-            className="h-8 text-xs w-32"
-          />
-          <p className="text-[10px] text-muted-foreground">Как часто обновлять данные из внешней БД (мин. 5 сек, макс. 3600 сек).</p>
-        </div>
-      </div>
-
-      <div className="flex gap-2">
-        <Button size="sm" variant="outline" onClick={handleTest} disabled={testMutation.isPending} className="text-xs">
-          {testMutation.isPending ? <Loader2 className="w-3.5 h-3.5 animate-spin mr-1" /> : <TestTube className="w-3.5 h-3.5 mr-1" />}
-          Проверить
-        </Button>
-        <Button size="sm" onClick={handleSave} disabled={saveMutation.isPending} className="text-xs">
-          {saveMutation.isPending ? <Loader2 className="w-3.5 h-3.5 animate-spin mr-1" /> : <Save className="w-3.5 h-3.5 mr-1" />}
-          Сохранить
-        </Button>
-      </div>
-
-      <div className="border-t pt-4 mt-4">
-        <h3 className="text-sm font-semibold mb-2">Заказчики</h3>
-        <p className="text-xs text-muted-foreground mb-2">
-          Синхронизируйте уникальных заказчиков из доходов и расходов в форму «Заказчик».
-        </p>
-        <CustomerSyncDialog />
-      </div>
-
-      <div className="border-t pt-4 mt-4">
-        <h3 className="text-sm font-semibold mb-2">Договоры</h3>
-        <p className="text-xs text-muted-foreground mb-2">
-          Синхронизируйте договоры из доходов в форму «Договора».
-        </p>
-        <ContractSyncDialog />
-      </div>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/FinanceSidebar.tsx b/client/src/components/finance/FinanceSidebar.tsx
deleted file mode 100644
index 3a5f24b..0000000
--- a/client/src/components/finance/FinanceSidebar.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { Link, useLocation } from "wouter";
-import { cn } from "@/lib/utils";
-import {
-  Database,
-  LayoutDashboard,
-  TrendingUp,
-  TrendingDown,
-  Banknote,
-  Settings,
-  ChevronRight,
-  ExternalLink,
-} from "lucide-react";
-
-type NavItem = {
-  label: string;
-  href: string;
-  icon: React.ReactNode;
-};
-
-const navItems: NavItem[] = [
-  { label: "Дашборд", href: "/finance", icon: <LayoutDashboard className="w-4 h-4" /> },
-  { label: "Доходы", href: "/income", icon: <TrendingUp className="w-4 h-4" /> },
-  { label: "Расходы", href: "/expenses", icon: <TrendingDown className="w-4 h-4" /> },
-  { label: "Зарплата", href: "/salary", icon: <Banknote className="w-4 h-4" /> },
-  { label: "Настройки", href: "/finance/settings", icon: <Settings className="w-4 h-4" /> },
-];
-
-interface FinanceSidebarProps {
-  collapsed?: boolean;
-}
-
-export function FinanceSidebar({ collapsed }: FinanceSidebarProps) {
-  const [location] = useLocation();
-
-  return (
-    <aside
-      className={cn(
-        "flex flex-col h-screen border-r border-border bg-sidebar transition-all duration-200 shrink-0",
-        collapsed ? "w-[3.5rem]" : "w-64"
-      )}
-    >
-      {/* Header */}
-      <div className="flex items-center gap-2 px-3 h-12 border-b border-sidebar-border shrink-0">
-        <div className="w-7 h-7 rounded bg-primary flex items-center justify-center shrink-0">
-          <Database className="w-4 h-4 text-primary-foreground" />
-        </div>
-        {!collapsed && (
-          <div className="flex-1 min-w-0">
-            <div className="text-xs font-semibold truncate">ОмегаПром</div>
-            <div className="text-[10px] text-muted-foreground truncate">Финансы</div>
-          </div>
-        )}
-      </div>
-
-      {/* Nav */}
-      <nav className="flex-1 overflow-y-auto py-2 space-y-0.5">
-        {!collapsed && (
-          <div className="px-3 py-1 text-[10px] font-medium text-muted-foreground uppercase tracking-wider">
-            Аналитика
-          </div>
-        )}
-        {navItems.map((item) => {
-          const isActive =
-            item.href === "/finance"
-              ? location === "/finance"
-              : location.startsWith(item.href);
-          return (
-            <Link
-              key={item.href}
-              href={item.href}
-              className={cn(
-                "flex items-center gap-2 mx-1.5 px-2 py-1.5 rounded text-xs font-medium transition-colors",
-                isActive
-                  ? "bg-sidebar-primary/10 text-sidebar-primary"
-                  : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-foreground"
-              )}
-              title={collapsed ? item.label : undefined}
-            >
-              <span className="shrink-0">{item.icon}</span>
-              {!collapsed && <span className="truncate">{item.label}</span>}
-              {!collapsed && isActive && (
-                <ChevronRight className="w-3 h-3 ml-auto shrink-0 opacity-50" />
-              )}
-            </Link>
-          );
-        })}
-        {/* Внешняя ссылка на субапп Data-Insight2 — полная версия финансов */}
-        <a
-          href="/di2"
-          target="_blank"
-          rel="noopener"
-          className="flex items-center gap-2 mx-1.5 px-2 py-1.5 rounded text-xs font-medium transition-colors text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-foreground"
-          title={collapsed ? "Data-Insight (полная версия)" : undefined}
-        >
-          <span className="shrink-0">
-            <ExternalLink className="w-4 h-4" />
-          </span>
-          {!collapsed && <span className="truncate">Data-Insight (полная версия)</span>}
-        </a>
-      </nav>
-    </aside>
-  );
-}
diff --git a/client/src/components/finance/SummaryCards.tsx b/client/src/components/finance/SummaryCards.tsx
deleted file mode 100644
index 64cef92..0000000
--- a/client/src/components/finance/SummaryCards.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { TrendingUp, TrendingDown, Wallet, AlertCircle } from "lucide-react";
-import { formatCurrency } from "@/lib/utils";
-
-interface SummaryCardsProps {
-  incomeTotal: number;
-  expenseTotal: number;
-  incomeCount: number;
-  expenseCount: number;
-  loading?: boolean;
-}
-
-export function SummaryCards({
-  incomeTotal,
-  expenseTotal,
-  incomeCount,
-  expenseCount,
-  loading,
-}: SummaryCardsProps) {
-  const profit = incomeTotal - expenseTotal;
-  const profitClass = profit >= 0 ? "text-emerald-600" : "text-red-600";
-
-  if (loading) {
-    return (
-      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-3">
-        {Array.from({ length: 4 }).map((_, i) => (
-          <div key={i} className="rounded-lg border bg-card p-4 animate-pulse">
-            <div className="h-4 w-24 bg-muted rounded mb-2" />
-            <div className="h-6 w-32 bg-muted rounded" />
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-  return (
-    <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-3">
-      <div className="rounded-lg border bg-card p-4">
-        <div className="flex items-center gap-2 text-muted-foreground mb-1">
-          <TrendingUp className="w-4 h-4 text-emerald-500" />
-          <span className="text-xs font-medium">Доходы</span>
-        </div>
-        <div className="text-lg font-bold text-emerald-600">{formatCurrency(incomeTotal)}</div>
-        <div className="text-[11px] text-muted-foreground">{incomeCount} записей</div>
-      </div>
-
-      <div className="rounded-lg border bg-card p-4">
-        <div className="flex items-center gap-2 text-muted-foreground mb-1">
-          <TrendingDown className="w-4 h-4 text-red-500" />
-          <span className="text-xs font-medium">Расходы</span>
-        </div>
-        <div className="text-lg font-bold text-red-600">{formatCurrency(expenseTotal)}</div>
-        <div className="text-[11px] text-muted-foreground">{expenseCount} записей</div>
-      </div>
-
-      <div className="rounded-lg border bg-card p-4">
-        <div className="flex items-center gap-2 text-muted-foreground mb-1">
-          <Wallet className="w-4 h-4 text-blue-500" />
-          <span className="text-xs font-medium">Прибыль</span>
-        </div>
-        <div className={`text-lg font-bold ${profitClass}`}>{formatCurrency(profit)}</div>
-        <div className="text-[11px] text-muted-foreground">
-          {profit >= 0 ? "Положительный баланс" : "Отрицательный баланс"}
-        </div>
-      </div>
-
-      <div className="rounded-lg border bg-card p-4">
-        <div className="flex items-center gap-2 text-muted-foreground mb-1">
-          <AlertCircle className="w-4 h-4 text-amber-500" />
-          <span className="text-xs font-medium">Маржа</span>
-        </div>
-        <div className="text-lg font-bold text-foreground">
-          {incomeTotal > 0 ? `${((profit / incomeTotal) * 100).toFixed(1)}%` : "0%"}
-        </div>
-        <div className="text-[11px] text-muted-foreground">от общих доходов</div>
-      </div>
-    </div>
-  );
-}
diff --git a/client/src/components/finance/TreeNodeRow.tsx b/client/src/components/finance/TreeNodeRow.tsx
deleted file mode 100644
index 1b2eb89..0000000
--- a/client/src/components/finance/TreeNodeRow.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { useState } from "react";
-import { ChevronRight, ChevronDown, Folder, FolderOpen, FileText, EyeOff, Wand2 } from "lucide-react";
-import { cn, formatCurrency } from "@/lib/utils";
-import type { TreeNode } from "@/hooks/useFinance";
-
-interface TreeNodeRowProps {
-  node: TreeNode;
-  depth?: number;
-  onSelect?: (id: string, name: string) => void;
-  selectedId?: string | null;
-  searchTerm?: string;
-}
-
-export function TreeNodeRow({ node, depth = 0, onSelect, selectedId, searchTerm }: TreeNodeRowProps) {
-  const [expanded, setExpanded] = useState(false);
-  const hasChildren = node.children && node.children.length > 0;
-  const isSelected = selectedId === node.id;
-
-  const highlightedName = searchTerm
-    ? highlightText(node.name, searchTerm)
-    : node.name;
-
-  return (
-    <div>
-      <div
-        className={cn(
-          "flex items-center gap-2 py-2 px-3 rounded-md transition-colors group",
-          isSelected ? "bg-primary/10 text-primary" : "hover:bg-muted/50",
-          node.excluded && "opacity-50"
-        )}
-        style={{ paddingLeft: depth * 24 + 12 }}
-        onClick={() => {
-          if (hasChildren) setExpanded((e) => !e);
-          onSelect?.(node.id, node.name);
-        }}
-      >
-        <span className="w-4 h-4 flex items-center justify-center shrink-0">
-          {hasChildren ? (
-            expanded ? (
-              <ChevronDown className="w-3 h-3 text-muted-foreground" />
-            ) : (
-              <ChevronRight className="w-3 h-3 text-muted-foreground" />
-            )
-          ) : (
-            <span className="w-3" />
-          )}
-        </span>
-
-        {node.excluded ? (
-          <EyeOff className="w-3.5 h-3.5 text-muted-foreground shrink-0" />
-        ) : hasChildren ? (
-          expanded ? (
-            <FolderOpen className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-          ) : (
-            <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-          )
-        ) : (
-          <FileText className="w-3.5 h-3.5 text-muted-foreground shrink-0" />
-        )}
-
-        <button
-          className="text-sm font-medium truncate text-left flex-1 hover:underline"
-          onClick={(e) => {
-            e.stopPropagation();
-            onSelect?.(node.id, node.name);
-          }}
-        >
-          {highlightedName}
-        </button>
-
-        {node.excluded && (
-          <span className="text-[10px] px-1.5 py-0.5 rounded border border-destructive/40 text-destructive/70 shrink-0">
-            Искл.
-          </span>
-        )}
-        {node.autoDetected && (
-          <Wand2 className="w-3 h-3 text-blue-400 shrink-0" />
-        )}
-
-        {node.minDate && (
-          <span className="text-xs text-muted-foreground tabular-nums min-w-[90px] text-right shrink-0">
-            {formatDateRange(node.minDate, node.maxDate)}
-          </span>
-        )}
-
-        <span className="text-sm font-semibold tabular-nums min-w-[120px] text-right shrink-0">
-          {formatCurrency(node.total)}
-        </span>
-        {node.count > 0 && (
-          <span className="text-xs text-muted-foreground tabular-nums min-w-[60px] text-right shrink-0">
-            {node.count}
-          </span>
-        )}
-      </div>
-
-      {hasChildren && expanded && (
-        <div>
-          {node.children!.map((child) => (
-            <TreeNodeRow
-              key={child.id}
-              node={child}
-              depth={depth + 1}
-              onSelect={onSelect}
-              selectedId={selectedId}
-              searchTerm={searchTerm}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-function formatDateRange(min?: string, max?: string): string {
-  if (!min) return "";
-  if (!max || min === max) {
-    return new Date(min).toLocaleDateString("ru-RU", { day: "2-digit", month: "2-digit", year: "numeric" });
-  }
-  const minStr = new Date(min).toLocaleDateString("ru-RU", { day: "2-digit", month: "2-digit", year: "numeric" });
-  const maxStr = new Date(max).toLocaleDateString("ru-RU", { day: "2-digit", month: "2-digit", year: "numeric" });
-  return `${minStr} - ${maxStr}`;
-}
-
-function highlightText(text: string, term: string) {
-  if (!term) return text;
-  const parts = text.split(new RegExp(`(${escapeRegExp(term)})`, "gi"));
-  return parts.map((part, i) =>
-    part.toLowerCase() === term.toLowerCase() ? (
-      <mark key={i} className="bg-yellow-200 dark:bg-yellow-800 rounded px-0.5">
-        {part}
-      </mark>
-    ) : (
-      part
-    )
-  );
-}
-
-function escapeRegExp(s: string) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
diff --git a/client/src/hooks/useColumnLabels.ts b/client/src/hooks/useColumnLabels.ts
deleted file mode 100644
index cf6adec..0000000
--- a/client/src/hooks/useColumnLabels.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { apiRequest } from "@/lib/queryClient";
-
-export function useColumnLabels() {
-  return useQuery<{ success: boolean; config: { columnLabels: Record<string, string> } }>({
-    queryKey: ["/api/table-config"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/table-config");
-      return res.json();
-    },
-    staleTime: 5 * 60 * 1000,
-  });
-}
-
-export function useGetLabel(columnLabels?: Record<string, string>) {
-  return (key: string, fallback?: string): string => {
-    return columnLabels?.[key] ?? fallback ?? key;
-  };
-}
diff --git a/client/src/hooks/useFinance.ts b/client/src/hooks/useFinance.ts
deleted file mode 100644
index a40da96..0000000
--- a/client/src/hooks/useFinance.ts
+++ /dev/null
@@ -1,1450 +0,0 @@
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { apiRequest } from "@/lib/queryClient";
-import { useToast } from "@/hooks/use-toast";
-
-export interface PaginatedResult<T> {
-  success: boolean;
-  rows: T[];
-  total: number;
-  page: number;
-  pageSize: number;
-  totalPages: number;
-  totalSum?: number;
-  error?: string;
-}
-
-export interface TreeSummary {
-  success: boolean;
-  trees: TreeNode[];
-  uncategorized: { total: number; count: number };
-  grandTotal: { total: number; count: number };
-}
-
-export interface TreeNode {
-  id: string;
-  name: string;
-  isPrimary?: boolean;
-  total: number;
-  count: number;
-  excluded?: boolean;
-  autoDetected?: boolean;
-  minDate?: string;
-  maxDate?: string;
-  children?: TreeNode[];
-  nodes?: TreeNode[];
-}
-
-export interface CategoryRule {
-  column: string;
-  operator: string;
-  value: string;
-}
-
-export interface Category {
-  id: string;
-  name: string;
-  rules: CategoryRule[];
-  ruleLogic?: "and" | "or";
-  excluded?: boolean;
-  autoDetected?: boolean;
-  treeId?: string;
-  children: Category[];
-}
-
-export interface DbStatus {
-  connected: boolean;
-}
-
-export interface TableConfig {
-  incomeTable: string;
-  expenseTable: string;
-  incomeSumColumn: string;
-  expenseSumColumn: string;
-  columnLabels: Record<string, string>;
-}
-
-export interface ConnectionConfig {
-  host: string;
-  port: number;
-  database: string;
-  user: string;
-  password?: string;
-  ssl?: boolean;
-}
-
-export interface FinanceSettings {
-  refreshIntervalSeconds: number;
-}
-
-export interface RebuildStatus {
-  inProgress: boolean;
-  pendingRebuild: boolean;
-  lastRebuiltAt: string | null;
-}
-
-export interface FiltersState {
-  [column: string]: string;
-}
-
-export interface DateRange {
-  from?: string;
-  to?: string;
-}
-
-function buildQueryKey(
-  base: string,
-  page: number,
-  pageSize: number,
-  sortBy: string,
-  sortDir: string,
-  filters: FiltersState,
-  dateRange: DateRange
-) {
-  return [
-    base,
-    page,
-    pageSize,
-    sortBy,
-    sortDir,
-    JSON.stringify(filters),
-    dateRange.from,
-    dateRange.to,
-  ];
-}
-
-// =====================
-// Income
-// =====================
-
-export function useIncome(
-  page = 1,
-  pageSize = 50,
-  sortBy = "data",
-  sortDir = "desc",
-  filters: FiltersState = {},
-  dateRange: DateRange = {}
-) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<PaginatedResult<any>>({
-    queryKey: buildQueryKey("/api/income", page, pageSize, sortBy, sortDir, filters, dateRange),
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      params.set("page", String(page));
-      params.set("pageSize", String(pageSize));
-      params.set("sortBy", sortBy);
-      params.set("sortDir", sortDir);
-      if (Object.keys(filters).length) params.set("filters", JSON.stringify(filters));
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/income?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-export function useIncomeTreeSummary(dateRange: DateRange = {}) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<TreeSummary>({
-    queryKey: ["/api/income/tree-summary", dateRange.from, dateRange.to],
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/income/tree-summary?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-export function useIncomeByCategory(
-  categoryId: string | null,
-  page = 1,
-  pageSize = 50,
-  filters: FiltersState = {},
-  dateRange: DateRange = {}
-) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<PaginatedResult<any>>({
-    queryKey: ["/api/income", categoryId, page, pageSize, JSON.stringify(filters), dateRange.from, dateRange.to],
-    queryFn: async () => {
-      if (!categoryId) return { success: true, rows: [], total: 0, page, pageSize, totalPages: 0 };
-      const params = new URLSearchParams();
-      params.set("page", String(page));
-      params.set("pageSize", String(pageSize));
-      if (Object.keys(filters).length) params.set("filters", JSON.stringify(filters));
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/income/${encodeURIComponent(categoryId)}?${params.toString()}`);
-      return res.json();
-    },
-    enabled: !!categoryId,
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-// =====================
-// Expenses
-// =====================
-
-export function useExpenses(
-  page = 1,
-  pageSize = 50,
-  sortBy = "data",
-  sortDir = "desc",
-  filters: FiltersState = {},
-  dateRange: DateRange = {}
-) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<PaginatedResult<any>>({
-    queryKey: buildQueryKey("/api/expenses", page, pageSize, sortBy, sortDir, filters, dateRange),
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      params.set("page", String(page));
-      params.set("pageSize", String(pageSize));
-      params.set("sortBy", sortBy);
-      params.set("sortDir", sortDir);
-      if (Object.keys(filters).length) params.set("filters", JSON.stringify(filters));
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/expenses?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-export function useExpenseTreeSummary(dateRange: DateRange = {}) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<TreeSummary>({
-    queryKey: ["/api/expenses/tree-summary", dateRange.from, dateRange.to],
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/expenses/tree-summary?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-export function useExpensesByCategory(
-  categoryId: string | null,
-  page = 1,
-  pageSize = 50,
-  filters: FiltersState = {},
-  dateRange: DateRange = {}
-) {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<PaginatedResult<any>>({
-    queryKey: ["/api/expenses", categoryId, page, pageSize, JSON.stringify(filters), dateRange.from, dateRange.to],
-    queryFn: async () => {
-      if (!categoryId) return { success: true, rows: [], total: 0, page, pageSize, totalPages: 0 };
-      const params = new URLSearchParams();
-      params.set("page", String(page));
-      params.set("pageSize", String(pageSize));
-      if (Object.keys(filters).length) params.set("filters", JSON.stringify(filters));
-      if (dateRange.from) params.set("dateFrom", dateRange.from);
-      if (dateRange.to) params.set("dateTo", dateRange.to);
-      const res = await apiRequest("GET", `/api/expenses/${encodeURIComponent(categoryId)}?${params.toString()}`);
-      return res.json();
-    },
-    enabled: !!categoryId,
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-// =====================
-// Categories
-// =====================
-
-export function useIncomeCategories() {
-  return useQuery<{ success: boolean; categories: Category[] }>({
-    queryKey: ["/api/income-categories"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/income-categories");
-      return res.json();
-    },
-  });
-}
-
-export function useExpenseCategories() {
-  return useQuery<{ success: boolean; categories: Category[] }>({
-    queryKey: ["/api/expense-categories"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/expense-categories");
-      return res.json();
-    },
-  });
-}
-
-export function useCreateIncomeCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: Partial<Category>) => {
-      const res = await apiRequest("POST", "/api/income-categories", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/income-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/income/tree-summary"] });
-      toast({ title: "Категория создана" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось создать категорию", variant: "destructive" });
-    },
-  });
-}
-
-export function useUpdateIncomeCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async ({ id, ...body }: Partial<Category> & { id: string }) => {
-      const res = await apiRequest("PUT", `/api/income-categories/${id}`, body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/income-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/income/tree-summary"] });
-      toast({ title: "Категория обновлена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось обновить категорию", variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteIncomeCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (id: string) => {
-      const res = await apiRequest("DELETE", `/api/income-categories/${id}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/income-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/income/tree-summary"] });
-      toast({ title: "Категория удалена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось удалить категорию", variant: "destructive" });
-    },
-  });
-}
-
-export function useCreateExpenseCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: Partial<Category>) => {
-      const res = await apiRequest("POST", "/api/expense-categories", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/expense-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/expenses/tree-summary"] });
-      toast({ title: "Категория создана" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось создать категорию", variant: "destructive" });
-    },
-  });
-}
-
-export function useUpdateExpenseCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async ({ id, ...body }: Partial<Category> & { id: string }) => {
-      const res = await apiRequest("PUT", `/api/expense-categories/${id}`, body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/expense-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/expenses/tree-summary"] });
-      toast({ title: "Категория обновлена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось обновить категорию", variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteExpenseCategory() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (id: string) => {
-      const res = await apiRequest("DELETE", `/api/expense-categories/${id}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/expense-categories"] });
-      qc.invalidateQueries({ queryKey: ["/api/expenses/tree-summary"] });
-      toast({ title: "Категория удалена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось удалить категорию", variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Connection & Config
-// =====================
-
-export function useDbStatus() {
-  return useQuery<DbStatus>({
-    queryKey: ["/api/db-status"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/db-status");
-      return res.json();
-    },
-    refetchInterval: 30_000,
-  });
-}
-
-export function useTableConfig() {
-  return useQuery<{ success: boolean; config: TableConfig }>({
-    queryKey: ["/api/table-config"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/table-config");
-      return res.json();
-    },
-  });
-}
-
-export function useConnectionConfig() {
-  return useQuery<{ success: boolean; config: ConnectionConfig | null }>({
-    queryKey: ["/api/connection"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/connection");
-      return res.json();
-    },
-  });
-}
-
-export function useTestConnection() {
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (config: ConnectionConfig) => {
-      const res = await apiRequest("POST", "/api/connection/test", config);
-      return res.json() as Promise<{ ok: boolean; message: string }>;
-    },
-    onSuccess: (data) => {
-      toast({
-        title: data.ok ? "Успешно" : "Ошибка подключения",
-        description: data.message,
-        variant: data.ok ? "default" : "destructive",
-      });
-    },
-  });
-}
-
-export function useSaveConnection() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (config: ConnectionConfig) => {
-      const res = await apiRequest("POST", "/api/connection", config);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/connection"] });
-      qc.invalidateQueries({ queryKey: ["/api/db-status"] });
-      toast({ title: "Конфигурация сохранена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось сохранить конфигурацию", variant: "destructive" });
-    },
-  });
-}
-
-export function useFinanceSettings() {
-  return useQuery<{ success: boolean; settings: FinanceSettings }>({
-    queryKey: ["/api/finance-settings"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/finance-settings");
-      return res.json();
-    },
-  });
-}
-
-export function useSaveFinanceSettings() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (settings: FinanceSettings) => {
-      const res = await apiRequest("POST", "/api/finance-settings", settings);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/finance-settings"] });
-      toast({ title: "Настройки автообновления сохранены" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось сохранить настройки", variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Admin
-// =====================
-
-export function useRebuildStatus() {
-  return useQuery<RebuildStatus & { success: boolean }>({
-    queryKey: ["/api/admin/rebuild-status"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/admin/rebuild-status");
-      return res.json();
-    },
-    refetchInterval: 5_000,
-  });
-}
-
-export function useRefreshAll() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async () => {
-      const res = await apiRequest("POST", "/api/refresh-all");
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries();
-      toast({ title: "Синхронизация запущена" });
-    },
-  });
-}
-
-export function useInvalidateCache() {
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (pattern?: string) => {
-      const res = await apiRequest("POST", "/api/cache/invalidate", { pattern });
-      return res.json();
-    },
-    onSuccess: () => {
-      toast({ title: "Кэш сброшен" });
-    },
-  });
-}
-
-// =====================
-// Salary
-// =====================
-
-export interface NeofArea {
-  id: string;
-  name: string;
-  months: { month: string; employees: { fio: string; baza: number; kVydache: number }[] }[];
-}
-
-export interface ZofArea {
-  id: string;
-  name: string;
-  months: { month: string; employees: { fio: string; fioLetters: string; nachislenobezndfl: number; summandfl: number; strahov: number; canonicalFio: string }[] }[];
-}
-
-export interface SalaryDbStatus {
-  success: boolean;
-  totalRows: number;
-  areas: string[];
-  monthCount: number;
-  lastSync: string | null;
-}
-
-export interface SalaryMonthlyRow {
-  month: string;
-  baza: number;
-  kVydache: number;
-}
-
-export function useNeof() {
-  return useQuery<{ success: boolean; areas: NeofArea[]; source: string }>({
-    queryKey: ["/api/salary/neof"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/salary/neof");
-      return res.json();
-    },
-  });
-}
-
-export function useZof() {
-  return useQuery<{ success: boolean; areas: ZofArea[] }>({
-    queryKey: ["/api/salary/zof"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/salary/zof");
-      return res.json();
-    },
-  });
-}
-
-export function useZofAreas() {
-  return useQuery<{ success: boolean; areas: { id: string; name: string }[] }>({
-    queryKey: ["/api/salary/zof/areas"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/salary/zof/areas");
-      return res.json();
-    },
-  });
-}
-
-export function useAssignZofArea() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: { fioLetters: string; fioDisplay: string; areaId: string; areaName: string; canonicalFio?: string }) => {
-      const res = await apiRequest("POST", "/api/salary/zof/assign", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/zof"] });
-      toast({ title: "Участок назначен" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось назначить участок", variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteZofAssign() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (fioLetters: string) => {
-      const res = await apiRequest("DELETE", `/api/salary/zof/assign/${encodeURIComponent(fioLetters)}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/zof"] });
-      toast({ title: "Привязка удалена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message || "Не удалось удалить привязку", variant: "destructive" });
-    },
-  });
-}
-
-export function useSalaryDbStatus() {
-  return useQuery<SalaryDbStatus>({
-    queryKey: ["/api/salary/db-status"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/salary/db-status");
-      return res.json();
-    },
-  });
-}
-
-export function useSalaryMonthly() {
-  return useQuery<{ success: boolean; rows: SalaryMonthlyRow[] }>({
-    queryKey: ["/api/planning/salary-monthly"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/planning/salary-monthly");
-      return res.json();
-    },
-  });
-}
-
-// =====================
-// Overrides
-// =====================
-
-export interface Override {
-  record_id: string;
-  category_id: string;
-  created_at: string;
-}
-
-export function useOverrides(type: "income" | "expense") {
-  return useQuery<{ success: boolean; overrides: Override[] }>({
-    queryKey: ["/api/overrides", type],
-    queryFn: async () => {
-      const res = await apiRequest("GET", `/api/overrides?type=${type}`);
-      return res.json();
-    },
-  });
-}
-
-export function useCreateOverride() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: { type: "income" | "expense"; recordId: string; categoryId: string }) => {
-      const res = await apiRequest("POST", "/api/overrides", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/overrides"] });
-      toast({ title: "Категория назначена" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteOverride() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async ({ type, recordId }: { type: "income" | "expense"; recordId: string }) => {
-      const res = await apiRequest("DELETE", `/api/overrides/${type}/${encodeURIComponent(recordId)}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/overrides"] });
-      toast({ title: "Переопределение удалено" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Tags
-// =====================
-
-export interface Tag {
-  id: number;
-  name: string;
-  color: string;
-}
-
-export interface TagAssignment {
-  id: number;
-  node_id: string;
-  tag_id: number;
-  context: string;
-  tag_name: string;
-  tag_color: string;
-}
-
-export function useTags() {
-  return useQuery<{ success: boolean; tags: Tag[] }>({
-    queryKey: ["/api/tags"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/tags");
-      return res.json();
-    },
-  });
-}
-
-export function useCreateTag() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: { name: string; color: string }) => {
-      const res = await apiRequest("POST", "/api/tags", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/tags"] });
-      toast({ title: "Тег создан" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteTag() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (id: number) => {
-      const res = await apiRequest("DELETE", `/api/tags/${id}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/tags"] });
-      toast({ title: "Тег удалён" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useTagAssignments(context: "income" | "expense", nodeIds?: string[]) {
-  const params = new URLSearchParams();
-  params.set("context", context);
-  if (nodeIds && nodeIds.length > 0) {
-    nodeIds.forEach((id) => params.append("nodeIds", id));
-  }
-  return useQuery<{ success: boolean; assignments: TagAssignment[] }>({
-    queryKey: ["/api/tag-assignments", context, nodeIds],
-    queryFn: async () => {
-      const res = await apiRequest("GET", `/api/tag-assignments?${params.toString()}`);
-      return res.json();
-    },
-    enabled: !!nodeIds && nodeIds.length > 0,
-  });
-}
-
-export function useAssignTag() {
-  const qc = useQueryClient();
-  return useMutation({
-    mutationFn: async (body: { nodeId: string; tagId: number; context: string }) => {
-      const res = await apiRequest("POST", "/api/tag-assignments", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/tag-assignments"] });
-    },
-  });
-}
-
-export function useRemoveTag() {
-  const qc = useQueryClient();
-  return useMutation({
-    mutationFn: async (body: { nodeId: string; tagId: number; context: string }) => {
-      const res = await apiRequest("DELETE", "/api/tag-assignments", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/tag-assignments"] });
-    },
-  });
-}
-
-// =====================
-// Timeseries
-// =====================
-
-export interface TimeseriesData {
-  success: boolean;
-  periods: string[];
-  series: Array<{ id: string; name: string; data: number[] }>;
-}
-
-export function useIncomeTimeseries(dateFrom?: string, dateTo?: string, groupBy = "month") {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<TimeseriesData>({
-    queryKey: ["/api/income/tree-timeseries", dateFrom, dateTo, groupBy],
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      if (dateFrom) params.set("dateFrom", dateFrom);
-      if (dateTo) params.set("dateTo", dateTo);
-      params.set("groupBy", groupBy);
-      const res = await apiRequest("GET", `/api/income/tree-timeseries?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-export function useExpenseTimeseries(dateFrom?: string, dateTo?: string, groupBy = "month") {
-  const { data: settingsData } = useFinanceSettings();
-  const refreshInterval = (settingsData?.settings?.refreshIntervalSeconds ?? 60) * 1000;
-  return useQuery<TimeseriesData>({
-    queryKey: ["/api/expenses/tree-timeseries", dateFrom, dateTo, groupBy],
-    queryFn: async () => {
-      const params = new URLSearchParams();
-      if (dateFrom) params.set("dateFrom", dateFrom);
-      if (dateTo) params.set("dateTo", dateTo);
-      params.set("groupBy", groupBy);
-      const res = await apiRequest("GET", `/api/expenses/tree-timeseries?${params.toString()}`);
-      return res.json();
-    },
-    staleTime: 60_000,
-    refetchInterval: refreshInterval,
-  });
-}
-
-// =====================
-// Customer Sync
-// =====================
-
-export interface DadataCompany {
-  value: string;
-  data: {
-    inn: string;
-    kpp: string;
-    ogrn: string;
-    name: {
-      full_with_opf: string;
-      short_with_opf: string;
-    };
-    management?: {
-      name: string;
-      post: string;
-    };
-    address?: {
-      value: string;
-    };
-    state?: {
-      status: string;
-    };
-  };
-}
-
-export interface SyncPreviewResponse {
-  success: boolean;
-  auto: Array<{ name: string; inn: string; company: DadataCompany }>;
-  ambiguous: Array<{ name: string; inn: string; suggestions: DadataCompany[] }>;
-  existing: Array<{ name: string; inn: string }>;
-  skipped: number;
-}
-
-export interface SyncApplyResponse {
-  success: boolean;
-  created: number;
-  errors: Array<{ name: string; error: string }>;
-}
-
-export function useCustomerSyncPreview() {
-  const { toast } = useToast();
-  return useMutation<SyncPreviewResponse, Error, { formId?: number }>({
-    mutationFn: async (body) => {
-      const res = await apiRequest("POST", "/api/finance/customer-sync/preview", body);
-      return res.json();
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка анализа", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useCustomerSyncApply() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation<SyncApplyResponse, Error, { formId?: number; customers: Array<{ name: string; inn: string; selectedDadata?: DadataCompany }> }>({
-    mutationFn: async (body) => {
-      const res = await apiRequest("POST", "/api/finance/customer-sync/apply", body);
-      return res.json();
-    },
-    onSuccess: (data) => {
-      qc.invalidateQueries({ queryKey: ["/api/forms"] });
-      toast({ title: `Создано ${data.created} заказчиков` });
-      if (data.errors.length > 0) {
-        toast({ title: `Ошибок: ${data.errors.length}`, variant: "destructive" });
-      }
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка синхронизации", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Contract Sync
-// =====================
-
-export interface ContractSyncPreviewResponse {
-  success: boolean;
-  auto: Array<{ raw: string; number: string; date: string; inn: string; customerTaskId?: number }>;
-  ambiguous: Array<{ raw: string; number: string; date: string; inn: string; customerTaskId?: number; reason: string }>;
-  existing: Array<{ raw: string; number: string; date: string; inn: string }>;
-  skipped: number;
-}
-
-export interface ContractSyncApplyResponse {
-  success: boolean;
-  created: number;
-  errors: Array<{ raw: string; error: string }>;
-}
-
-export function useContractSyncPreview() {
-  const { toast } = useToast();
-  return useMutation<ContractSyncPreviewResponse, Error, { formId?: number }>({
-    mutationFn: async (body) => {
-      const res = await apiRequest("POST", "/api/finance/contract-sync/preview", body);
-      return res.json();
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка анализа", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useContractSyncApply() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation<ContractSyncApplyResponse, Error, { formId?: number; contracts: Array<{ raw: string; number: string; date: string; inn: string; customerTaskId: number }> }>({
-    mutationFn: async (body) => {
-      const res = await apiRequest("POST", "/api/finance/contract-sync/apply", body);
-      return res.json();
-    },
-    onSuccess: (data) => {
-      qc.invalidateQueries({ queryKey: ["/api/forms"] });
-      toast({ title: `Создано ${data.created} договоров` });
-      if (data.errors.length > 0) {
-        toast({ title: `Ошибок: ${data.errors.length}`, variant: "destructive" });
-      }
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка синхронизации", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Debt (Дебиторская задолженность)
-// =====================
-
-export interface DebtSummary {
-  updatedAt: string | null;
-  totalDebt: number;
-  totalOverdue: number;
-}
-
-export interface DebtClassRow {
-  name: string;
-  total: number;
-  cls0: number;
-  cls1_30: number;
-  cls31_60: number;
-  cls61_90: number;
-  cls91_365: number;
-  cls365plus: number;
-}
-
-export interface DebtOverdueClassRow {
-  cls: string;
-  total: number;
-}
-
-export interface DebtDetailRow {
-  dogovor: string;
-  summadokumenta: number;
-  dokumentraschetov: string;
-  summaoplacheno: number;
-  summadolga: number;
-  summaprosrocheno: number;
-  otsrochkapodogovoru: string;
-  dneiprosrocheno: number;
-}
-
-export interface DebtTableGroup {
-  kontragent: string;
-  totalDebt: number;
-  totalOverdue: number;
-  rows: DebtDetailRow[];
-}
-
-export interface DebtAnalytics {
-  success: boolean;
-  summary: DebtSummary;
-  byKontragent: DebtClassRow[];
-  byManager: DebtClassRow[];
-  byOverdueClass: DebtOverdueClassRow[];
-  table: {
-    rows: DebtTableGroup[];
-    total: number;
-    page: number;
-    pageSize: number;
-    totalPages: number;
-  };
-}
-
-export interface DebtFiltersResponse {
-  success: boolean;
-  filters: {
-    periods: string[];
-    klassprosrochki: string[];
-    organizaciya: string[];
-    otvetstvennii: string[];
-    kontragenty: string[];
-  };
-}
-
-export interface DebtDynamicsResponse {
-  success: boolean;
-  rows: { period: string; totalDebt: number; totalOverdue: number }[];
-}
-
-export interface DebtDynamicsKontragent {
-  kontragent: string;
-  summadokumenta: number;
-  summaoplacheno: number;
-  summadolga: number;
-  summaprosrocheno: number;
-  dneiprosrocheno: number;
-}
-
-export interface DebtAnalyticsParams {
-  period?: string;
-  klassprosrochki?: string[];
-  kontragent?: string[];
-  dogovor?: string;
-  otvetstvennii?: string[];
-  page?: number;
-  pageSize?: number;
-}
-
-export function useDebtAnalytics(params: DebtAnalyticsParams) {
-  return useQuery<DebtAnalytics>({
-    queryKey: ["/api/debt/analytics", JSON.stringify(params)],
-    queryFn: async () => {
-      const sp = new URLSearchParams();
-      if (params.period) sp.set("period", params.period);
-      if (params.klassprosrochki?.length) sp.set("klassprosrochki", params.klassprosrochki.join(","));
-      if (params.kontragent?.length) sp.set("kontragent", params.kontragent.join(","));
-      if (params.dogovor) sp.set("dogovor", params.dogovor);
-      if (params.otvetstvennii?.length) sp.set("otvetstvennii", params.otvetstvennii.join(","));
-      sp.set("page", String(params.page ?? 1));
-      sp.set("pageSize", String(params.pageSize ?? 20));
-      const res = await apiRequest("GET", `/api/debt/analytics?${sp.toString()}`);
-      return res.json();
-    },
-  });
-}
-
-export function useDebtFilters() {
-  return useQuery<DebtFiltersResponse>({
-    queryKey: ["/api/debt/filters"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/debt/filters");
-      return res.json();
-    },
-  });
-}
-
-export function useDebtDynamics(dateFrom?: string, dateTo?: string, kontragent?: string) {
-  return useQuery<DebtDynamicsResponse>({
-    queryKey: ["/api/debt/dynamics", dateFrom, dateTo, kontragent],
-    queryFn: async () => {
-      const sp = new URLSearchParams();
-      if (dateFrom) sp.set("dateFrom", dateFrom);
-      if (dateTo) sp.set("dateTo", dateTo);
-      if (kontragent) sp.set("kontragent", kontragent);
-      const res = await apiRequest("GET", `/api/debt/dynamics?${sp.toString()}`);
-      return res.json();
-    },
-  });
-}
-
-export function useDebtKontragenty(period?: string, dateTo?: string) {
-  return useQuery<{ success: boolean; rows: DebtDynamicsKontragent[] }>({
-    queryKey: ["/api/debt/dynamics/kontragenty", period, dateTo],
-    queryFn: async () => {
-      const sp = new URLSearchParams();
-      if (period) sp.set("period", period);
-      if (dateTo) sp.set("dateTo", dateTo);
-      const qs = sp.toString();
-      const res = await apiRequest("GET", `/api/debt/dynamics/kontragenty${qs ? `?${qs}` : ""}`);
-      return res.json();
-    },
-  });
-}
-
-// =====================
-// Calculations (НДС и налог на прибыль)
-// =====================
-
-export interface VatRateRow {
-  rate: string;
-  count: number;
-  total: number;
-  vat: number;
-}
-
-export interface VatResponse {
-  success: boolean;
-  incomeByRate: VatRateRow[];
-  expenseByRate: VatRateRow[];
-  totalIncomeVat: number;
-  totalExpenseVat: number;
-  toPay: number;
-  monthly: { period: string; incomeVat: number; expenseVat: number; toPay: number }[];
-}
-
-export function useVat(dateFrom?: string, dateTo?: string) {
-  return useQuery<VatResponse>({
-    queryKey: ["/api/calculations/vat", dateFrom, dateTo],
-    queryFn: async () => {
-      const sp = new URLSearchParams();
-      if (dateFrom) sp.set("dateFrom", dateFrom);
-      if (dateTo) sp.set("dateTo", dateTo);
-      const res = await apiRequest("GET", `/api/calculations/vat?${sp.toString()}`);
-      return res.json();
-    },
-  });
-}
-
-export interface ChartCategoryRef {
-  id: string;
-  type: "income" | "expense";
-  name?: string;
-}
-
-export interface ProfitTaxParams {
-  dateFrom?: string;
-  dateTo?: string;
-  taxRate: number;
-  incomeCategories?: string[];
-  expenseCategories?: string[];
-  chartCategories?: ChartCategoryRef[];
-}
-
-export interface ProfitTaxResponse {
-  success: boolean;
-  income: number;
-  expenses: number;
-  profit: number;
-  taxRate: number;
-  tax: number;
-  monthly: { period: string; income: number; expenses: number; profit: number; tax: number }[];
-  incomeWithVatBase: number;
-  expenseWithVatBase: number;
-  incomeNoVat: number;
-  expenseNoVat: number;
-  excludedIncomeCategories: { name: string; total: number }[];
-  excludedExpenseCategories: { name: string; total: number }[];
-  categoryMonthly?: { id: string; name: string; type: string; data: { period: string; amount: number }[] }[];
-}
-
-export function useProfitTax() {
-  return useMutation<ProfitTaxResponse, Error, ProfitTaxParams>({
-    mutationFn: async (params) => {
-      const sp = new URLSearchParams();
-      if (params.dateFrom) sp.set("dateFrom", params.dateFrom);
-      if (params.dateTo) sp.set("dateTo", params.dateTo);
-      sp.set("taxRate", String(params.taxRate));
-      const body: Record<string, unknown> = {};
-      if (params.incomeCategories?.length) body.incomeCategories = params.incomeCategories;
-      if (params.expenseCategories?.length) body.expenseCategories = params.expenseCategories;
-      if (params.chartCategories?.length) body.chartCategories = params.chartCategories;
-      const res = await apiRequest("POST", `/api/calculations/profit-tax?${sp.toString()}`, body);
-      return res.json();
-    },
-  });
-}
-
-// =====================
-// Audit (проверка распределения по категориям)
-// =====================
-
-export interface AuditGapRow {
-  columns: Record<string, string>;
-  sum: number;
-  count: number;
-}
-
-export interface DirectionAudit {
-  dbTotal: number;
-  dbCount: number;
-  treeTotal: number;
-  treeCount: number;
-  excludedTotal: number;
-  excludedCount: number;
-  uncategorizedTotal: number;
-  uncategorizedCount: number;
-  gapTotal: number;
-  gapCount: number;
-  gapRows: AuditGapRow[];
-  treeBreakdown: { name: string; total: number; count: number; isPrimary: boolean }[];
-}
-
-export interface AuditResult {
-  timestamp: string;
-  status: "ok" | "warning" | "error";
-  summary: string;
-  income: DirectionAudit;
-  expense: DirectionAudit;
-}
-
-export function useAuditHistory() {
-  return useQuery<{ success: boolean; history: AuditResult[] }>({
-    queryKey: ["/api/audit/history"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/audit/history");
-      return res.json();
-    },
-  });
-}
-
-export function useAuditStatus() {
-  return useQuery<{ success: boolean; last: AuditResult | null; running: boolean }>({
-    queryKey: ["/api/audit/status"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/audit/status");
-      return res.json();
-    },
-    refetchInterval: 10_000,
-  });
-}
-
-export function useRunAudit() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation<{ success: boolean; result: AuditResult }, Error>({
-    mutationFn: async () => {
-      const res = await apiRequest("POST", "/api/audit/run");
-      return res.json();
-    },
-    onSuccess: (data) => {
-      qc.invalidateQueries({ queryKey: ["/api/audit/history"] });
-      qc.invalidateQueries({ queryKey: ["/api/audit/status"] });
-      toast({
-        title: "Аудит завершён",
-        description: data?.result?.status === "ok" ? "Расхождений не найдено" : "Обнаружены расхождения",
-        variant: data?.result?.status === "ok" ? "default" : "destructive",
-      });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка аудита", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-// =====================
-// Salary: Google Sheets source
-// =====================
-
-export interface GoogleStatus {
-  success: boolean;
-  loggedIn: boolean;
-  email?: string;
-}
-
-export function useGoogleStatus() {
-  return useQuery<GoogleStatus>({
-    queryKey: ["/api/finance/google/status"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/finance/google/status");
-      return res.json();
-    },
-  });
-}
-
-export function useGoogleAuthUrl() {
-  return useQuery<{ success: boolean; url: string }>({
-    queryKey: ["/api/finance/google/auth-url"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/finance/google/auth-url");
-      return res.json();
-    },
-    enabled: false,
-    retry: false,
-  });
-}
-
-export interface SalaryArea {
-  id: string;
-  name: string;
-  spreadsheetId?: string;
-  spreadsheetUrl?: string;
-  fioCol?: string;
-  bazaCol?: string;
-  kVydacheCol?: string;
-}
-
-export function useSalaryAreas() {
-  return useQuery<{ success: boolean; areas: SalaryArea[] }>({
-    queryKey: ["/api/salary/areas"],
-    queryFn: async () => {
-      const res = await apiRequest("GET", "/api/salary/areas");
-      return res.json();
-    },
-  });
-}
-
-export function useCreateSalaryArea() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (body: { name: string; spreadsheetUrl: string; fioCol?: string; bazaCol?: string; kVydacheCol?: string }) => {
-      const res = await apiRequest("POST", "/api/salary/areas", body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/areas"] });
-      qc.invalidateQueries({ queryKey: ["/api/salary/neof"] });
-      toast({ title: "Участок добавлен" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useUpdateSalaryArea() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async ({ id, ...body }: { id: string; fioCol?: string; bazaCol?: string; kVydacheCol?: string }) => {
-      const res = await apiRequest("PATCH", `/api/salary/areas/${id}`, body);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/areas"] });
-      qc.invalidateQueries({ queryKey: ["/api/salary/neof"] });
-      toast({ title: "Столбцы обновлены" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export function useDeleteSalaryArea() {
-  const qc = useQueryClient();
-  const { toast } = useToast();
-  return useMutation({
-    mutationFn: async (id: string) => {
-      const res = await apiRequest("DELETE", `/api/salary/areas/${id}`);
-      return res.json();
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/areas"] });
-      qc.invalidateQueries({ queryKey: ["/api/salary/neof"] });
-      toast({ title: "Участок удалён" });
-    },
-    onError: (err: any) => {
-      toast({ title: "Ошибка", description: err?.message, variant: "destructive" });
-    },
-  });
-}
-
-export interface SalarySyncResult {
-  success: boolean;
-  added: number;
-  updated: number;
-  deleted: number;
-  total: number;
-  errors?: string[];
-  authRequired?: boolean;
-}
-
-export function useSalarySync() {
-  const qc = useQueryClient();
-  return useMutation<SalarySyncResult, Error>({
-    mutationFn: async () => {
-      try {
-        const res = await apiRequest("POST", "/api/salary/sync");
-        return res.json();
-      } catch (err: any) {
-        // 401 с authRequired — не ошибка, а сигнал «нужна авторизация Google»
-        if (err?.status === 401) return { success: false, authRequired: true } as SalarySyncResult;
-        throw err;
-      }
-    },
-    onSuccess: () => {
-      qc.invalidateQueries({ queryKey: ["/api/salary/neof"] });
-      qc.invalidateQueries({ queryKey: ["/api/salary/db-status"] });
-    },
-  });
-}
diff --git a/client/src/index.css b/client/src/index.css
index f8b1b6e..8fbb912 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -340,48 +340,6 @@
     -webkit-line-clamp: 1;
   }
 
-  /* Finance elevation */
-  .hover-elevate {
-    position: relative;
-  }
-  .hover-elevate::after {
-    content: "";
-    position: absolute;
-    inset: 0;
-    border-radius: inherit;
-    pointer-events: none;
-    opacity: 0;
-    background: var(--elevate-1);
-    transition: opacity 0.15s ease;
-  }
-  .hover-elevate:hover::after {
-    opacity: 1;
-  }
-
-  .hover-elevate-2 {
-    position: relative;
-  }
-  .hover-elevate-2::after {
-    content: "";
-    position: absolute;
-    inset: 0;
-    border-radius: inherit;
-    pointer-events: none;
-    opacity: 0;
-    background: var(--elevate-2);
-    transition: opacity 0.15s ease;
-  }
-  .hover-elevate-2:hover::after {
-    opacity: 1;
-  }
-
-  .active-elevate:active::after {
-    opacity: 1;
-  }
-  .active-elevate-2:active::after {
-    opacity: 1;
-  }
-
   .toggle-elevate[data-state="on"]::after,
   .toggle-elevate-2[data-state="on"]::after {
     opacity: 1;
diff --git a/client/src/lib/format.ts b/client/src/lib/format.ts
deleted file mode 100644
index b008584..0000000
--- a/client/src/lib/format.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Форматирование чисел, дат и валют для Finance module
- */
-
-export function formatCurrency(n: number): string {
-  return new Intl.NumberFormat("ru-RU", {
-    style: "currency",
-    currency: "RUB",
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-  }).format(n);
-}
-
-export function formatCurrencyWithKopecks(n: number): string {
-  return new Intl.NumberFormat("ru-RU", {
-    style: "currency",
-    currency: "RUB",
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  }).format(n);
-}
-
-export function formatNumber(n: number): string {
-  return new Intl.NumberFormat("ru-RU", {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 0,
-  }).format(n);
-}
-
-export function formatDate(s: string | null | undefined): string {
-  if (!s) return "—";
-  const d = new Date(s);
-  if (isNaN(d.getTime())) return String(s);
-  return d.toLocaleDateString("ru-RU", {
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-  });
-}
-
-export function formatDateShort(s: string | null | undefined): string {
-  if (!s) return "—";
-  const d = new Date(s);
-  if (isNaN(d.getTime())) return String(s);
-  return d.toLocaleDateString("ru-RU", {
-    day: "2-digit",
-    month: "2-digit",
-    year: "2-digit",
-  });
-}
-
-export function formatKOrM(n: number): string {
-  if (Math.abs(n) >= 1_000_000) {
-    return (n / 1_000_000).toFixed(1).replace(/\.0$/, "") + "M";
-  }
-  if (Math.abs(n) >= 1_000) {
-    return (n / 1_000).toFixed(1).replace(/\.0$/, "") + "K";
-  }
-  return String(n);
-}
diff --git a/client/src/pages/finance/audit.tsx b/client/src/pages/finance/audit.tsx
deleted file mode 100644
index 0c99c96..0000000
--- a/client/src/pages/finance/audit.tsx
+++ /dev/null
@@ -1,281 +0,0 @@
-import { useState } from "react";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceNav } from "@/components/finance/FinanceNav";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { Loader2, Play, CheckCircle2, AlertTriangle, Clock, RefreshCw, ChevronDown, ChevronRight } from "lucide-react";
-import {
-  useAuditHistory,
-  useAuditStatus,
-  useRunAudit,
-  type AuditResult,
-  type DirectionAudit,
-} from "@/hooks/useFinance";
-
-function formatMoney(v: number): string {
-  return v.toLocaleString("ru-RU", { minimumFractionDigits: 2, maximumFractionDigits: 2 }) + " ₽";
-}
-
-function formatDateTime(iso: string): string {
-  return new Date(iso).toLocaleString("ru-RU", {
-    day: "2-digit", month: "2-digit", year: "numeric",
-    hour: "2-digit", minute: "2-digit",
-  });
-}
-
-function StatusBadge({ status }: { status: string }) {
-  if (status === "ok") return <Badge className="bg-green-500/10 text-green-600 border-green-500/20 hover:bg-green-500/10"><CheckCircle2 className="w-3 h-3 mr-1" /> Всё в порядке</Badge>;
-  if (status === "warning") return <Badge variant="outline" className="bg-yellow-500/10 text-yellow-600 border-yellow-500/20"><AlertTriangle className="w-3 h-3 mr-1" /> Есть расхождения</Badge>;
-  return <Badge variant="destructive"><AlertTriangle className="w-3 h-3 mr-1" /> Ошибка</Badge>;
-}
-
-const MAX_GAP_ROWS = 50;
-
-function DirectionCard({ title, data }: { title: string; data: DirectionAudit }) {
-  const pctTree = data.dbCount > 0 ? ((data.treeCount / data.dbCount) * 100).toFixed(1) : "0";
-  const pctExcl = data.dbCount > 0 ? ((data.excludedCount / data.dbCount) * 100).toFixed(1) : "0";
-  const pctUncat = data.dbCount > 0 ? ((data.uncategorizedCount / data.dbCount) * 100).toFixed(1) : "0";
-
-  return (
-    <Card>
-      <CardHeader className="pb-3">
-        <div className="flex items-center justify-between">
-          <CardTitle className="text-base">{title}</CardTitle>
-          {data.gapCount === 0
-            ? <Badge className="bg-green-500/10 text-green-600 border-green-500/20 hover:bg-green-500/10">Gap: 0</Badge>
-            : <Badge variant="outline" className="bg-yellow-500/10 text-yellow-600 border-yellow-500/20">Gap: {data.gapCount} строк</Badge>
-          }
-        </div>
-      </CardHeader>
-      <CardContent className="space-y-4">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>Категория</TableHead>
-              <TableHead className="text-right">Строк</TableHead>
-              <TableHead className="text-right">%</TableHead>
-              <TableHead className="text-right">Сумма</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            <TableRow className="font-medium bg-muted/30">
-              <TableCell>Всего в БД</TableCell>
-              <TableCell className="text-right">{data.dbCount}</TableCell>
-              <TableCell className="text-right">100%</TableCell>
-              <TableCell className="text-right">{formatMoney(data.dbTotal)}</TableCell>
-            </TableRow>
-            <TableRow>
-              <TableCell>В деревьях (не исключённые)</TableCell>
-              <TableCell className="text-right">{data.treeCount}</TableCell>
-              <TableCell className="text-right">{pctTree}%</TableCell>
-              <TableCell className="text-right">{formatMoney(data.treeTotal)}</TableCell>
-            </TableRow>
-            <TableRow>
-              <TableCell>Исключённые категории</TableCell>
-              <TableCell className="text-right">{data.excludedCount}</TableCell>
-              <TableCell className="text-right">{pctExcl}%</TableCell>
-              <TableCell className="text-right">{formatMoney(data.excludedTotal)}</TableCell>
-            </TableRow>
-            <TableRow>
-              <TableCell>Нераспределённые</TableCell>
-              <TableCell className="text-right">{data.uncategorizedCount}</TableCell>
-              <TableCell className="text-right">{pctUncat}%</TableCell>
-              <TableCell className="text-right">{formatMoney(data.uncategorizedTotal)}</TableCell>
-            </TableRow>
-            <TableRow className={data.gapCount !== 0 ? "bg-yellow-500/5" : "bg-green-500/5"}>
-              <TableCell className="font-medium">Gap (расхождение)</TableCell>
-              <TableCell className="text-right font-medium">{data.gapCount}</TableCell>
-              <TableCell className="text-right">—</TableCell>
-              <TableCell className="text-right font-medium">{formatMoney(data.gapTotal)}</TableCell>
-            </TableRow>
-          </TableBody>
-        </Table>
-
-        {data.treeBreakdown.length > 0 && (
-          <div>
-            <h4 className="text-sm font-medium mb-2 text-muted-foreground">Деревья</h4>
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead>Дерево</TableHead>
-                  <TableHead className="text-right">Строк</TableHead>
-                  <TableHead className="text-right">Сумма</TableHead>
-                  <TableHead className="text-center">Primary</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {data.treeBreakdown.map((t, i) => (
-                  <TableRow key={i}>
-                    <TableCell>{t.name}</TableCell>
-                    <TableCell className="text-right">{t.count}</TableCell>
-                    <TableCell className="text-right">{formatMoney(t.total)}</TableCell>
-                    <TableCell className="text-center">
-                      {t.isPrimary ? <CheckCircle2 className="w-3.5 h-3.5 text-green-500 mx-auto" /> : <span className="text-muted-foreground text-xs">—</span>}
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </div>
-        )}
-
-        {data.gapRows.length > 0 && (
-          <div>
-            <h4 className="text-sm font-medium mb-2 text-yellow-600">Нераспределённые строки (gap)</h4>
-            <div className="max-h-60 overflow-auto border rounded-md">
-              <Table>
-                <TableHeader>
-                  <TableRow>
-                    {Object.keys(data.gapRows[0].columns).slice(0, 5).map(col => (
-                      <TableHead key={col} className="text-xs">{col}</TableHead>
-                    ))}
-                    <TableHead className="text-right text-xs">Сумма</TableHead>
-                    <TableHead className="text-right text-xs">Кол-во</TableHead>
-                  </TableRow>
-                </TableHeader>
-                <TableBody>
-                  {data.gapRows.slice(0, MAX_GAP_ROWS).map((r, i) => (
-                    <TableRow key={i}>
-                      {Object.keys(data.gapRows[0].columns).slice(0, 5).map(col => (
-                        <TableCell key={col} className="text-xs max-w-[150px] truncate">{r.columns[col] || "—"}</TableCell>
-                      ))}
-                      <TableCell className="text-right text-xs">{formatMoney(r.sum)}</TableCell>
-                      <TableCell className="text-right text-xs">{r.count}</TableCell>
-                    </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </div>
-            {data.gapRows.length > MAX_GAP_ROWS && (
-              <p className="text-xs text-muted-foreground mt-1">
-                Показаны первые {MAX_GAP_ROWS} из {data.gapRows.length} строк
-              </p>
-            )}
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
-
-function AuditEntry({ audit, defaultOpen }: { audit: AuditResult; defaultOpen: boolean }) {
-  const [open, setOpen] = useState(defaultOpen);
-
-  return (
-    <Card>
-      <button
-        className="w-full flex items-center justify-between gap-3 px-4 py-3 text-left hover:bg-muted/30 transition-colors"
-        onClick={() => setOpen(o => !o)}
-      >
-        <div className="flex items-center gap-3 min-w-0">
-          {open ? <ChevronDown className="w-4 h-4 text-muted-foreground shrink-0" /> : <ChevronRight className="w-4 h-4 text-muted-foreground shrink-0" />}
-          <span className="text-sm whitespace-nowrap">{formatDateTime(audit.timestamp)}</span>
-          <StatusBadge status={audit.status} />
-        </div>
-        <div className="flex items-center gap-4 min-w-0">
-          <span className="text-xs text-muted-foreground whitespace-nowrap hidden sm:block">
-            Доходы gap: {audit.income.gapCount} / {formatMoney(audit.income.gapTotal)} · Расходы gap: {audit.expense.gapCount} / {formatMoney(audit.expense.gapTotal)}
-          </span>
-          <span className="text-xs text-muted-foreground truncate max-w-[240px]">{audit.summary}</span>
-        </div>
-      </button>
-      {open && (
-        <CardContent className="pt-0">
-          <div className="grid gap-4 md:grid-cols-1 lg:grid-cols-2">
-            <DirectionCard title="Доходы" data={audit.income} />
-            <DirectionCard title="Расходы" data={audit.expense} />
-          </div>
-        </CardContent>
-      )}
-    </Card>
-  );
-}
-
-export default function AuditPage() {
-  const { data: historyData, isLoading: historyLoading } = useAuditHistory();
-  const { data: statusData } = useAuditStatus();
-  const runAudit = useRunAudit();
-
-  const history = historyData?.history ?? [];
-  const latestAudit = statusData?.last ?? history[0] ?? null;
-  const running = statusData?.running || runAudit.isPending;
-
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="audit" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3">
-          <div>
-            <h1 className="text-xl font-bold">Аудит данных</h1>
-            <p className="text-sm text-muted-foreground mt-0.5">
-              Проверка целостности распределения строк по категориям
-            </p>
-          </div>
-          <div className="flex items-center gap-3">
-            {latestAudit && <StatusBadge status={latestAudit.status} />}
-            <Button
-              onClick={() => runAudit.mutate()}
-              disabled={running}
-              className="gap-2"
-            >
-              {running ? <Loader2 className="w-4 h-4 animate-spin" /> : <Play className="w-4 h-4" />}
-              {running ? "Аудит выполняется…" : "Запустить аудит"}
-            </Button>
-          </div>
-        </div>
-
-        <FinanceNav active="audit" onChange={() => {}} />
-
-        {historyLoading && (
-          <div className="flex items-center justify-center py-12">
-            <Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
-            <span className="ml-2 text-muted-foreground">Загрузка...</span>
-          </div>
-        )}
-
-        {latestAudit && (
-          <Card className="bg-muted/30">
-            <CardContent className="py-4">
-              <div className="flex items-center gap-3 flex-wrap">
-                <Clock className="w-4 h-4 text-muted-foreground" />
-                <span className="text-sm text-muted-foreground">
-                  Последний аудит: {formatDateTime(latestAudit.timestamp)}
-                </span>
-                <span className="text-sm">{latestAudit.summary}</span>
-              </div>
-            </CardContent>
-          </Card>
-        )}
-
-        {!historyLoading && history.length === 0 && !latestAudit && (
-          <Card>
-            <CardContent className="py-12 text-center">
-              <RefreshCw className="w-8 h-8 text-muted-foreground mx-auto mb-3" />
-              <p className="text-muted-foreground">Аудит ещё не проводился</p>
-              <p className="text-sm text-muted-foreground mt-1">Нажмите «Запустить аудит» для первой проверки</p>
-            </CardContent>
-          </Card>
-        )}
-
-        {history.length > 0 && (
-          <div className="space-y-3">
-            {history.map((h, i) => (
-              <AuditEntry key={`${h.timestamp}-${i}`} audit={h} defaultOpen={i === 0} />
-            ))}
-          </div>
-        )}
-      </div>
-    </FinanceLayout>
-  );
-}
diff --git a/client/src/pages/finance/calculations.tsx b/client/src/pages/finance/calculations.tsx
deleted file mode 100644
index 1726144..0000000
--- a/client/src/pages/finance/calculations.tsx
+++ /dev/null
@@ -1,1174 +0,0 @@
-import { useState, useMemo, useEffect } from "react";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceNav } from "@/components/finance/FinanceNav";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { DatabaseError } from "@/components/finance/DatabaseError";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
-import { Label } from "@/components/ui/label";
-import { Checkbox } from "@/components/ui/checkbox";
-import { ScrollArea } from "@/components/ui/scroll-area";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { Badge } from "@/components/ui/badge";
-import { CalendarDays, X, TrendingUp, TrendingDown, DollarSign, Receipt, Calculator, Settings, ChevronRight, ChevronDown, Search } from "lucide-react";
-import {
-  useVat,
-  useProfitTax,
-  useIncomeCategories,
-  useExpenseCategories,
-  type Category,
-  type VatResponse,
-  type ProfitTaxResponse,
-  type ChartCategoryRef,
-} from "@/hooks/useFinance";
-import { formatCurrency } from "@/lib/format";
-import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, Legend, Line, ComposedChart } from "recharts";
-
-function flattenCatIds(cats: Category[]): string[] {
-  const ids: string[] = [];
-  for (const c of cats) {
-    ids.push(c.id);
-    if (c.children?.length) ids.push(...flattenCatIds(c.children));
-  }
-  return ids;
-}
-
-function getChildIds(node: Category): string[] {
-  const ids: string[] = [];
-  if (node.children?.length) {
-    for (const c of node.children) {
-      ids.push(c.id);
-      ids.push(...getChildIds(c));
-    }
-  }
-  return ids;
-}
-
-function countTopLevel(cats: Category[]): number {
-  return cats.filter(c => !c.excluded).length;
-}
-
-function countExcluded(cats: Category[]): number {
-  let count = 0;
-  for (const c of cats) {
-    if (c.excluded) count++;
-    if (c.children?.length) count += countExcluded(c.children);
-  }
-  return count;
-}
-
-function CategoryTree({ cats, selected, onChange, label }: {
-  cats: Category[];
-  selected: Set<string>;
-  onChange: (newSet: Set<string>) => void;
-  label: string;
-}) {
-  const [expanded, setExpanded] = useState<Set<string>>(new Set());
-  const allIds = useMemo(() => flattenCatIds(cats), [cats]);
-  const allSelected = allIds.length > 0 && allIds.every(id => selected.has(id));
-  const someSelected = allIds.length > 0 && allIds.some(id => selected.has(id));
-  const excludedCount = useMemo(() => countExcluded(cats), [cats]);
-
-  const toggleExpand = (id: string) => {
-    setExpanded(prev => {
-      const next = new Set(prev);
-      if (next.has(id)) next.delete(id); else next.add(id);
-      return next;
-    });
-  };
-
-  const toggleAll = () => {
-    if (allIds.length === 0) return;
-    if (allSelected) {
-      onChange(new Set());
-    } else {
-      onChange(new Set(allIds));
-    }
-  };
-
-  const toggleNode = (node: Category) => {
-    const next = new Set(selected);
-    const ids = [node.id, ...getChildIds(node)];
-    if (next.has(node.id)) {
-      ids.forEach(id => next.delete(id));
-    } else {
-      ids.forEach(id => next.add(id));
-    }
-    onChange(next);
-  };
-
-  const renderNode = (node: Category, depth: number) => {
-    const hasChildren = node.children && node.children.length > 0;
-    const isExpanded = expanded.has(node.id);
-    const isChecked = selected.has(node.id);
-    const childIds = hasChildren ? getChildIds(node) : [];
-    const someChildrenSelected = hasChildren && childIds.some(id => selected.has(id));
-    const allChildrenSelected = hasChildren && childIds.length > 0 && childIds.every(id => selected.has(id));
-    const isIndeterminate = hasChildren && someChildrenSelected && !(isChecked && allChildrenSelected);
-
-    return (
-      <div key={node.id}>
-        <div
-          className="flex items-center gap-1.5 py-1 hover:bg-muted/50 rounded-sm px-1 cursor-pointer"
-          style={{ paddingLeft: depth * 16 + 4 }}
-        >
-          {hasChildren ? (
-            <button onClick={() => toggleExpand(node.id)} className="p-0 w-4 h-4 flex items-center justify-center shrink-0">
-              {isExpanded ? <ChevronDown className="w-3 h-3 text-muted-foreground" /> : <ChevronRight className="w-3 h-3 text-muted-foreground" />}
-            </button>
-          ) : (
-            <span className="w-4 shrink-0" />
-          )}
-          <Checkbox
-            checked={isIndeterminate ? "indeterminate" : isChecked}
-            onCheckedChange={() => toggleNode(node)}
-            className="h-3.5 w-3.5"
-          />
-          <span
-            className={`text-xs truncate ${node.excluded ? "line-through text-muted-foreground/50" : "text-foreground"}`}
-            onClick={() => { if (hasChildren) toggleExpand(node.id); }}
-          >
-            {node.name}
-          </span>
-        </div>
-        {hasChildren && isExpanded && node.children!.map(child => renderNode(child, depth + 1))}
-      </div>
-    );
-  };
-
-  return (
-    <div className="space-y-1">
-      <div className="flex items-center justify-between">
-        <Label className="text-xs font-medium">{label}</Label>
-        <button onClick={toggleAll} className="text-xs text-primary hover:underline">
-          {allSelected ? "Снять все" : "Выбрать все"}
-        </button>
-      </div>
-      <p className="text-xs text-muted-foreground">
-        Категории ({cats.filter(c => !c.excluded).length} верхних{excludedCount > 0 ? `, исключено: ${excludedCount}` : ""})
-      </p>
-      <ScrollArea className="h-[220px] rounded-md border p-2">
-        {cats.map(c => renderNode(c, 0))}
-      </ScrollArea>
-    </div>
-  );
-}
-
-const COLORS = {
-  income: "#2563eb",
-  expense: "#e11d48",
-  profit: "#16a34a",
-  tax: "#f59e0b",
-  toPay: "#8b5cf6",
-  cumulative: "#0d9488",
-};
-
-const HIGHLIGHT_COLORS = [
-  "#f97316", "#8b5cf6", "#0d9488", "#ec4899", "#84cc16",
-  "#06b6d4", "#a855f7", "#eab308", "#14b8a6", "#f43f5e",
-];
-
-interface ChartHighlight {
-  id: string;
-  name: string;
-  type: "income" | "expense";
-}
-
-const MONTH_NAMES = [
-  "Январь", "Февраль", "Март", "Апрель", "Май", "Июнь",
-  "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь",
-];
-
-type GroupBy = "month" | "quarter" | "year";
-
-function rateOrder(rate: string): number {
-  const lower = rate.toLowerCase().trim();
-  if (lower === "без ндс") return -1;
-  const m = rate.match(/(\d+)/);
-  return m ? Number(m[1]) : 0;
-}
-
-function sortByRate<T extends { rate: string }>(arr: T[]): T[] {
-  return [...arr].sort((a, b) => rateOrder(a.rate) - rateOrder(b.rate));
-}
-
-function formatPeriodLabel(period: string, groupBy: GroupBy): string {
-  try {
-    if (groupBy === "year") return period;
-    if (groupBy === "quarter") return period;
-    const [y, m] = period.split("-");
-    const d = new Date(Number(y), Number(m) - 1);
-    return d.toLocaleDateString("ru-RU", { month: "short", year: "2-digit" });
-  } catch {
-    return period;
-  }
-}
-
-function tickFormatter(v: number) {
-  if (Math.abs(v) >= 1_000_000) return `${(v / 1_000_000).toFixed(1)}M`;
-  if (Math.abs(v) >= 1000) return `${(v / 1_000).toFixed(0)}K`;
-  return String(v);
-}
-
-function getQuarterKey(period: string, startMonth: number): string {
-  const [y, m] = period.split("-").map(Number);
-  const adjusted = ((m - startMonth + 12) % 12);
-  const q = Math.floor(adjusted / 3) + 1;
-  const qYear = m < startMonth ? y - 1 : y;
-  return `${qYear} Q${q}`;
-}
-
-function getYearKey(period: string): string {
-  return period.split("-")[0];
-}
-
-function groupMonthlyData<T extends { period: string }>(
-  monthly: T[],
-  groupBy: GroupBy,
-  startMonth: number,
-  sumFields: (keyof T)[],
-): (T & { period: string })[] {
-  if (groupBy === "month") return monthly;
-
-  const groups = new Map<string, any>();
-  for (const row of monthly) {
-    const key = groupBy === "quarter" ? getQuarterKey(row.period, startMonth) : getYearKey(row.period);
-    if (!groups.has(key)) {
-      const init: any = { period: key };
-      for (const f of sumFields) init[f] = 0;
-      groups.set(key, init);
-    }
-    const g = groups.get(key)!;
-    for (const f of sumFields) {
-      g[f] = Math.round(((g[f] as number) + (row[f] as number)) * 100) / 100;
-    }
-  }
-  return [...groups.values()];
-}
-
-function addCumulativeVat(
-  data: { period: string; incomeVat: number; expenseVat: number; toPay: number }[],
-  startMonth: number,
-): (typeof data[number] & { cumToPay: number })[] {
-  let cumulative = 0;
-  let currentQuarter = "";
-  return data.map(row => {
-    const q = getQuarterKey(row.period, startMonth);
-    if (q !== currentQuarter) {
-      cumulative = 0;
-      currentQuarter = q;
-    }
-    cumulative += row.toPay;
-    return { ...row, cumToPay: Math.round(cumulative * 100) / 100 };
-  });
-}
-
-function VatTab({ data }: { data: VatResponse }) {
-  const [groupBy, setGroupBy] = useState<GroupBy>(
-    () => (localStorage.getItem("omegaprom_vat_groupby") as GroupBy) || "month"
-  );
-  const [startMonth, setStartMonth] = useState<number>(
-    () => Number(localStorage.getItem("omegaprom_vat_start_month") || "1")
-  );
-
-  function changeGroupBy(v: GroupBy) {
-    setGroupBy(v);
-    localStorage.setItem("omegaprom_vat_groupby", v);
-  }
-
-  function changeStartMonth(v: string) {
-    const m = Number(v);
-    setStartMonth(m);
-    localStorage.setItem("omegaprom_vat_start_month", String(m));
-  }
-
-  const chartData = useMemo(() => {
-    if (!data.monthly?.length) return [];
-    const grouped = groupMonthlyData(
-      data.monthly,
-      groupBy,
-      startMonth,
-      ["incomeVat", "expenseVat", "toPay"],
-    );
-    if (groupBy === "month") {
-      return addCumulativeVat(grouped, startMonth);
-    }
-    return grouped.map((r: any) => ({ ...r, cumToPay: undefined }));
-  }, [data.monthly, groupBy, startMonth]);
-
-  return (
-    <div className="space-y-4">
-      <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-blue-500/10 flex items-center justify-center">
-                <TrendingUp className="w-4 h-4 text-blue-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">НДС с доходов</span>
-            </div>
-            <p className="text-xl font-bold text-foreground tabular-nums">{formatCurrency(data.totalIncomeVat)}</p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-rose-500/10 flex items-center justify-center">
-                <TrendingDown className="w-4 h-4 text-rose-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">НДС с расходов</span>
-            </div>
-            <p className="text-xl font-bold text-foreground tabular-nums">{formatCurrency(data.totalExpenseVat)}</p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-violet-500/10 flex items-center justify-center">
-                <DollarSign className="w-4 h-4 text-violet-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">К уплате</span>
-            </div>
-            <p className={`text-xl font-bold tabular-nums ${data.toPay >= 0 ? "text-rose-600" : "text-green-600"}`}>
-              {formatCurrency(data.toPay)}
-            </p>
-          </CardContent>
-        </Card>
-      </div>
-
-      {chartData.length > 0 && (
-        <Card>
-          <CardHeader className="pb-2 pt-4 px-4">
-            <div className="flex items-center justify-between flex-wrap gap-2">
-              <CardTitle className="text-sm font-medium text-muted-foreground">Динамика НДС</CardTitle>
-              <div className="flex items-center gap-2 flex-wrap">
-                <div className="flex items-center gap-1.5">
-                  <span className="text-xs text-muted-foreground">Начало квартала:</span>
-                  <Select value={String(startMonth)} onValueChange={changeStartMonth}>
-                    <SelectTrigger className="h-7 w-[130px] text-xs">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {MONTH_NAMES.map((name, i) => (
-                        <SelectItem key={i + 1} value={String(i + 1)}>{name}</SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-                <div className="flex gap-0.5 bg-muted/30 p-0.5 rounded-md">
-                  {([["month", "Месяц"], ["quarter", "Квартал"], ["year", "Год"]] as const).map(([key, label]) => (
-                    <Button
-                      key={key}
-                      variant={groupBy === key ? "default" : "ghost"}
-                      size="sm"
-                      className="h-6 px-2 text-xs"
-                      onClick={() => changeGroupBy(key)}
-                    >
-                      {label}
-                    </Button>
-                  ))}
-                </div>
-              </div>
-            </div>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <ResponsiveContainer width="100%" height={350}>
-              <ComposedChart data={chartData}>
-                <CartesianGrid strokeDasharray="3 3" stroke="hsl(var(--border))" />
-                <XAxis
-                  dataKey="period"
-                  tickFormatter={(v: string) => formatPeriodLabel(v, groupBy)}
-                  tick={{ fontSize: 11 }}
-                  axisLine={false}
-                  tickLine={false}
-                />
-                <YAxis tick={{ fontSize: 11 }} axisLine={false} tickLine={false} tickFormatter={tickFormatter} />
-                <Tooltip
-                  content={({ active, payload, label }: any) => {
-                    if (!active || !payload?.length) return null;
-                    return (
-                      <div className="bg-popover border border-border rounded-md px-3 py-2 shadow-md">
-                        <p className="text-sm font-medium text-foreground mb-2">{formatPeriodLabel(label, groupBy)}</p>
-                        {payload.map((entry: any) => (
-                          <div key={entry.dataKey} className="flex items-center gap-2 text-sm py-0.5">
-                            <div className="w-2.5 h-2.5 rounded-sm shrink-0" style={{ backgroundColor: entry.color }} />
-                            <span className="text-muted-foreground">{entry.name}</span>
-                            <span className="font-medium text-foreground ml-auto tabular-nums">{formatCurrency(entry.value)}</span>
-                          </div>
-                        ))}
-                      </div>
-                    );
-                  }}
-                />
-                <Legend wrapperStyle={{ fontSize: 11, paddingTop: 8 }} />
-                <Bar dataKey="incomeVat" name="НДС с доходов" fill={COLORS.income} radius={[3, 3, 0, 0]} />
-                <Bar dataKey="expenseVat" name="НДС с расходов" fill={COLORS.expense} radius={[3, 3, 0, 0]} />
-                <Line dataKey="toPay" name="К уплате" stroke={COLORS.toPay} strokeWidth={2} dot={{ r: 3 }} />
-                {groupBy === "month" && (
-                  <Line dataKey="cumToPay" name="Накоп. за квартал" stroke={COLORS.cumulative} strokeWidth={2} dot={{ r: 3 }} strokeDasharray="5 5" />
-                )}
-              </ComposedChart>
-            </ResponsiveContainer>
-            {groupBy === "month" && (
-              <p className="text-xs text-muted-foreground mt-2">
-                Пунктирная линия — накопительный итог к уплате, сбрасывается в начале каждого квартала (с {MONTH_NAMES[startMonth - 1].toLowerCase()})
-              </p>
-            )}
-          </CardContent>
-        </Card>
-      )}
-
-      <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
-        <Card>
-          <CardHeader className="pb-2 pt-4 px-4">
-            <CardTitle className="text-sm font-medium text-muted-foreground">По ставкам (доходы)</CardTitle>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <div className="space-y-2">
-              {sortByRate(data.incomeByRate ?? []).map((r) => (
-                <div key={r.rate} className="flex items-center justify-between text-sm">
-                  <div className="flex items-center gap-2">
-                    <span className="text-muted-foreground">{r.rate}</span>
-                    <span className="text-xs text-muted-foreground/60">({r.count} док.)</span>
-                  </div>
-                  <div className="flex items-center gap-3">
-                    <span className="text-muted-foreground tabular-nums">{formatCurrency(r.total)}</span>
-                    <span className="font-medium text-foreground tabular-nums min-w-[100px] text-right">
-                      НДС: {formatCurrency(r.vat)}
-                    </span>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardHeader className="pb-2 pt-4 px-4">
-            <CardTitle className="text-sm font-medium text-muted-foreground">По ставкам (расходы)</CardTitle>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <div className="space-y-2">
-              {sortByRate(data.expenseByRate ?? []).map((r) => (
-                <div key={r.rate} className="flex items-center justify-between text-sm">
-                  <div className="flex items-center gap-2">
-                    <span className="text-muted-foreground">{r.rate}</span>
-                    <span className="text-xs text-muted-foreground/60">({r.count} док.)</span>
-                  </div>
-                  <div className="flex items-center gap-3">
-                    <span className="text-muted-foreground tabular-nums">{formatCurrency(r.total)}</span>
-                    <span className="font-medium text-foreground tabular-nums min-w-[100px] text-right">
-                      НДС: {formatCurrency(r.vat)}
-                    </span>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-    </div>
-  );
-}
-
-function FormulaDialog({ data, taxRate, onTaxRateChange, incCats, expCats, onIncCatsChange, onExpCatsChange, incomeCats, expenseCats }: {
-  data: ProfitTaxResponse;
-  taxRate: number;
-  onTaxRateChange: (v: number) => void;
-  incCats: Set<string>;
-  expCats: Set<string>;
-  onIncCatsChange: (ids: Set<string>) => void;
-  onExpCatsChange: (ids: Set<string>) => void;
-  incomeCats: Category[];
-  expenseCats: Category[];
-}) {
-  const [open, setOpen] = useState(false);
-  const [localIncCats, setLocalIncCats] = useState<Set<string>>(new Set());
-  const [localExpCats, setLocalExpCats] = useState<Set<string>>(new Set());
-  const [localTaxRate, setLocalTaxRate] = useState(taxRate);
-
-  const handleOpen = (isOpen: boolean) => {
-    if (isOpen) {
-      setLocalIncCats(new Set(incCats));
-      setLocalExpCats(new Set(expCats));
-      setLocalTaxRate(taxRate);
-    }
-    setOpen(isOpen);
-  };
-
-  const handleSave = () => {
-    onTaxRateChange(localTaxRate);
-    onIncCatsChange(localIncCats);
-    onExpCatsChange(localExpCats);
-    setOpen(false);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={handleOpen}>
-      <DialogTrigger asChild>
-        <Button variant="outline" size="sm" className="gap-2">
-          <Settings className="w-4 h-4" />
-          Формула
-        </Button>
-      </DialogTrigger>
-      <DialogContent className="sm:max-w-2xl max-h-[90vh] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle>Формула расчёта налога на прибыль</DialogTitle>
-          <DialogDescription>Настройка ставки, категорий и просмотр формулы расчёта</DialogDescription>
-        </DialogHeader>
-        <div className="space-y-4 pt-2">
-          <div className="space-y-2">
-            <Label htmlFor="tax-rate-input">Ставка налога (%)</Label>
-            <div className="flex items-center gap-2">
-              <Input
-                id="tax-rate-input"
-                type="number"
-                min={0}
-                max={100}
-                step={1}
-                value={localTaxRate}
-                onChange={(e) => {
-                  const v = Number(e.target.value);
-                  if (!isNaN(v) && v >= 0 && v <= 100) setLocalTaxRate(v);
-                }}
-                className="w-24 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
-              />
-              <span className="text-sm text-muted-foreground">%</span>
-            </div>
-          </div>
-
-          <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-            {incomeCats.length > 0 && (
-              <CategoryTree
-                cats={incomeCats}
-                selected={localIncCats}
-                onChange={setLocalIncCats}
-                label="Категории доходов"
-              />
-            )}
-            {expenseCats.length > 0 && (
-              <CategoryTree
-                cats={expenseCats}
-                selected={localExpCats}
-                onChange={setLocalExpCats}
-                label="Категории расходов"
-              />
-            )}
-          </div>
-          {(localIncCats.size > 0 || localExpCats.size > 0) && (
-            <p className="text-xs text-muted-foreground">
-              Выбрано: {localIncCats.size > 0 ? `${localIncCats.size} кат. доходов` : "все доходы"},{" "}
-              {localExpCats.size > 0 ? `${localExpCats.size} кат. расходов` : "все расходы"}
-            </p>
-          )}
-
-          <div className="rounded-md bg-muted/50 p-3 space-y-1.5">
-            <p className="text-sm font-medium text-foreground">Формула:</p>
-            <p className="text-sm text-muted-foreground">Прибыль = (Приходы с НДС - НДС) - (Расходы с НДС - НДС) + (Приходы без НДС - Расходы без НДС)</p>
-            <p className="text-sm text-muted-foreground">Налог = Прибыль x {localTaxRate}%</p>
-            <p className="text-xs text-muted-foreground/70 mt-2">Налог начисляется только при положительной прибыли</p>
-          </div>
-          <div className="rounded-md border p-3 space-y-2">
-            <p className="text-xs font-medium text-muted-foreground">Текущий расчёт:</p>
-            <div className="space-y-1 text-sm">
-              <p className="text-muted-foreground">С НДС: {formatCurrency(data.incomeWithVatBase ?? 0)} - {formatCurrency(data.expenseWithVatBase ?? 0)} = <span className="text-foreground font-medium">{formatCurrency((data.incomeWithVatBase ?? 0) - (data.expenseWithVatBase ?? 0))}</span></p>
-              <p className="text-muted-foreground">Без НДС: {formatCurrency(data.incomeNoVat ?? 0)} - {formatCurrency(data.expenseNoVat ?? 0)} = <span className="text-foreground font-medium">{formatCurrency((data.incomeNoVat ?? 0) - (data.expenseNoVat ?? 0))}</span></p>
-              <p className="text-muted-foreground">Прибыль: <span className={`font-medium ${data.profit >= 0 ? "text-green-600" : "text-rose-600"}`}>{formatCurrency(data.profit)}</span></p>
-              <p className="text-muted-foreground">Налог: {formatCurrency(Math.max(data.profit, 0))} x {taxRate}% = <span className="font-medium text-amber-600">{formatCurrency(data.tax)}</span></p>
-            </div>
-          </div>
-          <div className="flex justify-end gap-2 pt-2">
-            <Button variant="outline" size="sm" onClick={() => setOpen(false)}>
-              Отмена
-            </Button>
-            <Button size="sm" onClick={handleSave}>
-              Сохранить
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-function flattenCatNodes(cats: Category[], parentName?: string): { id: string; name: string; fullPath: string }[] {
-  const result: { id: string; name: string; fullPath: string }[] = [];
-  for (const c of cats) {
-    if (c.excluded) continue;
-    const path = parentName ? `${parentName} / ${c.name}` : c.name;
-    result.push({ id: c.id, name: c.name, fullPath: path });
-    if (c.children?.length) result.push(...flattenCatNodes(c.children, path));
-  }
-  return result;
-}
-
-function ChartCategoryDialog({ highlights, onChange, incomeCats, expenseCats }: {
-  highlights: ChartHighlight[];
-  onChange: (h: ChartHighlight[]) => void;
-  incomeCats: Category[];
-  expenseCats: Category[];
-}) {
-  const [open, setOpen] = useState(false);
-  const [search, setSearch] = useState("");
-
-  const selectedKeys = useMemo(() => new Set(highlights.map(h => `${h.type}:${h.id}`)), [highlights]);
-
-  const flatIncome = useMemo(() => flattenCatNodes(incomeCats), [incomeCats]);
-  const flatExpense = useMemo(() => flattenCatNodes(expenseCats), [expenseCats]);
-
-  const filteredIncome = useMemo(() => {
-    if (!search.trim()) return flatIncome;
-    const q = search.toLowerCase();
-    return flatIncome.filter(c => c.name.toLowerCase().includes(q) || c.fullPath.toLowerCase().includes(q));
-  }, [flatIncome, search]);
-
-  const filteredExpense = useMemo(() => {
-    if (!search.trim()) return flatExpense;
-    const q = search.toLowerCase();
-    return flatExpense.filter(c => c.name.toLowerCase().includes(q) || c.fullPath.toLowerCase().includes(q));
-  }, [flatExpense, search]);
-
-  function toggle(cat: { id: string; name: string }, type: "income" | "expense") {
-    if (selectedKeys.has(`${type}:${cat.id}`)) {
-      onChange(highlights.filter(h => !(h.id === cat.id && h.type === type)));
-    } else {
-      onChange([...highlights, { id: cat.id, name: cat.name, type }]);
-    }
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={(v) => { setOpen(v); if (!v) setSearch(""); }}>
-      <DialogTrigger asChild>
-        <Button variant="ghost" size="sm" className="h-6 w-6 p-0">
-          <Settings className="w-3.5 h-3.5 text-muted-foreground" />
-        </Button>
-      </DialogTrigger>
-      <DialogContent className="sm:max-w-md max-h-[80vh] flex flex-col">
-        <DialogHeader>
-          <DialogTitle>Категории на графике</DialogTitle>
-          <DialogDescription>Выберите категории для отображения отдельными столбиками</DialogDescription>
-        </DialogHeader>
-        <div className="relative">
-          <Search className="absolute left-2.5 top-2.5 w-4 h-4 text-muted-foreground" />
-          <Input
-            placeholder="Поиск категорий..."
-            value={search}
-            onChange={e => setSearch(e.target.value)}
-            className="pl-8"
-          />
-        </div>
-        <ScrollArea className="flex-1 max-h-[50vh] border rounded-md">
-          <div className="p-3 space-y-4">
-            {filteredIncome.length > 0 && (
-              <div>
-                <p className="text-xs font-medium text-blue-500 mb-2 flex items-center gap-1">
-                  <TrendingUp className="w-3 h-3" /> Доходы
-                </p>
-                <div className="space-y-1">
-                  {filteredIncome.map(c => (
-                    <label
-                      key={c.id}
-                      className="flex items-center gap-2 text-sm py-1 px-1.5 rounded hover:bg-muted/50 cursor-pointer"
-                    >
-                      <Checkbox
-                        checked={selectedKeys.has(`income:${c.id}`)}
-                        onCheckedChange={() => toggle(c, "income")}
-                      />
-                      <span className="text-foreground truncate">{c.name}</span>
-                      {c.fullPath !== c.name && (
-                        <span className="text-muted-foreground text-xs truncate ml-auto">{c.fullPath}</span>
-                      )}
-                    </label>
-                  ))}
-                </div>
-              </div>
-            )}
-            {filteredExpense.length > 0 && (
-              <div>
-                <p className="text-xs font-medium text-rose-500 mb-2 flex items-center gap-1">
-                  <TrendingDown className="w-3 h-3" /> Расходы
-                </p>
-                <div className="space-y-1">
-                  {filteredExpense.map(c => (
-                    <label
-                      key={c.id}
-                      className="flex items-center gap-2 text-sm py-1 px-1.5 rounded hover:bg-muted/50 cursor-pointer"
-                    >
-                      <Checkbox
-                        checked={selectedKeys.has(`expense:${c.id}`)}
-                        onCheckedChange={() => toggle(c, "expense")}
-                      />
-                      <span className="text-foreground truncate">{c.name}</span>
-                      {c.fullPath !== c.name && (
-                        <span className="text-muted-foreground text-xs truncate ml-auto">{c.fullPath}</span>
-                      )}
-                    </label>
-                  ))}
-                </div>
-              </div>
-            )}
-            {filteredIncome.length === 0 && filteredExpense.length === 0 && (
-              <p className="text-sm text-muted-foreground text-center py-4">Ничего не найдено</p>
-            )}
-          </div>
-        </ScrollArea>
-        {highlights.length > 0 && (
-          <div className="flex items-center justify-between pt-2">
-            <span className="text-xs text-muted-foreground">Выбрано: {highlights.length}</span>
-            <Button variant="ghost" size="sm" className="text-xs h-6" onClick={() => onChange([])}>
-              Сбросить
-            </Button>
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-function ProfitTab({ data, taxRate, onTaxRateChange, incCats, expCats, onIncCatsChange, onExpCatsChange, chartHighlights, onChartHighlightsChange }: {
-  data: ProfitTaxResponse;
-  taxRate: number;
-  onTaxRateChange: (v: number) => void;
-  incCats: Set<string>;
-  expCats: Set<string>;
-  onIncCatsChange: (ids: Set<string>) => void;
-  onExpCatsChange: (ids: Set<string>) => void;
-  chartHighlights: ChartHighlight[];
-  onChartHighlightsChange: (highlights: ChartHighlight[]) => void;
-}) {
-  const [groupBy, setGroupBy] = useState<GroupBy>(
-    () => (localStorage.getItem("omegaprom_pt_groupby") as GroupBy) || "month"
-  );
-
-  const { data: incomeCatsData } = useIncomeCategories();
-  const { data: expenseCatsData } = useExpenseCategories();
-  const incomeCats = useMemo(() => incomeCatsData?.categories ?? [], [incomeCatsData]);
-  const expenseCats = useMemo(() => expenseCatsData?.categories ?? [], [expenseCatsData]);
-
-  function changeGroupBy(v: GroupBy) {
-    setGroupBy(v);
-    localStorage.setItem("omegaprom_pt_groupby", v);
-  }
-
-  const chartData = useMemo(() => {
-    if (!data.monthly?.length) return [];
-    const base = groupMonthlyData(
-      data.monthly,
-      groupBy,
-      1,
-      ["income", "expenses", "profit", "tax"],
-    );
-    if (!chartHighlights.length || !data.categoryMonthly?.length) return base;
-    const catMonthly = data.categoryMonthly;
-    return base.map((row: any) => {
-      const newRow = { ...row };
-      let incSub = 0;
-      let expSub = 0;
-      for (const cm of catMonthly) {
-        const key = `_cat_${cm.type}_${cm.id}`;
-        let catTotal = 0;
-        if (groupBy === "month") {
-          const match = cm.data.find((d: any) => d.period === row.period);
-          catTotal = match ? match.amount : 0;
-        } else {
-          for (const d of cm.data) {
-            const qKey = groupBy === "quarter"
-              ? getQuarterKey(d.period, 1)
-              : d.period.split("-")[0];
-            if (qKey === row.period) catTotal += d.amount;
-          }
-        }
-        newRow[key] = Math.round(catTotal * 100) / 100;
-        if (cm.type === "income") incSub += catTotal;
-        else expSub += catTotal;
-      }
-      if (incSub > 0) newRow.income = Math.round((newRow.income - incSub) * 100) / 100;
-      if (expSub > 0) newRow.expenses = Math.round((newRow.expenses - expSub) * 100) / 100;
-      return newRow;
-    });
-  }, [data.monthly, data.categoryMonthly, groupBy, chartHighlights]);
-
-  return (
-    <div className="space-y-4">
-      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-5 gap-3">
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-blue-500/10 flex items-center justify-center">
-                <TrendingUp className="w-4 h-4 text-blue-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">Доходы</span>
-            </div>
-            <p className="text-xl font-bold text-foreground tabular-nums">{formatCurrency(data.income)}</p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-rose-500/10 flex items-center justify-center">
-                <TrendingDown className="w-4 h-4 text-rose-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">Расходы</span>
-            </div>
-            <p className="text-xl font-bold text-foreground tabular-nums">{formatCurrency(data.expenses)}</p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-green-500/10 flex items-center justify-center">
-                <DollarSign className="w-4 h-4 text-green-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">Прибыль</span>
-            </div>
-            <p className={`text-xl font-bold tabular-nums ${data.profit >= 0 ? "text-green-600" : "text-rose-600"}`}>
-              {formatCurrency(data.profit)}
-            </p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4">
-            <div className="flex items-center gap-2 mb-1">
-              <div className="w-8 h-8 rounded-lg bg-violet-500/10 flex items-center justify-center">
-                <Calculator className="w-4 h-4 text-violet-500" />
-              </div>
-              <span className="text-sm text-muted-foreground">Налог</span>
-            </div>
-            <p className="text-xl font-bold text-amber-600 tabular-nums">{formatCurrency(data.tax)}</p>
-          </CardContent>
-        </Card>
-        <Card>
-          <CardContent className="pt-4 pb-3 px-4 flex flex-col items-center justify-center h-full">
-            <FormulaDialog
-              data={data}
-              taxRate={taxRate}
-              onTaxRateChange={onTaxRateChange}
-              incCats={incCats}
-              expCats={expCats}
-              onIncCatsChange={onIncCatsChange}
-              onExpCatsChange={onExpCatsChange}
-              incomeCats={incomeCats}
-              expenseCats={expenseCats}
-            />
-          </CardContent>
-        </Card>
-      </div>
-
-      {chartData.length > 0 && (
-        <Card>
-          <CardHeader className="pb-2 pt-4 px-4">
-            <div className="flex items-center justify-between flex-wrap gap-2">
-              <div className="flex items-center gap-2">
-                <CardTitle className="text-sm font-medium text-muted-foreground">Динамика</CardTitle>
-                <ChartCategoryDialog
-                  highlights={chartHighlights}
-                  onChange={onChartHighlightsChange}
-                  incomeCats={incomeCats}
-                  expenseCats={expenseCats}
-                />
-              </div>
-              <div className="flex gap-0.5 bg-muted/30 p-0.5 rounded-md">
-                {([["month", "Месяц"], ["quarter", "Квартал"], ["year", "Год"]] as const).map(([key, label]) => (
-                  <Button
-                    key={key}
-                    variant={groupBy === key ? "default" : "ghost"}
-                    size="sm"
-                    className="h-6 px-2 text-xs"
-                    onClick={() => changeGroupBy(key)}
-                  >
-                    {label}
-                  </Button>
-                ))}
-              </div>
-            </div>
-            {chartHighlights.length > 0 && (
-              <div className="flex flex-wrap gap-1 mt-2">
-                {chartHighlights.map((h, i) => (
-                  <Badge
-                    key={`${h.type}:${h.id}`}
-                    variant="outline"
-                    className="text-xs gap-1 pr-1"
-                    style={{ borderColor: HIGHLIGHT_COLORS[i % HIGHLIGHT_COLORS.length], color: HIGHLIGHT_COLORS[i % HIGHLIGHT_COLORS.length] }}
-                  >
-                    <span className="w-2 h-2 rounded-full shrink-0" style={{ backgroundColor: HIGHLIGHT_COLORS[i % HIGHLIGHT_COLORS.length] }} />
-                    {h.name}
-                    <button
-                      className="ml-0.5 hover:bg-muted rounded-sm p-0.5"
-                      onClick={() => onChartHighlightsChange(chartHighlights.filter(x => !(x.id === h.id && x.type === h.type)))}
-                    >
-                      <X className="w-3 h-3" />
-                    </button>
-                  </Badge>
-                ))}
-              </div>
-            )}
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <ResponsiveContainer width="100%" height={350}>
-              <ComposedChart data={chartData}>
-                <CartesianGrid strokeDasharray="3 3" stroke="hsl(var(--border))" />
-                <XAxis
-                  dataKey="period"
-                  tickFormatter={(v: string) => formatPeriodLabel(v, groupBy)}
-                  tick={{ fontSize: 11 }}
-                  axisLine={false}
-                  tickLine={false}
-                />
-                <YAxis tick={{ fontSize: 11 }} axisLine={false} tickLine={false} tickFormatter={tickFormatter} />
-                <Tooltip
-                  content={({ active, payload, label }: any) => {
-                    if (!active || !payload?.length) return null;
-                    return (
-                      <div className="bg-popover border border-border rounded-md px-3 py-2 shadow-md">
-                        <p className="text-sm font-medium text-foreground mb-2">{formatPeriodLabel(label, groupBy)}</p>
-                        {payload.map((entry: any) => (
-                          <div key={entry.dataKey} className="flex items-center gap-2 text-sm py-0.5">
-                            <div className="w-2.5 h-2.5 rounded-sm shrink-0" style={{ backgroundColor: entry.color }} />
-                            <span className="text-muted-foreground">{entry.name}</span>
-                            <span className="font-medium text-foreground ml-auto tabular-nums">{formatCurrency(entry.value)}</span>
-                          </div>
-                        ))}
-                      </div>
-                    );
-                  }}
-                />
-                <Legend wrapperStyle={{ fontSize: 11, paddingTop: 8 }} />
-                <Bar dataKey="income" name={chartHighlights.some(h => h.type === "income") ? "Доходы (остаток)" : "Доходы"} fill={COLORS.income} radius={[3, 3, 0, 0]} />
-                <Bar dataKey="expenses" name={chartHighlights.some(h => h.type === "expense") ? "Расходы (остаток)" : "Расходы"} fill={COLORS.expense} radius={[3, 3, 0, 0]} />
-                {chartHighlights.map((h, i) => (
-                  <Bar key={`${h.type}:${h.id}`} dataKey={`_cat_${h.type}_${h.id}`} name={h.name} fill={HIGHLIGHT_COLORS[i % HIGHLIGHT_COLORS.length]} radius={[3, 3, 0, 0]} />
-                ))}
-                <Line dataKey="profit" name="Прибыль" stroke={COLORS.profit} strokeWidth={2} dot={{ r: 3 }} />
-                <Line dataKey="tax" name={`Налог (${taxRate}%)`} stroke={COLORS.tax} strokeWidth={2} dot={{ r: 3 }} strokeDasharray="5 5" />
-              </ComposedChart>
-            </ResponsiveContainer>
-          </CardContent>
-        </Card>
-      )}
-
-      {((data.excludedIncomeCategories?.length ?? 0) > 0 ||
-        (data.excludedExpenseCategories?.length ?? 0) > 0) && (
-        <Card>
-          <CardHeader className="pb-2 pt-4 px-4">
-            <CardTitle className="text-sm font-medium text-muted-foreground flex items-center gap-2">
-              <Receipt className="w-4 h-4" />
-              Категории, помеченные как исключённые
-            </CardTitle>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <p className="text-xs text-muted-foreground mb-3">
-              Эти категории помечены как исключённые в настройках дерева, но их суммы включены в общий расчёт.
-            </p>
-            <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-              {(data.excludedIncomeCategories?.length ?? 0) > 0 && (
-                <div>
-                  <p className="text-xs font-medium text-muted-foreground mb-2">Доходы</p>
-                  <div className="space-y-1.5">
-                    {data.excludedIncomeCategories!.map((cat, i) => (
-                      <div key={i} className="flex items-center justify-between gap-2 text-sm">
-                        <span className="truncate text-foreground/70 line-through">{cat.name}</span>
-                        <span className="tabular-nums font-medium text-foreground/70 shrink-0">{formatCurrency(cat.total)}</span>
-                      </div>
-                    ))}
-                  </div>
-                </div>
-              )}
-              {(data.excludedExpenseCategories?.length ?? 0) > 0 && (
-                <div>
-                  <p className="text-xs font-medium text-muted-foreground mb-2">Расходы</p>
-                  <div className="space-y-1.5">
-                    {data.excludedExpenseCategories!.map((cat, i) => (
-                      <div key={i} className="flex items-center justify-between gap-2 text-sm">
-                        <span className="truncate text-foreground/70 line-through">{cat.name}</span>
-                        <span className="tabular-nums font-medium text-foreground/70 shrink-0">{formatCurrency(cat.total)}</span>
-                      </div>
-                    ))}
-                  </div>
-                </div>
-              )}
-            </div>
-          </CardContent>
-        </Card>
-      )}
-    </div>
-  );
-}
-
-export default function CalculationsPage() {
-  const [activeTab, setActiveTab] = useState<"vat" | "profit">(
-    () => (localStorage.getItem("omegaprom_calc_tab") as "vat" | "profit") || "vat"
-  );
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const [taxRate, setTaxRate] = useState<number>(
-    () => Number(localStorage.getItem("omegaprom_tax_rate") || "20")
-  );
-  const [ptIncCats, setPtIncCats] = useState<Set<string>>(() => {
-    try {
-      const saved = localStorage.getItem("omegaprom_pt_inc_cats");
-      return saved ? new Set(JSON.parse(saved)) : new Set<string>();
-    } catch { return new Set<string>(); }
-  });
-  const [ptExpCats, setPtExpCats] = useState<Set<string>>(() => {
-    try {
-      const saved = localStorage.getItem("omegaprom_pt_exp_cats");
-      return saved ? new Set(JSON.parse(saved)) : new Set<string>();
-    } catch { return new Set<string>(); }
-  });
-  const [chartHighlights, setChartHighlights] = useState<ChartHighlight[]>(() => {
-    try {
-      const saved = localStorage.getItem("omegaprom_pt_chart_highlights");
-      return saved ? JSON.parse(saved) : [];
-    } catch { return []; }
-  });
-
-  function switchTab(tab: "vat" | "profit") {
-    setActiveTab(tab);
-    localStorage.setItem("omegaprom_calc_tab", tab);
-  }
-
-  function changeTaxRate(v: number) {
-    setTaxRate(v);
-    localStorage.setItem("omegaprom_tax_rate", String(v));
-  }
-
-  function changePtIncCats(ids: Set<string>) {
-    setPtIncCats(ids);
-    localStorage.setItem("omegaprom_pt_inc_cats", JSON.stringify([...ids]));
-  }
-
-  function changePtExpCats(ids: Set<string>) {
-    setPtExpCats(ids);
-    localStorage.setItem("omegaprom_pt_exp_cats", JSON.stringify([...ids]));
-  }
-
-  function changeChartHighlights(highlights: ChartHighlight[]) {
-    setChartHighlights(highlights);
-    localStorage.setItem("omegaprom_pt_chart_highlights", JSON.stringify(highlights));
-  }
-
-  const vatQuery = useVat(dateFrom || undefined, dateTo || undefined);
-
-  const ptIncArr = useMemo(() => [...ptIncCats], [ptIncCats]);
-  const ptExpArr = useMemo(() => [...ptExpCats], [ptExpCats]);
-  const chartHighlightsKey = useMemo(() => chartHighlights.map(h => `${h.type}:${h.id}`).sort(), [chartHighlights]);
-
-  const profitTax = useProfitTax();
-
-  // Автопересчёт налога на прибыль при изменении периода, ставки или выбора категорий
-  const profitRequestKey = useMemo(() => JSON.stringify({
-    tab: activeTab,
-    dateFrom,
-    dateTo,
-    taxRate,
-    inc: ptIncArr,
-    exp: ptExpArr,
-    hl: chartHighlightsKey,
-  }), [activeTab, dateFrom, dateTo, taxRate, ptIncArr, ptExpArr, chartHighlightsKey]);
-
-  useEffect(() => {
-    if (activeTab !== "profit") return;
-    profitTax.mutate({
-      dateFrom: dateFrom || undefined,
-      dateTo: dateTo || undefined,
-      taxRate,
-      incomeCategories: ptIncArr,
-      expenseCategories: ptExpArr,
-      chartCategories: chartHighlights.map(h => ({ id: h.id, type: h.type, name: h.name }) satisfies ChartCategoryRef),
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [profitRequestKey]);
-
-  const resetDates = () => { setDateFrom(""); setDateTo(""); };
-  const hasDates = dateFrom || dateTo;
-
-  const isLoading = activeTab === "vat" ? vatQuery.isLoading : profitTax.isPending;
-  const isError = activeTab === "vat" ? vatQuery.isError : profitTax.isError;
-
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="calculations" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3">
-          <div>
-            <h1 className="text-xl font-bold">Расчёты</h1>
-            <p className="text-xs text-muted-foreground mt-0.5">НДС и налог на прибыль по данным финансовой БД</p>
-          </div>
-          <div className="flex items-center gap-1.5 bg-muted/50 rounded-md px-2 py-1">
-            <CalendarDays className="w-3.5 h-3.5 text-muted-foreground" />
-            <Input
-              type="date"
-              value={dateFrom}
-              onChange={e => setDateFrom(e.target.value)}
-              className="bg-transparent border-none h-7 w-[130px] text-sm px-1"
-            />
-            <span className="text-muted-foreground text-xs">—</span>
-            <Input
-              type="date"
-              value={dateTo}
-              onChange={e => setDateTo(e.target.value)}
-              className="bg-transparent border-none h-7 w-[130px] text-sm px-1"
-            />
-            {hasDates && (
-              <button onClick={resetDates} className="text-muted-foreground hover:text-foreground">
-                <X className="w-3.5 h-3.5" />
-              </button>
-            )}
-          </div>
-        </div>
-
-        <FinanceNav active="calculations" onChange={() => {}} />
-
-        <div className="flex gap-1 bg-muted/30 p-0.5 rounded-lg w-fit">
-          <Button
-            variant={activeTab === "vat" ? "default" : "ghost"}
-            size="sm"
-            className="gap-1.5 text-xs h-8"
-            onClick={() => switchTab("vat")}
-          >
-            <Receipt className="w-3.5 h-3.5" />
-            НДС
-          </Button>
-          <Button
-            variant={activeTab === "profit" ? "default" : "ghost"}
-            size="sm"
-            className="gap-1.5 text-xs h-8"
-            onClick={() => switchTab("profit")}
-          >
-            <Calculator className="w-3.5 h-3.5" />
-            Налог на прибыль
-          </Button>
-        </div>
-
-        {isError && <DatabaseError />}
-
-        {isLoading && (
-          <div className="space-y-4">
-            <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
-              {[1, 2, 3].map(i => <Skeleton key={i} className="h-28 rounded-xl" />)}
-            </div>
-            <Skeleton className="h-[350px] rounded-xl" />
-          </div>
-        )}
-
-        {activeTab === "vat" && vatQuery.data && !isLoading && <VatTab data={vatQuery.data} />}
-        {activeTab === "profit" && profitTax.data && !isLoading && (
-          <ProfitTab
-            data={profitTax.data}
-            taxRate={taxRate}
-            onTaxRateChange={changeTaxRate}
-            incCats={ptIncCats}
-            expCats={ptExpCats}
-            onIncCatsChange={changePtIncCats}
-            onExpCatsChange={changePtExpCats}
-            chartHighlights={chartHighlights}
-            onChartHighlightsChange={changeChartHighlights}
-          />
-        )}
-      </div>
-    </FinanceLayout>
-  );
-}
diff --git a/client/src/pages/finance/dashboard.tsx b/client/src/pages/finance/dashboard.tsx
deleted file mode 100644
index 0bac0ae..0000000
--- a/client/src/pages/finance/dashboard.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import { useState } from "react";
-import { useLocation, useSearch } from "wouter";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceNav, type FinanceTab } from "@/components/finance/FinanceNav";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { ConnectionStatus } from "@/components/finance/ConnectionStatus";
-import { DateRangeFilter, type DateRange as LocalDateRange } from "@/components/finance/DateRangeFilter";
-import { SummaryCards } from "@/components/finance/SummaryCards";
-import { DataTable } from "@/components/finance/DataTable";
-import { CategoryTree } from "@/components/finance/CategoryTree";
-import { CategoryManager } from "@/components/finance/CategoryManager";
-import { FinanceSettingsPanel } from "@/components/finance/FinanceSettings";
-import { Button } from "@/components/ui/button";
-import { Loader2, RefreshCw } from "lucide-react";
-import {
-  useIncome,
-  useExpenses,
-  useIncomeTreeSummary,
-  useExpenseTreeSummary,
-  useIncomeCategories,
-  useExpenseCategories,
-  useCreateIncomeCategory,
-  useUpdateIncomeCategory,
-  useDeleteIncomeCategory,
-  useCreateExpenseCategory,
-  useUpdateExpenseCategory,
-  useDeleteExpenseCategory,
-  useTableConfig,
-  useRefreshAll,
-} from "@/hooks/useFinance";
-
-function toISODate(d?: Date): string | undefined {
-  if (!d) return undefined;
-  return d.toISOString().split("T")[0];
-}
-
-function tabFromSearch(search: string): FinanceTab | null {
-  const tab = new URLSearchParams(search).get("tab");
-  const valid: FinanceTab[] = [
-    "dashboard",
-    "income",
-    "expenses",
-    "income-categories",
-    "expense-categories",
-    "settings",
-  ];
-  return valid.includes(tab as FinanceTab) ? (tab as FinanceTab) : null;
-}
-
-export default function FinanceDashboard() {
-  const [search] = useSearch();
-  const [, navigate] = useLocation();
-  const [activeTab, setActiveTabState] = useState<FinanceTab>(() => tabFromSearch(search) ?? "dashboard");
-
-  const setActiveTab = (tab: FinanceTab) => {
-    setActiveTabState(tab);
-    navigate(tab === "dashboard" ? "/finance" : `/finance?tab=${tab}`, { replace: true });
-  };
-  const [dateRange, setDateRange] = useState<LocalDateRange>({});
-  const [incomePage, setIncomePage] = useState(1);
-  const [expensePage, setExpensePage] = useState(1);
-  const [pageSize, setPageSize] = useState(50);
-  const [incomeSort, setIncomeSort] = useState({ by: "data", dir: "desc" as "asc" | "desc" });
-  const [expenseSort, setExpenseSort] = useState({ by: "data", dir: "desc" as "asc" | "desc" });
-  const [incomeFilters, setIncomeFilters] = useState<Record<string, string>>({});
-  const [expenseFilters, setExpenseFilters] = useState<Record<string, string>>({});
-
-  const dr = { from: toISODate(dateRange.from), to: toISODate(dateRange.to) };
-
-  const { data: incomeData, isLoading: incomeLoading } = useIncome(
-    incomePage, pageSize, incomeSort.by, incomeSort.dir, incomeFilters, dr
-  );
-  const { data: expenseData, isLoading: expenseLoading } = useExpenses(
-    expensePage, pageSize, expenseSort.by, expenseSort.dir, expenseFilters, dr
-  );
-  const { data: incomeTree, isLoading: incomeTreeLoading, dataUpdatedAt: incomeTreeUpdatedAt } = useIncomeTreeSummary(dr);
-  const { data: expenseTree, isLoading: expenseTreeLoading } = useExpenseTreeSummary(dr);
-  const { data: incomeCats } = useIncomeCategories();
-  const { data: expenseCats } = useExpenseCategories();
-  const { data: tableConfig } = useTableConfig();
-  const refreshAll = useRefreshAll();
-
-  const createIncCat = useCreateIncomeCategory();
-  const updateIncCat = useUpdateIncomeCategory();
-  const deleteIncCat = useDeleteIncomeCategory();
-  const createExpCat = useCreateExpenseCategory();
-  const updateExpCat = useUpdateExpenseCategory();
-  const deleteExpCat = useDeleteExpenseCategory();
-
-  const incomeTotal = incomeTree?.grandTotal?.total ?? 0;
-  const expenseTotal = expenseTree?.grandTotal?.total ?? 0;
-  const incomeCount = incomeTree?.grandTotal?.count ?? 0;
-  const expenseCount = expenseTree?.grandTotal?.count ?? 0;
-
-  const columnLabels = tableConfig?.config?.columnLabels ?? {};
-  const incomeSumCol = tableConfig?.config?.incomeSumColumn ?? "summa";
-  const expenseSumCol = tableConfig?.config?.expenseSumColumn ?? "summadokumenta";
-
-  const handleIncomeSort = (col: string) => {
-    setIncomeSort((s) => ({
-      by: col,
-      dir: s.by === col && s.dir === "desc" ? "asc" : "desc",
-    }));
-  };
-
-  const handleExpenseSort = (col: string) => {
-    setExpenseSort((s) => ({
-      by: col,
-      dir: s.by === col && s.dir === "desc" ? "asc" : "desc",
-    }));
-  };
-
-  const visibleIncomeCols = ["data", "summa", "zakazchik", "dogovorzakazchika", "statya", "kommentarii"];
-  const visibleExpenseCols = ["data", "summadokumenta", "kontragent", "dogovorkontragenta", "statya", "kommentarii"];
-
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active={activeTab} onChange={setActiveTab} />}
-    >
-      <div className="space-y-4">
-        {/* Header */}
-        <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3">
-          <div>
-            <h1 className="text-xl font-bold">Финансы</h1>
-            <div className="mt-1">
-              <ConnectionStatus />
-            </div>
-          </div>
-          <div className="flex items-center gap-2">
-            <DateRangeFilter value={dateRange} onChange={(r) => { setDateRange(r); setIncomePage(1); setExpensePage(1); }} />
-            <Button
-              size="sm"
-              variant="outline"
-              className="h-8 text-xs"
-              onClick={() => refreshAll.mutate()}
-              disabled={refreshAll.isPending}
-            >
-              {refreshAll.isPending ? <Loader2 className="w-3.5 h-3.5 animate-spin" /> : <RefreshCw className="w-3.5 h-3.5" />}
-            </Button>
-            {incomeTreeUpdatedAt && (
-              <span className="text-[10px] text-muted-foreground whitespace-nowrap">
-                Обновлено: {new Date(incomeTreeUpdatedAt).toLocaleTimeString()}
-              </span>
-            )}
-          </div>
-        </div>
-
-        <FinanceNav active={activeTab} onChange={setActiveTab} />
-
-        {/* Dashboard */}
-        {activeTab === "dashboard" && (
-          <div className="space-y-4">
-            <SummaryCards
-              incomeTotal={incomeTotal}
-              expenseTotal={expenseTotal}
-              incomeCount={incomeCount}
-              expenseCount={expenseCount}
-              loading={incomeTreeLoading || expenseTreeLoading}
-            />
-            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
-              <div>
-                <h3 className="text-sm font-semibold mb-2">Доходы по категориям</h3>
-                {incomeTreeLoading ? (
-                  <div className="text-xs text-muted-foreground py-4">Загрузка...</div>
-                ) : (
-                  <CategoryTree
-                    trees={incomeTree?.trees ?? []}
-                    uncategorized={incomeTree?.uncategorized}
-                    storageKey="omegaprom_finance_income_expanded"
-                    onSelect={(id) => {
-                      setActiveTab("income");
-                      // could filter by category here in future
-                    }}
-                  />
-                )}
-              </div>
-              <div>
-                <h3 className="text-sm font-semibold mb-2">Расходы по категориям</h3>
-                {expenseTreeLoading ? (
-                  <div className="text-xs text-muted-foreground py-4">Загрузка...</div>
-                ) : (
-                  <CategoryTree
-                    trees={expenseTree?.trees ?? []}
-                    uncategorized={expenseTree?.uncategorized}
-                    storageKey="omegaprom_finance_expense_expanded"
-                    onSelect={(id) => {
-                      setActiveTab("expenses");
-                    }}
-                  />
-                )}
-              </div>
-            </div>
-          </div>
-        )}
-
-        {/* Income */}
-        {activeTab === "income" && (
-          <div className="space-y-3">
-            <h3 className="text-sm font-semibold">Доходы</h3>
-            <DataTable
-              data={incomeData}
-              loading={incomeLoading}
-              columnLabels={columnLabels}
-              sumColumn={incomeSumCol}
-              visibleColumns={visibleIncomeCols}
-              sortBy={incomeSort.by}
-              sortDir={incomeSort.dir}
-              onSort={handleIncomeSort}
-              filters={incomeFilters}
-              onFilterChange={(col, val) => {
-                setIncomeFilters((f) => ({ ...f, [col]: val }));
-                setIncomePage(1);
-              }}
-              page={incomePage}
-              onPageChange={setIncomePage}
-              pageSize={pageSize}
-              onPageSizeChange={setPageSize}
-            />
-          </div>
-        )}
-
-        {/* Expenses */}
-        {activeTab === "expenses" && (
-          <div className="space-y-3">
-            <h3 className="text-sm font-semibold">Расходы</h3>
-            <DataTable
-              data={expenseData}
-              loading={expenseLoading}
-              columnLabels={columnLabels}
-              sumColumn={expenseSumCol}
-              visibleColumns={visibleExpenseCols}
-              sortBy={expenseSort.by}
-              sortDir={expenseSort.dir}
-              onSort={handleExpenseSort}
-              filters={expenseFilters}
-              onFilterChange={(col, val) => {
-                setExpenseFilters((f) => ({ ...f, [col]: val }));
-                setExpensePage(1);
-              }}
-              page={expensePage}
-              onPageChange={setExpensePage}
-              pageSize={pageSize}
-              onPageSizeChange={setPageSize}
-            />
-          </div>
-        )}
-
-        {/* Income Categories */}
-        {activeTab === "income-categories" && (
-          <CategoryManager
-            categories={incomeCats?.categories ?? []}
-            onCreate={(c) => createIncCat.mutate(c)}
-            onUpdate={(id, c) => updateIncCat.mutate({ id, ...c })}
-            onDelete={(id) => deleteIncCat.mutate(id)}
-            loading={!incomeCats}
-            typeLabel="Категории доходов"
-          />
-        )}
-
-        {/* Expense Categories */}
-        {activeTab === "expense-categories" && (
-          <CategoryManager
-            categories={expenseCats?.categories ?? []}
-            onCreate={(c) => createExpCat.mutate(c)}
-            onUpdate={(id, c) => updateExpCat.mutate({ id, ...c })}
-            onDelete={(id) => deleteExpCat.mutate(id)}
-            loading={!expenseCats}
-            typeLabel="Категории расходов"
-          />
-        )}
-
-        {/* Settings */}
-        {activeTab === "settings" && <FinanceSettingsPanel />}
-      </div>
-    </FinanceLayout>
-  );
-}
diff --git a/client/src/pages/finance/debt.tsx b/client/src/pages/finance/debt.tsx
deleted file mode 100644
index 314e116..0000000
--- a/client/src/pages/finance/debt.tsx
+++ /dev/null
@@ -1,654 +0,0 @@
-import { useState, useMemo, Fragment } from "react";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceNav } from "@/components/finance/FinanceNav";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { CopyableCell } from "@/components/finance/CopyableCell";
-import { DatabaseError } from "@/components/finance/DatabaseError";
-import { Card, CardContent } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { Checkbox } from "@/components/ui/checkbox";
-import {
-  ChevronLeft,
-  ChevronRight,
-  ChevronDown,
-  ChevronUp,
-  RotateCcw,
-  Clock,
-  Search,
-  Filter,
-} from "lucide-react";
-import { formatCurrency, formatNumber } from "@/lib/format";
-import {
-  useDebtAnalytics,
-  useDebtFilters,
-  useDebtDynamics,
-  useDebtKontragenty,
-  type DebtAnalytics,
-} from "@/hooks/useFinance";
-import {
-  BarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-  Legend,
-  LineChart,
-  Line,
-  Cell,
-} from "recharts";
-
-const OVERDUE_COLORS: Record<string, string> = {
-  cls0: "#22c55e",
-  cls1_30: "#3b82f6",
-  cls31_60: "#eab308",
-  cls61_90: "#f97316",
-  cls91_365: "#ef4444",
-  cls365plus: "#991b1b",
-};
-
-const OVERDUE_LABELS: Record<string, string> = {
-  cls0: "Не просрочено",
-  cls1_30: "1-30",
-  cls31_60: "31-60",
-  cls61_90: "61-90",
-  cls91_365: "91-365",
-  cls365plus: "> 365",
-};
-
-const CLS_KEYS = ["cls0", "cls1_30", "cls31_60", "cls61_90", "cls91_365", "cls365plus"] as const;
-
-function formatCompact(value: number): string {
-  if (Math.abs(value) >= 1_000_000) return `${(value / 1_000_000).toFixed(1)}M`;
-  if (Math.abs(value) >= 1_000) return `${(value / 1_000).toFixed(0)}K`;
-  return value.toFixed(0);
-}
-
-function formatThousands(value: number): string {
-  return new Intl.NumberFormat("ru-RU", { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value / 1000);
-}
-
-function formatDateTime(iso: string): string {
-  const d = new Date(iso);
-  if (isNaN(d.getTime())) return iso;
-  return d.toLocaleString("ru-RU", {
-    day: "2-digit", month: "2-digit", year: "numeric",
-    hour: "2-digit", minute: "2-digit",
-  });
-}
-
-function MultiSelect({ label, options, selected, onChange }: {
-  label: string;
-  options: string[];
-  selected: string[];
-  onChange: (v: string[]) => void;
-}) {
-  const displayText = selected.length === 0
-    ? "Не выбрано"
-    : selected.length <= 2
-      ? selected.join(", ")
-      : `${selected.length} выбрано`;
-
-  return (
-    <Popover>
-      <PopoverTrigger asChild>
-        <Button
-          variant="outline"
-          size="sm"
-          className="h-9 justify-between gap-1.5 min-w-[160px] max-w-[220px] text-xs font-normal"
-        >
-          <span className="truncate">{displayText}</span>
-          <Filter className="w-3 h-3 shrink-0 text-muted-foreground" />
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className="w-64 p-2 max-h-[300px] overflow-y-auto" align="start">
-        <div className="text-xs font-medium text-muted-foreground mb-2">{label}</div>
-        {options.map((opt) => (
-          <label key={opt} className="flex items-center gap-2 py-1 px-1 hover:bg-muted/50 rounded cursor-pointer text-xs">
-            <Checkbox
-              checked={selected.includes(opt)}
-              onCheckedChange={(checked) => {
-                if (checked) onChange([...selected, opt]);
-                else onChange(selected.filter(s => s !== opt));
-              }}
-            />
-            <span className="truncate">{opt}</span>
-          </label>
-        ))}
-        {selected.length > 0 && (
-          <Button variant="ghost" size="sm" className="w-full mt-1 text-xs" onClick={() => onChange([])}>
-            Сбросить
-          </Button>
-        )}
-      </PopoverContent>
-    </Popover>
-  );
-}
-
-function HorizontalStackedChart({ title, data, height }: { title: string; data: any[]; height: number }) {
-  if (!data || data.length === 0) return null;
-
-  return (
-    <Card>
-      <CardContent className="p-4">
-        <h3 className="text-sm font-medium text-foreground mb-3">{title}</h3>
-        <div style={{ height }}>
-          <ResponsiveContainer width="100%" height="100%">
-            <BarChart data={data} layout="vertical" margin={{ left: 10, right: 10 }}>
-              <CartesianGrid strokeDasharray="3 3" className="opacity-30" horizontal={false} />
-              <XAxis type="number" tickFormatter={formatCompact} tick={{ fontSize: 10 }} />
-              <YAxis type="category" dataKey="name" tick={{ fontSize: 10 }} width={140} />
-              <Tooltip
-                formatter={(value: number, name: string) => [formatCurrency(value), OVERDUE_LABELS[name] || name]}
-                labelFormatter={(label: string) => label}
-              />
-              <Legend formatter={(value: string) => OVERDUE_LABELS[value] || value} wrapperStyle={{ fontSize: 10 }} />
-              {CLS_KEYS.map(key => (
-                <Bar key={key} dataKey={key} stackId="a" fill={OVERDUE_COLORS[key]} />
-              ))}
-            </BarChart>
-          </ResponsiveContainer>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-function SimpleBarChart({ title, data, height }: { title: string; data: { cls: string; total: number }[]; height: number }) {
-  if (!data || data.length === 0) return null;
-
-  const clsColorMap: Record<string, string> = {
-    "Не просрочено": "#22c55e",
-    "1-30": "#3b82f6",
-    "31-60": "#eab308",
-    "61-90": "#f97316",
-    "91-365": "#ef4444",
-    "> 365": "#991b1b",
-  };
-
-  const chartData = data.map(d => ({
-    ...d,
-    fill: clsColorMap[d.cls] || "#94a3b8",
-  }));
-
-  return (
-    <Card>
-      <CardContent className="p-4">
-        <h3 className="text-sm font-medium text-foreground mb-3">{title}</h3>
-        <div style={{ height }}>
-          <ResponsiveContainer width="100%" height="100%">
-            <BarChart data={chartData} layout="vertical" margin={{ left: 10, right: 10 }}>
-              <CartesianGrid strokeDasharray="3 3" className="opacity-30" horizontal={false} />
-              <XAxis type="number" tickFormatter={formatCompact} tick={{ fontSize: 10 }} />
-              <YAxis type="category" dataKey="cls" tick={{ fontSize: 10 }} width={100} />
-              <Tooltip formatter={(value: number) => [formatCurrency(value), "Сумма"]} />
-              <Bar dataKey="total" radius={[0, 2, 2, 0]}>
-                {chartData.map((entry, i) => (
-                  <Cell key={i} fill={entry.fill} />
-                ))}
-              </Bar>
-            </BarChart>
-          </ResponsiveContainer>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-function DebtTableSection({ analytics, page, setPage }: { analytics: DebtAnalytics; page: number; setPage: (p: number) => void }) {
-  const [expandedRow, setExpandedRow] = useState<string | null>(null);
-  const { table } = analytics;
-
-  return (
-    <Card>
-      <CardContent className="p-0">
-        <div className="px-4 py-3 border-b border-border">
-          <h3 className="text-sm font-medium text-foreground">Таблица расшифровки ДЗ, млн. ₽</h3>
-        </div>
-        <div className="overflow-x-auto">
-          <table className="w-full text-sm">
-            <thead>
-              <tr className="border-b border-border bg-muted/40">
-                <th className="w-8 px-2"></th>
-                <th className="text-left px-4 py-3 text-xs font-medium text-muted-foreground">Контрагент</th>
-                <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">ОДЗ, ₽</th>
-                <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">ПДЗ, ₽</th>
-              </tr>
-            </thead>
-            <tbody>
-              {table.rows.map((group) => {
-                const isExpanded = expandedRow === group.kontragent;
-                return (
-                  <Fragment key={group.kontragent}>
-                    <tr
-                      className="border-b border-border cursor-pointer hover:bg-muted/30 transition-colors"
-                      onClick={() => setExpandedRow(isExpanded ? null : group.kontragent)}
-                    >
-                      <td className="px-2 text-center">
-                        {isExpanded ? <ChevronUp className="w-4 h-4 text-muted-foreground inline" /> : <ChevronDown className="w-4 h-4 text-muted-foreground inline" />}
-                      </td>
-                      <td className="px-4 py-3 font-medium max-w-[250px]"><CopyableCell text={group.kontragent} className="max-w-[250px] font-medium" /></td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap font-semibold">{formatCurrency(group.totalDebt)}</td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap text-red-500 font-medium">{formatCurrency(group.totalOverdue)}</td>
-                    </tr>
-                    {isExpanded && (
-                      <tr>
-                        <td colSpan={4} className="p-0">
-                          <div className="bg-muted/20">
-                            <table className="w-full text-sm">
-                              <thead>
-                                <tr className="border-b border-border">
-                                  <th className="text-left px-8 py-2 text-xs font-medium text-muted-foreground">Договор</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">Сумма Договора</th>
-                                  <th className="text-left px-3 py-2 text-xs font-medium text-muted-foreground">Документ</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">Оплачено</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">ОДЗ, ₽</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">ПДЗ, ₽</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">Отсрочка по договору</th>
-                                  <th className="text-right px-3 py-2 text-xs font-medium text-muted-foreground whitespace-nowrap">Дней просрочки</th>
-                                </tr>
-                              </thead>
-                              <tbody>
-                                {group.rows.map((row, j) => (
-                                  <tr key={j} className="border-b border-border last:border-0">
-                                    <td className="px-8 py-2 text-muted-foreground text-xs max-w-[200px]"><CopyableCell text={row.dogovor || "—"} className="max-w-[200px]" /></td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs">{formatCurrency(row.summadokumenta)}</td>
-                                    <td className="px-3 py-2 text-muted-foreground text-xs max-w-[200px]"><CopyableCell text={row.dokumentraschetov || "—"} className="max-w-[200px]" /></td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs">{formatCurrency(row.summaoplacheno)}</td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs font-medium">{formatCurrency(row.summadolga)}</td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs text-red-500">{formatCurrency(row.summaprosrocheno)}</td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs text-muted-foreground">{row.otsrochkapodogovoru}</td>
-                                    <td className="px-3 py-2 text-right whitespace-nowrap text-xs text-muted-foreground">{Math.round(row.dneiprosrocheno)}</td>
-                                  </tr>
-                                ))}
-                              </tbody>
-                            </table>
-                          </div>
-                        </td>
-                      </tr>
-                    )}
-                  </Fragment>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
-
-        {table.totalPages > 1 && (
-          <div className="flex items-center justify-between px-4 py-3 border-t border-border">
-            <span className="text-xs text-muted-foreground">
-              Стр. {table.page} из {table.totalPages} ({table.total} контрагентов)
-            </span>
-            <div className="flex items-center gap-2">
-              <Button variant="outline" size="sm" disabled={page <= 1} onClick={() => setPage(page - 1)}>
-                <ChevronLeft className="w-4 h-4" />
-              </Button>
-              <Button variant="outline" size="sm" disabled={page >= table.totalPages} onClick={() => setPage(page + 1)}>
-                <ChevronRight className="w-4 h-4" />
-              </Button>
-            </div>
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
-
-function DZTab() {
-  const [period, setPeriod] = useState("");
-  const [selectedKlasspy, setSelectedKlasspy] = useState<string[]>([]);
-  const [selectedKontragent, setSelectedKontragent] = useState<string[]>([]);
-  const [dogovorSearch, setDogovorSearch] = useState("");
-  const [selectedManager, setSelectedManager] = useState<string[]>([]);
-  const [page, setPage] = useState(1);
-
-  const analyticsParams = useMemo(() => ({
-    period: period || undefined,
-    klassprosrochki: selectedKlasspy,
-    kontragent: selectedKontragent,
-    dogovor: dogovorSearch || undefined,
-    otvetstvennii: selectedManager,
-    page,
-    pageSize: 20,
-  }), [period, selectedKlasspy, selectedKontragent, dogovorSearch, selectedManager, page]);
-
-  const { data: analytics, isLoading, isError } = useDebtAnalytics(analyticsParams);
-  const { data: filters } = useDebtFilters();
-
-  const hasFilters = period || selectedKlasspy.length > 0 || selectedKontragent.length > 0 || dogovorSearch || selectedManager.length > 0;
-
-  function resetFilters() {
-    setPeriod("");
-    setSelectedKlasspy([]);
-    setSelectedKontragent([]);
-    setDogovorSearch("");
-    setSelectedManager([]);
-    setPage(1);
-  }
-
-  const chartHeight = useMemo(() => {
-    if (!analytics) return 250;
-    const maxItems = Math.max(analytics.byKontragent.length, analytics.byManager.length, analytics.byOverdueClass.length);
-    return Math.max(200, maxItems * 35 + 60);
-  }, [analytics]);
-
-  return (
-    <div className="space-y-5">
-      {isError && <DatabaseError />}
-      <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
-        {isLoading ? (
-          <>
-            {[1, 2, 3].map(i => (
-              <Card key={i}><CardContent className="p-4"><Skeleton className="h-4 w-32 mb-2" /><Skeleton className="h-7 w-24" /></CardContent></Card>
-            ))}
-          </>
-        ) : analytics?.summary && (
-          <>
-            <Card>
-              <CardContent className="p-4">
-                <div className="flex items-center gap-2 text-xs text-muted-foreground mb-1">
-                  <Clock className="w-3.5 h-3.5" />
-                  Дата и время обновления
-                </div>
-                <div className="text-lg font-bold text-primary">
-                  {analytics.summary.updatedAt ? formatDateTime(analytics.summary.updatedAt) : "—"}
-                </div>
-              </CardContent>
-            </Card>
-            <Card>
-              <CardContent className="p-4">
-                <p className="text-xs text-muted-foreground mb-1">Общая сумма ДЗ, тыс. ₽</p>
-                <p className="text-lg font-bold text-foreground">
-                  {formatThousands(analytics.summary.totalDebt)}
-                </p>
-              </CardContent>
-            </Card>
-            <Card>
-              <CardContent className="p-4">
-                <p className="text-xs text-muted-foreground mb-1">Общая сумма ПДЗ, тыс. ₽</p>
-                <p className="text-lg font-bold text-red-500">
-                  {formatThousands(analytics.summary.totalOverdue)}
-                </p>
-              </CardContent>
-            </Card>
-          </>
-        )}
-      </div>
-
-      <Card>
-        <CardContent className="p-4">
-          <div className="flex flex-wrap items-end gap-3">
-            <div className="space-y-1.5">
-              <Label className="text-xs">Период</Label>
-              <Input
-                type="date"
-                value={period}
-                onChange={e => { setPeriod(e.target.value); setPage(1); }}
-                className="h-9 text-xs w-[150px]"
-              />
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Класс просрочки</Label>
-              <MultiSelect
-                label="Класс просрочки"
-                options={filters?.filters?.klassprosrochki || []}
-                selected={selectedKlasspy}
-                onChange={v => { setSelectedKlasspy(v); setPage(1); }}
-              />
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Контрагент</Label>
-              <MultiSelect
-                label="Контрагент"
-                options={filters?.filters?.kontragenty || []}
-                selected={selectedKontragent}
-                onChange={v => { setSelectedKontragent(v); setPage(1); }}
-              />
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Договор</Label>
-              <div className="relative">
-                <Search className="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
-                <Input
-                  value={dogovorSearch}
-                  onChange={e => { setDogovorSearch(e.target.value); setPage(1); }}
-                  placeholder="Поиск..."
-                  className="h-9 text-xs pl-8 w-[150px]"
-                />
-              </div>
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Менеджер</Label>
-              <MultiSelect
-                label="Менеджер"
-                options={filters?.filters?.otvetstvennii || []}
-                selected={selectedManager}
-                onChange={v => { setSelectedManager(v); setPage(1); }}
-              />
-            </div>
-            {hasFilters && (
-              <Button variant="outline" size="sm" onClick={resetFilters} className="h-9">
-                <RotateCcw className="w-3.5 h-3.5 mr-1" />
-                Сбросить
-              </Button>
-            )}
-          </div>
-        </CardContent>
-      </Card>
-
-      {isLoading ? (
-        <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
-          {[1, 2, 3].map(i => (
-            <Card key={i}><CardContent className="p-4"><Skeleton className="h-[250px] w-full" /></CardContent></Card>
-          ))}
-        </div>
-      ) : analytics && (
-        <>
-          <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
-            <HorizontalStackedChart title="ДЗ по Контрагентам, млн. ₽" data={analytics.byKontragent} height={chartHeight} />
-            <HorizontalStackedChart title="ДЗ по Менеджерам, млн. ₽" data={analytics.byManager} height={chartHeight} />
-            <SimpleBarChart title="ДЗ по сроку просрочки, млн. ₽" data={analytics.byOverdueClass} height={chartHeight} />
-          </div>
-
-          <DebtTableSection analytics={analytics} page={page} setPage={setPage} />
-        </>
-      )}
-    </div>
-  );
-}
-
-function DynamicsTab() {
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const [kontragent, setKontragent] = useState("");
-
-  const { data: filters } = useDebtFilters();
-  const { data: dynamicsData, isLoading: dynamicsLoading } = useDebtDynamics(dateFrom || undefined, dateTo || undefined, kontragent || undefined);
-  const { data: kontragentData } = useDebtKontragenty(undefined, dateTo || undefined);
-
-  const chartData = useMemo(() => {
-    if (!dynamicsData?.rows) return [];
-    return dynamicsData.rows.map(d => ({
-      period: new Date(d.period).toLocaleDateString("ru-RU", { day: "2-digit", month: "short", year: "2-digit" }),
-      dz: d.totalDebt,
-      pdz: d.totalOverdue,
-    }));
-  }, [dynamicsData]);
-
-  const latestValues = useMemo(() => {
-    if (!dynamicsData?.rows || dynamicsData.rows.length === 0) return { dz: 0, pdz: 0 };
-    const last = dynamicsData.rows[dynamicsData.rows.length - 1];
-    return { dz: last.totalDebt, pdz: last.totalOverdue };
-  }, [dynamicsData]);
-
-  return (
-    <div className="space-y-5">
-      <Card>
-        <CardContent className="p-4">
-          <div className="flex flex-wrap items-end gap-3">
-            <div className="space-y-1.5">
-              <Label className="text-xs">Период (Динамика)</Label>
-              <div className="flex items-center gap-2">
-                <Input
-                  type="date"
-                  value={dateFrom}
-                  onChange={e => setDateFrom(e.target.value)}
-                  className="h-9 text-xs w-[150px]"
-                />
-                <span className="text-xs text-muted-foreground">—</span>
-                <Input
-                  type="date"
-                  value={dateTo}
-                  onChange={e => setDateTo(e.target.value)}
-                  className="h-9 text-xs w-[150px]"
-                />
-              </div>
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Контрагент</Label>
-              <Popover>
-                <PopoverTrigger asChild>
-                  <Button variant="outline" size="sm" className="h-9 min-w-[200px] justify-between text-xs font-normal">
-                    <span className="truncate">{kontragent || "Не выбрано"}</span>
-                    <Filter className="w-3 h-3 shrink-0 text-muted-foreground" />
-                  </Button>
-                </PopoverTrigger>
-                <PopoverContent className="w-72 p-2 max-h-[300px] overflow-y-auto" align="start">
-                  <div
-                    className="py-1 px-2 hover:bg-muted/50 rounded cursor-pointer text-xs text-muted-foreground"
-                    onClick={() => setKontragent("")}
-                  >
-                    Все контрагенты
-                  </div>
-                  {(filters?.filters?.kontragenty || []).map((k) => (
-                    <div
-                      key={k}
-                      className={`py-1 px-2 hover:bg-muted/50 rounded cursor-pointer text-xs ${kontragent === k ? "bg-primary/10 text-primary font-medium" : ""}`}
-                      onClick={() => setKontragent(k)}
-                    >
-                      {k}
-                    </div>
-                  ))}
-                </PopoverContent>
-              </Popover>
-            </div>
-          </div>
-        </CardContent>
-      </Card>
-
-      <Card>
-        <CardContent className="p-4">
-          <div className="flex items-center justify-between mb-3 flex-wrap gap-2">
-            <h3 className="text-sm font-medium text-foreground">Динамика ДЗ и ПДЗ, млн. ₽</h3>
-            <div className="flex items-center gap-4 text-xs">
-              <div className="flex items-center gap-1.5">
-                <div className="w-3 h-0.5 bg-blue-500 rounded"></div>
-                <span>ДЗ</span>
-                <span className="font-bold text-blue-500">{formatCurrency(latestValues.dz)}</span>
-              </div>
-              <div className="flex items-center gap-1.5">
-                <div className="w-3 h-0.5 bg-red-400 rounded"></div>
-                <span>ПДЗ</span>
-                <span className="font-bold text-red-400">{formatCurrency(latestValues.pdz)}</span>
-              </div>
-            </div>
-          </div>
-          {dynamicsLoading ? (
-            <Skeleton className="h-[350px] w-full" />
-          ) : (
-            <div className="h-[350px]">
-              <ResponsiveContainer width="100%" height="100%">
-                <LineChart data={chartData}>
-                  <CartesianGrid strokeDasharray="3 3" className="opacity-30" />
-                  <XAxis dataKey="period" tick={{ fontSize: 10 }} interval="preserveStartEnd" />
-                  <YAxis tickFormatter={formatCompact} tick={{ fontSize: 10 }} />
-                  <Tooltip
-                    formatter={(value: number, name: string) => [
-                      formatCurrency(value),
-                      name === "dz" ? "ДЗ" : "ПДЗ"
-                    ]}
-                    labelFormatter={(label: string) => label}
-                  />
-                  <Legend formatter={(value: string) => value === "dz" ? "ДЗ" : "ПДЗ"} />
-                  <Line type="monotone" dataKey="dz" stroke="#3b82f6" strokeWidth={2} dot={false} />
-                  <Line type="monotone" dataKey="pdz" stroke="#f87171" strokeWidth={2} dot={false} />
-                </LineChart>
-              </ResponsiveContainer>
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      {kontragentData?.rows && kontragentData.rows.length > 0 && (
-        <Card>
-          <CardContent className="p-0">
-            <div className="overflow-x-auto">
-              <table className="w-full text-sm">
-                <thead>
-                  <tr className="border-b border-border bg-muted/40">
-                    <th className="text-left px-4 py-3 text-xs font-medium text-muted-foreground">Контрагент</th>
-                    <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">Сумма Договора</th>
-                    <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">Оплачено</th>
-                    <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">ОДЗ Руб.</th>
-                    <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">ПДЗ Руб.</th>
-                    <th className="text-right px-4 py-3 text-xs font-medium text-muted-foreground whitespace-nowrap">Дней просрочки</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {kontragentData.rows.map((row, i) => (
-                    <tr key={i} className="border-b border-border last:border-0 hover:bg-muted/30">
-                      <td className="px-4 py-3 max-w-[250px] font-medium"><CopyableCell text={row.kontragent} className="max-w-[250px] font-medium" /></td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap">{formatCurrency(row.summadokumenta)}</td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap text-muted-foreground">{formatCurrency(row.summaoplacheno)}</td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap font-medium">{formatCurrency(row.summadolga)}</td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap text-red-500">{formatCurrency(row.summaprosrocheno)}</td>
-                      <td className="px-4 py-3 text-right whitespace-nowrap text-muted-foreground">{formatNumber(Math.round(row.dneiprosrocheno))}</td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-          </CardContent>
-        </Card>
-      )}
-    </div>
-  );
-}
-
-export default function DebtPage() {
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="debt" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        <div>
-          <h1 className="text-xl font-bold">Дебиторская задолженность</h1>
-          <p className="text-muted-foreground text-sm mt-0.5">Анализ дебиторской задолженности по контрагентам, менеджерам и срокам просрочки</p>
-        </div>
-
-        <FinanceNav active="debt" onChange={() => {}} />
-
-        <Tabs defaultValue="dz">
-          <TabsList>
-            <TabsTrigger value="dz">ДЗ</TabsTrigger>
-            <TabsTrigger value="dynamics">Динамика</TabsTrigger>
-          </TabsList>
-
-          <TabsContent value="dz" className="mt-4">
-            <DZTab />
-          </TabsContent>
-
-          <TabsContent value="dynamics" className="mt-4">
-            <DynamicsTab />
-          </TabsContent>
-        </Tabs>
-      </div>
-    </FinanceLayout>
-  );
-}
diff --git a/client/src/pages/finance/expense-categories.tsx b/client/src/pages/finance/expense-categories.tsx
deleted file mode 100644
index b132ade..0000000
--- a/client/src/pages/finance/expense-categories.tsx
+++ /dev/null
@@ -1,322 +0,0 @@
-import { useState } from "react";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from "@/components/ui/dialog";
-import {
-  Plus, Trash2, Pencil, Folder, ChevronRight, ChevronDown,
-  EyeOff, Wand2, ArrowUpDown, Tag, X,
-} from "lucide-react";
-import { Badge } from "@/components/ui/badge";
-import { cn } from "@/lib/utils";
-import {
-  useExpenseCategories,
-  useCreateExpenseCategory,
-  useUpdateExpenseCategory,
-  useDeleteExpenseCategory,
-  useTags,
-  useCreateTag,
-  useDeleteTag,
-} from "@/hooks/useFinance";
-import type { Category, CategoryRule } from "@/hooks/useFinance";
-
-const RULE_OPS = [
-  { value: "equals", label: "равно (=)" },
-  { value: "not_equals", label: "не равно (≠)" },
-  { value: "contains", label: "содержит (∋)" },
-  { value: "greater_than", label: "больше (>" },
-  { value: "less_than", label: "меньше (<)" },
-  { value: "equal_number", label: "равно числу" },
-];
-
-const TAG_COLORS = [
-  "#2563eb", "#e11d48", "#16a34a", "#f59e0b",
-  "#8b5cf6", "#06b6d4", "#ea580c", "#84cc16",
-];
-
-export default function ExpenseCategoriesPage() {
-  const { data, isLoading } = useExpenseCategories();
-  const createCat = useCreateExpenseCategory();
-  const updateCat = useUpdateExpenseCategory();
-  const deleteCat = useDeleteExpenseCategory();
-
-  const [dialogOpen, setDialogOpen] = useState(false);
-  const [editing, setEditing] = useState<Category | null>(null);
-  const [parentId, setParentId] = useState<string | null>(null);
-
-  const [name, setName] = useState("");
-  const [rules, setRules] = useState<CategoryRule[]>([]);
-  const [ruleLogic, setRuleLogic] = useState<"and" | "or">("and");
-  const [excluded, setExcluded] = useState(false);
-
-  const openCreate = (parent?: string) => {
-    setEditing(null);
-    setParentId(parent ?? null);
-    setName("");
-    setRules([]);
-    setRuleLogic("and");
-    setExcluded(false);
-    setDialogOpen(true);
-  };
-
-  const openEdit = (cat: Category) => {
-    setEditing(cat);
-    setParentId(null);
-    setName(cat.name);
-    setRules(cat.rules ? [...cat.rules] : []);
-    setRuleLogic(cat.ruleLogic ?? "and");
-    setExcluded(cat.excluded ?? false);
-    setDialogOpen(true);
-  };
-
-  const handleSave = () => {
-    if (!name.trim()) return;
-    const body = { name: name.trim(), rules, ruleLogic, excluded, children: [] };
-    if (editing) {
-      updateCat.mutate({ id: editing.id, ...body });
-    } else {
-      createCat.mutate({ ...body, parentId: parentId ?? undefined } as any);
-    }
-    setDialogOpen(false);
-  };
-
-  return (
-    <FinanceLayout
-      showBack
-      mobileNav={<FinanceBottomNav active="expense-categories" onChange={() => {}} />}
-    >
-      <div className="space-y-6">
-        {/* Categories Tree */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <h2 className="text-lg font-semibold">Категории расходов</h2>
-            <Button size="sm" className="h-7 text-xs" onClick={() => openCreate()}>
-              <Plus className="w-3.5 h-3.5 mr-1" /> Добавить
-            </Button>
-          </div>
-
-          {isLoading ? (
-            <div className="text-sm text-muted-foreground py-4">Загрузка...</div>
-          ) : (data?.categories ?? []).length === 0 ? (
-            <div className="text-sm text-muted-foreground py-4">Нет категорий</div>
-          ) : (
-            <div className="rounded border bg-card p-2 space-y-0.5">
-              {data!.categories.map((cat) => (
-                <CategoryNode
-                  key={cat.id}
-                  node={cat}
-                  depth={0}
-                  onEdit={openEdit}
-                  onDelete={(id) => deleteCat.mutate(id)}
-                  onAddChild={openCreate}
-                />
-              ))}
-            </div>
-          )}
-        </div>
-
-        {/* Tags */}
-        <TagsSection />
-
-        {/* Edit Dialog */}
-        <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-          <DialogContent className="sm:max-w-lg max-h-[80vh] flex flex-col">
-            <DialogHeader>
-              <DialogTitle className="text-sm">
-                {editing ? "Редактировать категорию" : "Новая категория"}
-              </DialogTitle>
-            </DialogHeader>
-            <div className="space-y-4 py-2 flex-1 overflow-y-auto">
-              <div>
-                <Label className="text-xs">Название</Label>
-                <Input value={name} onChange={(e) => setName(e.target.value)} placeholder="Название категории" className="h-8 text-xs mt-1" autoFocus />
-              </div>
-
-              {/* Rules */}
-              <div className="space-y-2">
-                <div className="text-xs font-medium">Правила</div>
-                {rules.map((rule, idx) => (
-                  <div key={idx} className="flex items-center gap-2">
-                    <Input value={rule.column} onChange={(e) => {
-                      const next = [...rules];
-                      next[idx] = { ...next[idx], column: e.target.value };
-                      setRules(next);
-                    }} placeholder="Столбец" className="h-7 text-xs flex-1" />
-                    <select
-                      value={rule.operator}
-                      onChange={(e) => {
-                        const next = [...rules];
-                        next[idx] = { ...next[idx], operator: e.target.value as any };
-                        setRules(next);
-                      }}
-                      className="h-7 text-xs rounded border bg-background px-1"
-                    >
-                      {RULE_OPS.map((o) => <option key={o.value} value={o.value}>{o.label}</option>)}
-                    </select>
-                    <Input value={rule.value} onChange={(e) => {
-                      const next = [...rules];
-                      next[idx] = { ...next[idx], value: e.target.value };
-                      setRules(next);
-                    }} placeholder="Значение" className="h-7 text-xs flex-1" />
-                    <Button variant="ghost" size="icon" className="h-7 w-7" onClick={() => setRules((r) => r.filter((_, i) => i !== idx))}>
-                      <Trash2 className="w-3 h-3 text-destructive" />
-                    </Button>
-                  </div>
-                ))}
-                <Button variant="outline" size="sm" className="h-7 text-xs" onClick={() => setRules((r) => [...r, { column: "", operator: "equals", value: "" }])}>
-                  <Plus className="w-3 h-3 mr-1" /> Добавить правило
-                </Button>
-              </div>
-
-              {/* Logic & Excluded */}
-              <div className="flex items-center gap-4">
-                <div className="flex items-center gap-2">
-                  <Switch checked={ruleLogic === "or"} onCheckedChange={(c) => setRuleLogic(c ? "or" : "and")} />
-                  <Label className="text-xs">Логика OR (иначе AND)</Label>
-                </div>
-                <div className="flex items-center gap-2">
-                  <Switch checked={excluded} onCheckedChange={setExcluded} />
-                  <Label className="text-xs">Исключить</Label>
-                </div>
-              </div>
-            </div>
-            <DialogFooter>
-              <Button variant="outline" size="sm" className="h-7 text-xs" onClick={() => setDialogOpen(false)}>Отмена</Button>
-              <Button size="sm" className="h-7 text-xs" onClick={handleSave}>Сохранить</Button>
-            </DialogFooter>
-          </DialogContent>
-        </Dialog>
-      </div>
-    </FinanceLayout>
-  );
-}
-
-function CategoryNode({
-  node,
-  depth,
-  onEdit,
-  onDelete,
-  onAddChild,
-}: {
-  node: Category;
-  depth: number;
-  onEdit: (cat: Category) => void;
-  onDelete: (id: string) => void;
-  onAddChild: (parentId: string) => void;
-}) {
-  const [expanded, setExpanded] = useState(true);
-  const hasChildren = node.children && node.children.length > 0;
-
-  return (
-    <div className={cn(depth > 0 && "ml-4 border-l border-border pl-2")}>
-      <div className="flex items-center gap-1 py-1 group">
-        <button className="w-4 h-4 flex items-center justify-center shrink-0" onClick={() => setExpanded((e) => !e)}>
-          {hasChildren ? (
-            expanded ? <ChevronDown className="w-3 h-3 text-muted-foreground" /> : <ChevronRight className="w-3 h-3 text-muted-foreground" />
-          ) : (
-            <span className="w-3" />
-          )}
-        </button>
-        <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-        <span className={cn("text-xs flex-1 truncate", node.excluded && "text-muted-foreground line-through")}>
-          {node.name}
-        </span>
-        {node.excluded && (
-          <Badge variant="outline" className="text-[10px] border-destructive/40 text-destructive/70 shrink-0">Искл.</Badge>
-        )}
-        {node.autoDetected && (
-          <Badge variant="outline" className="text-[10px] shrink-0">авто</Badge>
-        )}
-        <div className="flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity">
-          <button onClick={() => onEdit(node)} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-foreground" title="Редактировать">
-            <Pencil className="w-3 h-3" />
-          </button>
-          <button onClick={() => onAddChild(node.id)} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-foreground" title="Добавить дочернюю">
-            <Plus className="w-3 h-3" />
-          </button>
-          <button onClick={() => { if (window.confirm(`Удалить "${node.name}"?`)) onDelete(node.id); }} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-destructive" title="Удалить">
-            <Trash2 className="w-3 h-3" />
-          </button>
-        </div>
-      </div>
-      {hasChildren && expanded && (
-        <div>
-          {node.children!.map((child) => (
-            <CategoryNode key={child.id} node={child} depth={depth + 1} onEdit={onEdit} onDelete={onDelete} onAddChild={onAddChild} />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-function TagsSection() {
-  const { data: tagsData } = useTags();
-  const createTag = useCreateTag();
-  const deleteTag = useDeleteTag();
-  const [tagName, setTagName] = useState("");
-  const [tagColor, setTagColor] = useState(TAG_COLORS[0]);
-
-  const tags = tagsData?.tags ?? [];
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm font-semibold">Теги</CardTitle>
-      </CardHeader>
-      <CardContent className="space-y-3">
-        <div className="flex flex-wrap gap-2">
-          {tags.map((tag) => (
-            <span key={tag.id} className="inline-flex items-center gap-1.5 px-2 py-1 rounded-full border text-xs">
-              <span className="w-2.5 h-2.5 rounded-full" style={{ backgroundColor: tag.color }} />
-              {tag.name}
-              <button onClick={() => deleteTag.mutate(tag.id)} className="text-muted-foreground hover:text-destructive">
-                <X className="w-3 h-3" />
-              </button>
-            </span>
-          ))}
-          {tags.length === 0 && <span className="text-xs text-muted-foreground">Нет тегов</span>}
-        </div>
-        <div className="flex items-center gap-2">
-          <Input
-            value={tagName}
-            onChange={(e) => setTagName(e.target.value)}
-            placeholder="Название тега"
-            className="h-7 text-xs flex-1"
-          />
-          <div className="flex items-center gap-1">
-            {TAG_COLORS.map((c) => (
-              <button
-                key={c}
-                className={cn("w-5 h-5 rounded-full border-2", tagColor === c ? "border-foreground" : "border-transparent")}
-                style={{ backgroundColor: c }}
-                onClick={() => setTagColor(c)}
-              />
-            ))}
-          </div>
-          <Button
-            size="sm"
-            className="h-7 text-xs"
-            onClick={() => {
-              if (!tagName.trim()) return;
-              createTag.mutate({ name: tagName.trim(), color: tagColor });
-              setTagName("");
-            }}
-          >
-            <Plus className="w-3 h-3 mr-1" /> Добавить
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/client/src/pages/finance/expenses-overview.tsx b/client/src/pages/finance/expenses-overview.tsx
deleted file mode 100644
index ff7a393..0000000
--- a/client/src/pages/finance/expenses-overview.tsx
+++ /dev/null
@@ -1,766 +0,0 @@
-import { useState, useMemo, useEffect } from "react";
-import { useLocation } from "wouter";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { TreeNodeRow } from "@/components/finance/TreeNodeRow";
-import { AnalyticsChart } from "@/components/finance/AnalyticsChart";
-import { ColumnFilter } from "@/components/finance/ColumnFilter";
-import { CopyableCell } from "@/components/finance/CopyableCell";
-import { CategoryOverrideDialog } from "@/components/finance/CategoryOverrideDialog";
-import { DraggableColumnList } from "@/components/finance/DraggableColumnList";
-import { DatabaseError } from "@/components/finance/DatabaseError";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { Input } from "@/components/ui/input";
-import { formatCurrency, formatDate } from "@/lib/format";
-import { cn } from "@/lib/utils";
-import {
-  useExpenses,
-  useExpenseTreeSummary,
-  useExpenseTimeseries,
-  useExpenseCategories,
-  useExpensesByCategory,
-  useTableConfig,
-  useCreateOverride,
-  useDeleteOverride,
-  type TreeNode,
-  type PaginatedResult,
-} from "@/hooks/useFinance";
-import {
-  Settings2,
-  RotateCcw,
-  Search,
-  ChevronRight,
-  ChevronDown,
-  ArrowUp,
-  ArrowDown,
-  ArrowUpDown,
-  Tag,
-  Layers,
-  BarChart3,
-  FolderOpen,
-  Folder,
-} from "lucide-react";
-
-const TAB_KEY = "omegaprom_expense_overview_tab";
-const COLS_KEY = "omegaprom_expense_overview_cols";
-const TABLE_COLS_KEY = "omegaprom_expense_table_cols";
-const TABLE_ORDER_KEY = "omegaprom_expense_table_col_order";
-const BARMODE_KEY = "omegaprom_expense_barmode";
-
-const DEFAULT_VISIBLE = ["data", "summadokumenta", "statya", "zakazchik", "dochka", "vnuchka", "kommentarii"];
-const ALL_COLS = [
-  "data", "summadokumenta", "statya", "zakazchik", "dochka", "vnuchka", "otvetstvenniipokontraktu",
-  "stavkands", "kommentarii", "dogovorkontragenta", "schetnaoplatu", "naznachenieplatezha",
-  "dogovorzakazchika", "statyadop", "nomervhodyaschegodokumenta",
-];
-
-export default function ExpensesOverviewPage() {
-  const [activeTab, setActiveTab] = useState<"tree" | "analytics" | "table">(() => {
-    const saved = localStorage.getItem(TAB_KEY);
-    return saved === "analytics" || saved === "table" ? saved : "tree";
-  });
-
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const dr = { from: dateFrom || undefined, to: dateTo || undefined };
-
-  const handleTabChange = (tab: "tree" | "analytics" | "table") => {
-    setActiveTab(tab);
-    localStorage.setItem(TAB_KEY, tab);
-  };
-
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="expenses" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        {/* Header */}
-        <div className="flex flex-wrap items-start justify-between gap-4">
-          <div>
-            <h1 className="text-2xl font-bold">Расходы</h1>
-            <p className="text-sm text-muted-foreground">Обзор по статьям доходов</p>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="flex items-center gap-1 bg-muted/50 border border-border rounded-lg px-3 py-1.5">
-              <Input
-                type="date"
-                value={dateFrom}
-                onChange={(e) => setDateFrom(e.target.value)}
-                className="h-7 w-[140px] text-xs bg-transparent border-0 p-0"
-              />
-              <span className="text-xs text-muted-foreground">—</span>
-              <Input
-                type="date"
-                value={dateTo}
-                onChange={(e) => setDateTo(e.target.value)}
-                className="h-7 w-[140px] text-xs bg-transparent border-0 p-0"
-              />
-              {(dateFrom || dateTo) && (
-                <button
-                  className="text-muted-foreground hover:text-foreground ml-1"
-                  onClick={() => { setDateFrom(""); setDateTo(""); }}
-                >
-                  ×
-                </button>
-              )}
-            </div>
-          </div>
-        </div>
-
-        {/* Tabs */}
-        <div className="flex gap-1 border-b border-border">
-          {(["tree", "analytics", "table"] as const).map((t) => (
-            <button
-              key={t}
-              onClick={() => handleTabChange(t)}
-              className={cn(
-                "px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-                activeTab === t
-                  ? "border-primary text-primary"
-                  : "border-transparent text-muted-foreground hover:text-foreground"
-              )}
-            >
-              {t === "tree" && "📋 Дерево"}
-              {t === "analytics" && "📊 Аналитика"}
-              {t === "table" && "🗃 Таблица"}
-            </button>
-          ))}
-          <a
-            href="/expenses/categories"
-            className="px-4 py-2 text-sm font-medium border-b-2 border-transparent text-muted-foreground hover:text-foreground transition-colors"
-          >
-            ⚙ Категории →
-          </a>
-        </div>
-
-        {activeTab === "tree" && <TreeTab dateRange={dr} />}
-        {activeTab === "analytics" && <AnalyticsTab dateRange={dr} />}
-        {activeTab === "table" && <TableTab dateRange={dr} />}
-      </div>
-    </FinanceLayout>
-  );
-}
-
-// =====================
-// Tree Tab
-// =====================
-
-function TreeTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const { data, isLoading, isError } = useExpenseTreeSummary(dateRange);
-  const [search, setSearch] = useState("");
-  const [visibleCols, setVisibleCols] = useState<Set<string>>(() => {
-    const saved = localStorage.getItem(COLS_KEY);
-    return new Set(saved ? JSON.parse(saved) : ["total"]);
-  });
-  const [allExpanded, setAllExpanded] = useState(true);
-
-  const toggleCol = (col: string) => {
-    const next = new Set(visibleCols);
-    if (next.has(col)) next.delete(col);
-    else next.add(col);
-    setVisibleCols(next);
-    localStorage.setItem(COLS_KEY, JSON.stringify(Array.from(next)));
-  };
-
-  if (isLoading) {
-    return (
-      <div className="space-y-2">
-        {Array.from({ length: 8 }).map((_, i) => (
-          <Skeleton key={i} className="h-8 w-full" />
-        ))}
-      </div>
-    );
-  }
-
-  if (isError) return <DatabaseError />;
-
-  const trees = data?.trees ?? [];
-  const uncategorized = data?.uncategorized ?? { total: 0, count: 0 };
-  const grandTotal = data?.grandTotal ?? { total: 0, count: 0 };
-
-  return (
-    <div className="space-y-4">
-      {/* Controls */}
-      <div className="flex items-center justify-between flex-wrap gap-2">
-        <div className="flex items-center gap-2">
-          <span className="text-sm font-medium text-muted-foreground">Статьи доходов</span>
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button variant="outline" size="sm" className="h-7 text-xs gap-1">
-                <Settings2 className="w-3.5 h-3.5" /> Столбцы
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-40 p-2">
-              {[
-                { key: "total", label: "Сумма" },
-                { key: "count", label: "Кол-во" },
-                { key: "percent", label: "% от итого" },
-              ].map((c) => (
-                <label key={c.key} className="flex items-center gap-2 py-1 text-xs cursor-pointer">
-                  <input
-                    type="checkbox"
-                    checked={visibleCols.has(c.key)}
-                    onChange={() => toggleCol(c.key)}
-                  />
-                  {c.label}
-                </label>
-              ))}
-            </PopoverContent>
-          </Popover>
-          <div className="relative">
-            <Search className="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
-            <Input
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              placeholder="Поиск..."
-              className="h-7 w-44 text-xs pl-8"
-            />
-            {search && (
-              <button className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground" onClick={() => setSearch("")}>×</button>
-            )}
-          </div>
-        </div>
-        <div className="flex items-center gap-1">
-          <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={() => setAllExpanded(true)}>Развернуть все</Button>
-          <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={() => setAllExpanded(false)}>Свернуть все</Button>
-        </div>
-      </div>
-
-      {/* Trees */}
-      <div className="space-y-3">
-        {trees.map((tree: any) => (
-          <TreeCard
-            key={tree.id}
-            tree={tree}
-            visibleCols={visibleCols}
-            searchTerm={search}
-            grandTotal={grandTotal.total}
-          />
-        ))}
-
-        {/* Uncategorized */}
-        <Card>
-          <CardContent className="py-3 px-4">
-            <div className="flex items-center gap-2">
-              <Folder className="w-4 h-4 text-muted-foreground" />
-              <span className="text-sm font-medium flex-1">Нераспределённые</span>
-              {visibleCols.has("total") && (
-                <span className="text-sm font-semibold tabular-nums min-w-[120px] text-right">
-                  {formatCurrency(uncategorized.total)}
-                </span>
-              )}
-              {visibleCols.has("count") && (
-                <span className="text-xs text-muted-foreground tabular-nums min-w-[60px] text-right">
-                  {uncategorized.count}
-                </span>
-              )}
-            </div>
-          </CardContent>
-        </Card>
-
-        {/* Grand Total */}
-        <Card className="border-primary/20 bg-primary/5">
-          <CardContent className="py-3 px-4">
-            <div className="flex items-center gap-2 font-bold">
-              <span className="text-sm flex-1">ИТОГО</span>
-              {visibleCols.has("total") && (
-                <span className="text-sm tabular-nums min-w-[120px] text-right text-primary">
-                  {formatCurrency(grandTotal.total)}
-                </span>
-              )}
-              {visibleCols.has("count") && (
-                <span className="text-xs tabular-nums min-w-[60px] text-right">
-                  {grandTotal.count}
-                </span>
-              )}
-              {visibleCols.has("percent") && (
-                <span className="text-xs tabular-nums min-w-[50px] text-right">100%</span>
-              )}
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-    </div>
-  );
-}
-
-function TreeCard({
-  tree,
-  visibleCols,
-  searchTerm,
-  grandTotal,
-}: {
-  tree: any;
-  visibleCols: Set<string>;
-  searchTerm: string;
-  grandTotal: number;
-}) {
-  const [expanded, setExpanded] = useState(true);
-  const [, setLocation] = useLocation();
-
-  return (
-    <Card>
-      <div
-        className="flex items-center gap-2 py-3 px-4 cursor-pointer hover:bg-muted/30 transition-colors border-b border-border"
-        onClick={() => setExpanded((e) => !e)}
-      >
-        {expanded ? (
-          <ChevronDown className="w-4 h-4 text-muted-foreground" />
-        ) : (
-          <ChevronRight className="w-4 h-4 text-muted-foreground" />
-        )}
-        <FolderOpen className="w-4 h-4 text-primary" />
-        <span className="text-sm font-semibold flex-1">{tree.name}</span>
-        {!tree.isPrimary && (
-          <Badge variant="outline" className="text-[10px]">Отчет</Badge>
-        )}
-        <Badge variant="secondary" className="text-[10px]">{tree.nodes?.length ?? 0} узлов</Badge>
-        {visibleCols.has("total") && (
-          <span className="text-sm font-semibold tabular-nums min-w-[120px] text-right">
-            {formatCurrency(tree.total)}
-          </span>
-        )}
-        {visibleCols.has("count") && (
-          <span className="text-xs text-muted-foreground tabular-nums min-w-[60px] text-right">
-            {tree.count}
-          </span>
-        )}
-      </div>
-
-      {expanded && (
-        <CardContent className="px-2 pb-2 pt-0">
-          <div className="flex items-center gap-2 py-2 px-3 mb-1 text-xs text-muted-foreground font-medium border-b border-border">
-            <span className="ml-[52px] flex-1">Статья</span>
-            {visibleCols.has("total") && <span className="min-w-[120px] text-right">Сумма</span>}
-            {visibleCols.has("count") && <span className="min-w-[60px] text-right">Кол-во</span>}
-            {visibleCols.has("percent") && <span className="min-w-[50px] text-right">%</span>}
-          </div>
-          {tree.nodes?.map((node: TreeNode) => (
-            <TreeNodeRow
-              key={node.id}
-              node={node}
-              depth={0}
-              searchTerm={searchTerm}
-              onSelect={(id) => setLocation(`/expenses/${id}`)}
-            />
-          ))}
-        </CardContent>
-      )}
-    </Card>
-  );
-}
-
-// =====================
-// Analytics Tab
-// =====================
-
-function AnalyticsTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const [mode, setMode] = useState<"dynamics" | "categories">("dynamics");
-  const [groupBy, setGroupBy] = useState<"month" | "quarter" | "year">("month");
-  const [barMode, setBarMode] = useState<"stacked" | "grouped">(() => {
-    const saved = localStorage.getItem(BARMODE_KEY);
-    return saved === "grouped" ? "grouped" : "stacked";
-  });
-
-  const { data, isLoading } = useExpenseTimeseries(dateRange.from, dateRange.to, groupBy);
-
-  const handleBarModeChange = (m: "stacked" | "grouped") => {
-    setBarMode(m);
-    localStorage.setItem(BARMODE_KEY, m);
-  };
-
-  const chartData = useMemo(() => {
-    if (!data?.periods) return [];
-    return data.periods.map((p, i) => ({
-      period: p,
-      total: data.series[0]?.data[i] ?? 0,
-    }));
-  }, [data]);
-
-  if (isLoading) {
-    return (
-      <div className="space-y-3">
-        <Skeleton className="h-8 w-48" />
-        <Skeleton className="h-[300px] w-full" />
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center gap-4 flex-wrap">
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          <Button
-            size="sm"
-            variant={mode === "dynamics" ? "default" : "ghost"}
-            className="h-7 text-xs"
-            onClick={() => setMode("dynamics")}
-          >
-            Динамика
-          </Button>
-          <Button
-            size="sm"
-            variant={mode === "categories" ? "default" : "ghost"}
-            className="h-7 text-xs"
-            onClick={() => setMode("categories")}
-          >
-            Категории
-          </Button>
-        </div>
-
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          {(["month", "quarter", "year"] as const).map((g) => (
-            <Button
-              key={g}
-              size="sm"
-              variant={groupBy === g ? "default" : "ghost"}
-              className="h-7 text-xs"
-              onClick={() => setGroupBy(g)}
-            >
-              {g === "month" ? "Месяц" : g === "quarter" ? "Квартал" : "Год"}
-            </Button>
-          ))}
-        </div>
-
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          <Button
-            size="sm"
-            variant={barMode === "stacked" ? "default" : "ghost"}
-            className="h-7 w-7 p-0"
-            onClick={() => handleBarModeChange("stacked")}
-            title="Стопка"
-          >
-            <Layers className="w-3.5 h-3.5" />
-          </Button>
-          <Button
-            size="sm"
-            variant={barMode === "grouped" ? "default" : "ghost"}
-            className="h-7 w-7 p-0"
-            onClick={() => handleBarModeChange("grouped")}
-            title="Группа"
-          >
-            <BarChart3 className="w-3.5 h-3.5" />
-          </Button>
-        </div>
-      </div>
-
-      <Card>
-        <CardHeader className="pb-2">
-          <CardTitle className="text-base font-semibold">
-            Динамика расходов
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          {chartData.length === 0 ? (
-            <div className="text-center py-8 text-sm text-muted-foreground">Нет данных</div>
-          ) : (
-            <AnalyticsChart
-              data={chartData}
-              series={[{ key: "total", label: "Расходы" }]}
-              periods={data?.periods ?? []}
-              barMode={barMode}
-            />
-          )}
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
-
-// =====================
-// Table Tab
-// =====================
-
-function TableTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const { data: tableConfig } = useTableConfig();
-  const columnLabels = tableConfig?.config?.columnLabels ?? {};
-
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(50);
-  const [sortBy, setSortBy] = useState("id");
-  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
-  const [filters, setFilters] = useState<Record<string, string>>({});
-  const [visibleCols, setVisibleCols] = useState<string[]>(() => {
-    const saved = localStorage.getItem(TABLE_COLS_KEY);
-    return saved ? JSON.parse(saved) : DEFAULT_VISIBLE;
-  });
-  const [colOrder, setColOrder] = useState<string[]>(() => {
-    const saved = localStorage.getItem(TABLE_ORDER_KEY);
-    return saved ? JSON.parse(saved) : DEFAULT_VISIBLE;
-  });
-  const [overrideOpen, setOverrideOpen] = useState(false);
-  const [overrideRecordId, setOverrideRecordId] = useState<string>("");
-
-  const { data, isLoading } = useExpenses(page, pageSize, sortBy, sortDir, filters, dateRange);
-  const { data: catData } = useExpenseCategories();
-  const createOverride = useCreateOverride();
-  const deleteOverride = useDeleteOverride();
-
-  const handleSort = (col: string) => {
-    if (sortBy === col) {
-      setSortDir((d) => (d === "desc" ? "asc" : "desc"));
-    } else {
-      setSortBy(col);
-      setSortDir("desc");
-    }
-  };
-
-  const getSortIcon = (col: string) => {
-    if (sortBy !== col) return <ArrowUpDown className="w-3 h-3 text-muted-foreground/50" />;
-    return sortDir === "asc" ? <ArrowUp className="w-3 h-3" /> : <ArrowDown className="w-3 h-3" />;
-  };
-
-  const rows = data?.rows ?? [];
-  const total = data?.total ?? 0;
-  const totalSum = data?.totalSum ?? 0;
-  const totalPages = data?.totalPages ?? 1;
-
-  useEffect(() => {
-    if (totalPages > 0 && page > totalPages) {
-      setPage(totalPages);
-    }
-  }, [totalPages, page]);
-
-  const allColumns = ALL_COLS.map((k) => ({ key: k, label: columnLabels[k] || k }));
-  const displayCols = colOrder.filter((c) => visibleCols.includes(c) && ALL_COLS.includes(c));
-
-  const activeFilters = Object.entries(filters).filter(([, v]) => v);
-
-  return (
-    <div className="flex flex-col flex-1 min-h-0 min-w-0 space-y-3">
-      {/* Stats + Controls */}
-      <div className="flex flex-wrap items-center gap-3 text-sm">
-        <span className="text-muted-foreground">
-          Найдено: <span className="font-bold">{total}</span> записей
-        </span>
-        {totalSum != null && (
-          <Badge variant="secondary">Итого: {formatCurrency(totalSum)}</Badge>
-        )}
-        {sortBy && (
-          <Badge variant="outline" className="text-[10px]">
-            Сортировка: {columnLabels[sortBy] || sortBy} {sortDir === "asc" ? "↑" : "↓"}
-          </Badge>
-        )}
-        <div className="ml-auto flex items-center gap-2">
-          {activeFilters.length > 0 && (
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-7 text-xs gap-1"
-              onClick={() => { setPage(1); setFilters({}); }}
-            >
-              <RotateCcw className="w-3 h-3" /> Сбросить
-            </Button>
-          )}
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button variant="outline" size="sm" className="h-7 text-xs gap-1">
-                <Settings2 className="w-3.5 h-3.5" /> Столбцы
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-52 p-2">
-              <DraggableColumnList
-                allColumns={allColumns}
-                columnOrder={colOrder}
-                visibleCols={visibleCols}
-                onOrderChange={(o) => { setColOrder(o); localStorage.setItem(TABLE_ORDER_KEY, JSON.stringify(o)); }}
-                onToggle={(k) => {
-                  const next = visibleCols.includes(k) ? visibleCols.filter((c) => c !== k) : [...visibleCols, k];
-                  setVisibleCols(next);
-                  localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(next));
-                }}
-                onShowAll={() => { setVisibleCols(ALL_COLS); localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(ALL_COLS)); }}
-                onReset={() => {
-                  setVisibleCols(DEFAULT_VISIBLE);
-                  setColOrder(DEFAULT_VISIBLE);
-                  localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(DEFAULT_VISIBLE));
-                  localStorage.setItem(TABLE_ORDER_KEY, JSON.stringify(DEFAULT_VISIBLE));
-                }}
-              />
-            </PopoverContent>
-          </Popover>
-        </div>
-      </div>
-
-      {/* Active filters */}
-      {activeFilters.length > 0 && (
-        <div className="flex flex-wrap items-center gap-2">
-          {activeFilters.map(([col, val]) => (
-            <Badge key={col} variant="secondary" className="text-xs gap-1 pl-2.5 pr-1.5">
-              {columnLabels[col] || col}: {val}
-              <button
-                className="ml-1 hover:text-destructive"
-                onClick={() => { setPage(1); setFilters((f) => { const n = { ...f }; delete n[col]; return n; }); }}
-              >
-                ×
-              </button>
-            </Badge>
-          ))}
-          <Button variant="ghost" size="sm" className="h-6 text-xs text-muted-foreground" onClick={() => setFilters({})}>
-            Очистить все
-          </Button>
-        </div>
-      )}
-
-      {/* Table */}
-      <Card className="flex-1 min-h-0 flex flex-col">
-        <div className="overflow-auto flex-1 min-h-0">
-          <table className="w-full text-sm" style={{ minWidth: Math.max(displayCols.length * 120, 800) }}>
-            <thead className="sticky top-0 z-10">
-              <tr className="border-b border-border bg-muted">
-                {displayCols.map((col) => (
-                  <th
-                    key={col}
-                    className={cn(
-                      "px-3 py-2.5 text-xs font-medium text-muted-foreground whitespace-nowrap",
-                      col === "summadokumenta" ? "text-right" : "text-left"
-                    )}
-                  >
-                    <div className="flex items-center gap-1">
-                      <span className="cursor-pointer hover:text-foreground" onClick={() => handleSort(col)}>
-                        {columnLabels[col] || col}
-                      </span>
-                      <span className="cursor-pointer" onClick={() => handleSort(col)}>
-                        {getSortIcon(col)}
-                      </span>
-                      <Popover>
-                        <PopoverTrigger asChild>
-                          <button className="ml-0.5 text-muted-foreground/50 hover:text-primary">
-                            <Settings2 className="w-3 h-3" />
-                          </button>
-                        </PopoverTrigger>
-                        <PopoverContent className="w-56 p-2">
-                          <ColumnFilter
-                            column={col}
-                            value={filters[col] || ""}
-                            onChange={(v) => { setPage(1); setFilters((f) => ({ ...f, [col]: v })); }}
-                            placeholder={columnLabels[col] || col}
-                            apiEndpoint="/api/expenses/column-values"
-                            contextFilters={filters}
-                          />
-                        </PopoverContent>
-                      </Popover>
-                    </div>
-                  </th>
-                ))}
-                <th className="w-10 text-center text-xs font-medium text-muted-foreground">Кат.</th>
-              </tr>
-            </thead>
-            <tbody>
-              {isLoading && rows.length === 0 ? (
-                <tr>
-                  <td colSpan={displayCols.length + 1} className="px-3 py-8 text-center text-muted-foreground">
-                    Загрузка...
-                  </td>
-                </tr>
-              ) : rows.length === 0 ? (
-                <tr>
-                  <td colSpan={displayCols.length + 1} className="px-3 py-12 text-center text-muted-foreground">
-                    Данные не найдены
-                  </td>
-                </tr>
-              ) : (
-                rows.map((row: any, idx: number) => (
-                  <tr
-                    key={row.id ?? idx}
-                    className="border-b border-border last:border-0 transition-colors hover:bg-muted/50"
-                  >
-                    {displayCols.map((col) => {
-                      const val = row[col];
-                      const isSum = col === "summadokumenta";
-                      return (
-                        <td
-                          key={col}
-                          className={cn(
-                            "px-3 py-3 whitespace-nowrap",
-                            isSum && "font-medium text-right text-chart-1"
-                          )}
-                        >
-                          {val == null || val === "" || val === "0" ? (
-                            <span className="text-muted-foreground">—</span>
-                          ) : col === "data" ? (
-                            formatDate(val)
-                          ) : isSum ? (
-                            formatCurrency(parseFloat(val) || 0)
-                          ) : col === "statya" ? (
-                            <Badge variant="secondary" className="text-xs">{val}</Badge>
-                          ) : col === "kommentarii" || col === "naznachenieplatezha" || col === "zakazchik" ? (
-                            <CopyableCell text={String(val)} />
-                          ) : (
-                            String(val)
-                          )}
-                        </td>
-                      );
-                    })}
-                    <td className="px-3 py-3 text-center">
-                      <button
-                        className={cn(
-                          "w-5 h-5 flex items-center justify-center rounded transition-colors",
-                          row._override_category_id
-                            ? "text-primary bg-primary/10"
-                            : "text-muted-foreground/40 hover:text-muted-foreground"
-                        )}
-                        onClick={() => {
-                          setOverrideRecordId(row.id);
-                          setOverrideOpen(true);
-                        }}
-                        title="Назначить категорию"
-                      >
-                        <Tag className="w-3.5 h-3.5" />
-                      </button>
-                    </td>
-                  </tr>
-                ))
-              )}
-            </tbody>
-          </table>
-        </div>
-
-        {/* Pagination */}
-        {totalPages > 1 && (
-          <div className="flex items-center justify-between px-4 py-3 border-t">
-            <span className="text-xs text-muted-foreground">
-              Стр. {page} из {totalPages}
-            </span>
-            <div className="flex items-center gap-1">
-              <select
-                value={pageSize}
-                onChange={(e) => { setPageSize(Number(e.target.value)); setPage(1); }}
-                className="h-7 text-xs rounded border bg-background px-1 mr-2"
-              >
-                <option value={25}>25</option>
-                <option value={50}>50</option>
-                <option value={100}>100</option>
-                <option value={200}>200</option>
-              </select>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(1)} disabled={page <= 1}>≪</Button>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page - 1)} disabled={page <= 1}>＜</Button>
-              <span className="text-xs px-2">{page} / {totalPages}</span>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page + 1)} disabled={page >= totalPages}>＞</Button>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(totalPages)} disabled={page >= totalPages}>≫</Button>
-            </div>
-          </div>
-        )}
-      </Card>
-
-      <CategoryOverrideDialog
-        open={overrideOpen}
-        onOpenChange={setOverrideOpen}
-        recordId={overrideRecordId}
-        recordType="expense"
-        currentOverrideCategoryId={null}
-        categories={catData?.categories ?? []}
-        onAssign={(recordId, categoryId) => {
-          createOverride.mutate({ type: "expense", recordId, categoryId });
-        }}
-        onReset={(recordId) => {
-          deleteOverride.mutate({ type: "expense", recordId });
-        }}
-      />
-    </div>
-  );
-}
diff --git a/client/src/pages/finance/expenses.tsx b/client/src/pages/finance/expenses.tsx
deleted file mode 100644
index 638709c..0000000
--- a/client/src/pages/finance/expenses.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import { useState, useEffect } from "react";
-import { useRoute } from "wouter";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { Card, CardContent } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Input } from "@/components/ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { ColumnFilter } from "@/components/finance/ColumnFilter";
-import { CopyableCell } from "@/components/finance/CopyableCell";
-import { CategoryOverrideDialog } from "@/components/finance/CategoryOverrideDialog";
-import { formatCurrency, formatDate } from "@/lib/format";
-import { cn } from "@/lib/utils";
-import {
-  useExpensesByCategory,
-  useExpenseCategories,
-  useTableConfig,
-  useCreateOverride,
-  useDeleteOverride,
-} from "@/hooks/useFinance";
-import { ArrowUpDown, ArrowUp, ArrowDown, RotateCcw, Settings2, Tag } from "lucide-react";
-
-export default function ExpensesDetailPage() {
-  const [match, params] = useRoute("/expenses/:categoryId");
-  const categoryId = params?.categoryId ?? "";
-  const isUncategorized = categoryId === "uncategorized";
-
-  const { data: catData } = useExpenseCategories();
-  const category = findCategory(catData?.categories ?? [], categoryId);
-  const categoryName = isUncategorized
-    ? "Расходы (нераспределённые)"
-    : category?.name ?? categoryId;
-
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(50);
-  const [sortBy, setSortBy] = useState("data");
-  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
-  const [filters, setFilters] = useState<Record<string, string>>({});
-  const [visibleCols] = useState(["data", "summadokumenta", "statya", "kontragent", "kommentarii"]);
-  const [overrideOpen, setOverrideOpen] = useState(false);
-  const [overrideRecordId, setOverrideRecordId] = useState("");
-
-  const dr = { from: dateFrom || undefined, to: dateTo || undefined };
-  const { data, isLoading } = useExpensesByCategory(isUncategorized ? null : categoryId, page, pageSize, filters, dr);
-  const { data: tableConfig } = useTableConfig();
-  const columnLabels = tableConfig?.config?.columnLabels ?? {};
-  const createOverride = useCreateOverride();
-  const deleteOverride = useDeleteOverride();
-
-  const handleSort = (col: string) => {
-    if (sortBy === col) setSortDir((d) => (d === "desc" ? "asc" : "desc"));
-    else { setSortBy(col); setSortDir("desc"); }
-  };
-  const getSortIcon = (col: string) => {
-    if (sortBy !== col) return <ArrowUpDown className="w-3 h-3 text-muted-foreground/50" />;
-    return sortDir === "asc" ? <ArrowUp className="w-3 h-3" /> : <ArrowDown className="w-3 h-3" />;
-  };
-
-  const rows = data?.rows ?? [];
-  const total = data?.total ?? 0;
-  const totalSum = data?.totalSum ?? 0;
-  const totalPages = data?.totalPages ?? 1;
-
-  useEffect(() => {
-    if (totalPages > 0 && page > totalPages) {
-      setPage(totalPages);
-    }
-  }, [totalPages, page]);
-
-  const activeFilters = Object.entries(filters).filter(([, v]) => v);
-
-  return (
-    <FinanceLayout
-      showBack
-      mobileNav={<FinanceBottomNav active="expenses" onChange={() => {}} />}
-    >
-      <div className="space-y-3 h-full flex flex-col overflow-hidden">
-        <div className="flex flex-wrap items-center justify-between gap-4">
-          <div>
-            <h1 className="text-lg font-semibold">{categoryName}</h1>
-            {category && category.rules && category.rules.length > 0 && (
-              <p className="text-xs text-muted-foreground mt-0.5">
-                {category.rules.map((r: any) => `${r.column} = ${r.value}`).join(", ")}
-              </p>
-            )}
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="flex items-center gap-1 bg-muted/50 border border-border rounded-lg px-3 py-1.5">
-              <Input type="date" value={dateFrom} onChange={(e) => setDateFrom(e.target.value)} className="h-7 w-[140px] text-xs bg-transparent border-0 p-0" />
-              <span className="text-xs text-muted-foreground">—</span>
-              <Input type="date" value={dateTo} onChange={(e) => setDateTo(e.target.value)} className="h-7 w-[140px] text-xs bg-transparent border-0 p-0" />
-            </div>
-          </div>
-        </div>
-
-        <div className="flex flex-wrap items-center gap-3 text-sm">
-          <span className="text-muted-foreground">Найдено: <span className="font-bold">{total}</span></span>
-          {totalSum != null && <Badge variant="secondary">Итого: {formatCurrency(totalSum)}</Badge>}
-          {activeFilters.length > 0 && (
-            <Button variant="ghost" size="sm" className="h-7 text-xs gap-1" onClick={() => { setPage(1); setFilters({}); }}>
-              <RotateCcw className="w-3 h-3" /> Сбросить
-            </Button>
-          )}
-        </div>
-
-        {activeFilters.length > 0 && (
-          <div className="flex flex-wrap items-center gap-2">
-            {activeFilters.map(([col, val]) => (
-              <Badge key={col} variant="secondary" className="text-xs gap-1">
-                {columnLabels[col] || col}: {val}
-                <button onClick={() => { setPage(1); setFilters((f) => { const n = { ...f }; delete n[col]; return n; }); }}>×</button>
-              </Badge>
-            ))}
-          </div>
-        )}
-
-        <Card className="flex-1 min-h-0 flex flex-col">
-          <div className="overflow-auto flex-1 min-h-0">
-            <table className="w-full text-sm" style={{ minWidth: Math.max(visibleCols.length * 120, 800) }}>
-              <thead className="sticky top-0 z-10 bg-muted">
-                <tr className="border-b border-border">
-                  {visibleCols.map((col) => (
-                    <th key={col} className={cn("px-3 py-2.5 text-xs font-medium text-muted-foreground", col === "summadokumenta" ? "text-right" : "text-left")}>
-                      <div className="flex items-center gap-1">
-                        <span className="cursor-pointer" onClick={() => handleSort(col)}>{columnLabels[col] || col}</span>
-                        <span onClick={() => handleSort(col)}>{getSortIcon(col)}</span>
-                        <Popover>
-                          <PopoverTrigger asChild>
-                            <button className="ml-0.5 text-muted-foreground/50 hover:text-primary"><Settings2 className="w-3 h-3" /></button>
-                          </PopoverTrigger>
-                          <PopoverContent className="w-56 p-2">
-                            <ColumnFilter column={col} value={filters[col] || ""} onChange={(v) => { setPage(1); setFilters((f) => ({ ...f, [col]: v })); }} placeholder={columnLabels[col] || col} apiEndpoint="/api/expenses/column-values" contextFilters={filters} />
-                          </PopoverContent>
-                        </Popover>
-                      </div>
-                    </th>
-                  ))}
-                  <th className="w-10 text-center text-xs">Кат.</th>
-                </tr>
-              </thead>
-              <tbody>
-                {isLoading && rows.length === 0 ? (
-                  <tr><td colSpan={visibleCols.length + 1} className="px-3 py-8 text-center text-muted-foreground">Загрузка...</td></tr>
-                ) : rows.length === 0 ? (
-                  <tr><td colSpan={visibleCols.length + 1} className="px-3 py-12 text-center text-muted-foreground">Данные не найдены</td></tr>
-                ) : (
-                  rows.map((row: any, idx: number) => (
-                    <tr key={row.id ?? idx} className="border-b border-border last:border-0 hover:bg-muted/50">
-                      {visibleCols.map((col) => {
-                        const val = row[col];
-                        const isSum = col === "summadokumenta";
-                        return (
-                          <td key={col} className={cn("px-3 py-3 whitespace-nowrap", isSum && "font-medium text-right text-chart-1")}>
-                            {val == null || val === "" ? <span className="text-muted-foreground">—</span>
-                              : col === "data" ? formatDate(val)
-                              : isSum ? formatCurrency(parseFloat(val) || 0)
-                              : col === "kommentarii" || col === "naznachenieplatezha" || col === "zakazchik" ? <CopyableCell text={String(val)} />
-                              : String(val)}
-                          </td>
-                        );
-                      })}
-                      <td className="px-3 py-3 text-center">
-                        <button className={cn("w-5 h-5 flex items-center justify-center rounded", row._override_category_id ? "text-primary bg-primary/10" : "text-muted-foreground/40 hover:text-muted-foreground")} onClick={() => { setOverrideRecordId(row.id); setOverrideOpen(true); }}>
-                          <Tag className="w-3.5 h-3.5" />
-                        </button>
-                      </td>
-                    </tr>
-                  ))
-                )}
-              </tbody>
-            </table>
-          </div>
-          {totalPages > 1 && (
-            <div className="flex items-center justify-between px-4 py-3 border-t">
-              <span className="text-xs text-muted-foreground">Стр. {page} из {totalPages}</span>
-              <div className="flex items-center gap-1">
-                <select value={pageSize} onChange={(e) => { setPageSize(Number(e.target.value)); setPage(1); }} className="h-7 text-xs rounded border bg-background px-1 mr-2">
-                  <option value={25}>25</option><option value={50}>50</option><option value={100}>100</option><option value={200}>200</option>
-                </select>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(1)} disabled={page <= 1}>≪</Button>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page - 1)} disabled={page <= 1}>＜</Button>
-                <span className="text-xs px-2">{page} / {totalPages}</span>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page + 1)} disabled={page >= totalPages}>＞</Button>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(totalPages)} disabled={page >= totalPages}>≫</Button>
-              </div>
-            </div>
-          )}
-        </Card>
-
-        <CategoryOverrideDialog
-          open={overrideOpen}
-          onOpenChange={setOverrideOpen}
-          recordId={overrideRecordId}
-          recordType="income"
-          categories={catData?.categories ?? []}
-          onAssign={(recordId, categoryId) => createOverride.mutate({ type: "income", recordId, categoryId })}
-          onReset={(recordId) => deleteOverride.mutate({ type: "income", recordId })}
-        />
-      </div>
-    </FinanceLayout>
-  );
-}
-
-function findCategory(cats: any[], id: string): any | null {
-  for (const c of cats) {
-    if (c.id === id) return c;
-    if (c.children) {
-      const found = findCategory(c.children, id);
-      if (found) return found;
-    }
-  }
-  return null;
-}
diff --git a/client/src/pages/finance/income-categories.tsx b/client/src/pages/finance/income-categories.tsx
deleted file mode 100644
index 597d3e0..0000000
--- a/client/src/pages/finance/income-categories.tsx
+++ /dev/null
@@ -1,322 +0,0 @@
-import { useState } from "react";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from "@/components/ui/dialog";
-import {
-  Plus, Trash2, Pencil, Folder, ChevronRight, ChevronDown,
-  EyeOff, Wand2, ArrowUpDown, Tag, X,
-} from "lucide-react";
-import { Badge } from "@/components/ui/badge";
-import { cn } from "@/lib/utils";
-import {
-  useIncomeCategories,
-  useCreateIncomeCategory,
-  useUpdateIncomeCategory,
-  useDeleteIncomeCategory,
-  useTags,
-  useCreateTag,
-  useDeleteTag,
-} from "@/hooks/useFinance";
-import type { Category, CategoryRule } from "@/hooks/useFinance";
-
-const RULE_OPS = [
-  { value: "equals", label: "равно (=)" },
-  { value: "not_equals", label: "не равно (≠)" },
-  { value: "contains", label: "содержит (∋)" },
-  { value: "greater_than", label: "больше (>" },
-  { value: "less_than", label: "меньше (<)" },
-  { value: "equal_number", label: "равно числу" },
-];
-
-const TAG_COLORS = [
-  "#2563eb", "#e11d48", "#16a34a", "#f59e0b",
-  "#8b5cf6", "#06b6d4", "#ea580c", "#84cc16",
-];
-
-export default function IncomeCategoriesPage() {
-  const { data, isLoading } = useIncomeCategories();
-  const createCat = useCreateIncomeCategory();
-  const updateCat = useUpdateIncomeCategory();
-  const deleteCat = useDeleteIncomeCategory();
-
-  const [dialogOpen, setDialogOpen] = useState(false);
-  const [editing, setEditing] = useState<Category | null>(null);
-  const [parentId, setParentId] = useState<string | null>(null);
-
-  const [name, setName] = useState("");
-  const [rules, setRules] = useState<CategoryRule[]>([]);
-  const [ruleLogic, setRuleLogic] = useState<"and" | "or">("and");
-  const [excluded, setExcluded] = useState(false);
-
-  const openCreate = (parent?: string) => {
-    setEditing(null);
-    setParentId(parent ?? null);
-    setName("");
-    setRules([]);
-    setRuleLogic("and");
-    setExcluded(false);
-    setDialogOpen(true);
-  };
-
-  const openEdit = (cat: Category) => {
-    setEditing(cat);
-    setParentId(null);
-    setName(cat.name);
-    setRules(cat.rules ? [...cat.rules] : []);
-    setRuleLogic(cat.ruleLogic ?? "and");
-    setExcluded(cat.excluded ?? false);
-    setDialogOpen(true);
-  };
-
-  const handleSave = () => {
-    if (!name.trim()) return;
-    const body = { name: name.trim(), rules, ruleLogic, excluded, children: [] };
-    if (editing) {
-      updateCat.mutate({ id: editing.id, ...body });
-    } else {
-      createCat.mutate({ ...body, parentId: parentId ?? undefined } as any);
-    }
-    setDialogOpen(false);
-  };
-
-  return (
-    <FinanceLayout
-      showBack
-      mobileNav={<FinanceBottomNav active="income-categories" onChange={() => {}} />}
-    >
-      <div className="space-y-6">
-        {/* Categories Tree */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <h2 className="text-lg font-semibold">Категории доходов</h2>
-            <Button size="sm" className="h-7 text-xs" onClick={() => openCreate()}>
-              <Plus className="w-3.5 h-3.5 mr-1" /> Добавить
-            </Button>
-          </div>
-
-          {isLoading ? (
-            <div className="text-sm text-muted-foreground py-4">Загрузка...</div>
-          ) : (data?.categories ?? []).length === 0 ? (
-            <div className="text-sm text-muted-foreground py-4">Нет категорий</div>
-          ) : (
-            <div className="rounded border bg-card p-2 space-y-0.5">
-              {data!.categories.map((cat) => (
-                <CategoryNode
-                  key={cat.id}
-                  node={cat}
-                  depth={0}
-                  onEdit={openEdit}
-                  onDelete={(id) => deleteCat.mutate(id)}
-                  onAddChild={openCreate}
-                />
-              ))}
-            </div>
-          )}
-        </div>
-
-        {/* Tags */}
-        <TagsSection />
-
-        {/* Edit Dialog */}
-        <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-          <DialogContent className="sm:max-w-lg max-h-[80vh] flex flex-col">
-            <DialogHeader>
-              <DialogTitle className="text-sm">
-                {editing ? "Редактировать категорию" : "Новая категория"}
-              </DialogTitle>
-            </DialogHeader>
-            <div className="space-y-4 py-2 flex-1 overflow-y-auto">
-              <div>
-                <Label className="text-xs">Название</Label>
-                <Input value={name} onChange={(e) => setName(e.target.value)} placeholder="Название категории" className="h-8 text-xs mt-1" autoFocus />
-              </div>
-
-              {/* Rules */}
-              <div className="space-y-2">
-                <div className="text-xs font-medium">Правила</div>
-                {rules.map((rule, idx) => (
-                  <div key={idx} className="flex items-center gap-2">
-                    <Input value={rule.column} onChange={(e) => {
-                      const next = [...rules];
-                      next[idx] = { ...next[idx], column: e.target.value };
-                      setRules(next);
-                    }} placeholder="Столбец" className="h-7 text-xs flex-1" />
-                    <select
-                      value={rule.operator}
-                      onChange={(e) => {
-                        const next = [...rules];
-                        next[idx] = { ...next[idx], operator: e.target.value as any };
-                        setRules(next);
-                      }}
-                      className="h-7 text-xs rounded border bg-background px-1"
-                    >
-                      {RULE_OPS.map((o) => <option key={o.value} value={o.value}>{o.label}</option>)}
-                    </select>
-                    <Input value={rule.value} onChange={(e) => {
-                      const next = [...rules];
-                      next[idx] = { ...next[idx], value: e.target.value };
-                      setRules(next);
-                    }} placeholder="Значение" className="h-7 text-xs flex-1" />
-                    <Button variant="ghost" size="icon" className="h-7 w-7" onClick={() => setRules((r) => r.filter((_, i) => i !== idx))}>
-                      <Trash2 className="w-3 h-3 text-destructive" />
-                    </Button>
-                  </div>
-                ))}
-                <Button variant="outline" size="sm" className="h-7 text-xs" onClick={() => setRules((r) => [...r, { column: "", operator: "equals", value: "" }])}>
-                  <Plus className="w-3 h-3 mr-1" /> Добавить правило
-                </Button>
-              </div>
-
-              {/* Logic & Excluded */}
-              <div className="flex items-center gap-4">
-                <div className="flex items-center gap-2">
-                  <Switch checked={ruleLogic === "or"} onCheckedChange={(c) => setRuleLogic(c ? "or" : "and")} />
-                  <Label className="text-xs">Логика OR (иначе AND)</Label>
-                </div>
-                <div className="flex items-center gap-2">
-                  <Switch checked={excluded} onCheckedChange={setExcluded} />
-                  <Label className="text-xs">Исключить</Label>
-                </div>
-              </div>
-            </div>
-            <DialogFooter>
-              <Button variant="outline" size="sm" className="h-7 text-xs" onClick={() => setDialogOpen(false)}>Отмена</Button>
-              <Button size="sm" className="h-7 text-xs" onClick={handleSave}>Сохранить</Button>
-            </DialogFooter>
-          </DialogContent>
-        </Dialog>
-      </div>
-    </FinanceLayout>
-  );
-}
-
-function CategoryNode({
-  node,
-  depth,
-  onEdit,
-  onDelete,
-  onAddChild,
-}: {
-  node: Category;
-  depth: number;
-  onEdit: (cat: Category) => void;
-  onDelete: (id: string) => void;
-  onAddChild: (parentId: string) => void;
-}) {
-  const [expanded, setExpanded] = useState(true);
-  const hasChildren = node.children && node.children.length > 0;
-
-  return (
-    <div className={cn(depth > 0 && "ml-4 border-l border-border pl-2")}>
-      <div className="flex items-center gap-1 py-1 group">
-        <button className="w-4 h-4 flex items-center justify-center shrink-0" onClick={() => setExpanded((e) => !e)}>
-          {hasChildren ? (
-            expanded ? <ChevronDown className="w-3 h-3 text-muted-foreground" /> : <ChevronRight className="w-3 h-3 text-muted-foreground" />
-          ) : (
-            <span className="w-3" />
-          )}
-        </button>
-        <Folder className="w-3.5 h-3.5 text-amber-500 shrink-0" />
-        <span className={cn("text-xs flex-1 truncate", node.excluded && "text-muted-foreground line-through")}>
-          {node.name}
-        </span>
-        {node.excluded && (
-          <Badge variant="outline" className="text-[10px] border-destructive/40 text-destructive/70 shrink-0">Искл.</Badge>
-        )}
-        {node.autoDetected && (
-          <Badge variant="outline" className="text-[10px] shrink-0">авто</Badge>
-        )}
-        <div className="flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity">
-          <button onClick={() => onEdit(node)} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-foreground" title="Редактировать">
-            <Pencil className="w-3 h-3" />
-          </button>
-          <button onClick={() => onAddChild(node.id)} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-foreground" title="Добавить дочернюю">
-            <Plus className="w-3 h-3" />
-          </button>
-          <button onClick={() => { if (window.confirm(`Удалить "${node.name}"?`)) onDelete(node.id); }} className="w-5 h-5 flex items-center justify-center rounded hover:bg-muted text-muted-foreground hover:text-destructive" title="Удалить">
-            <Trash2 className="w-3 h-3" />
-          </button>
-        </div>
-      </div>
-      {hasChildren && expanded && (
-        <div>
-          {node.children!.map((child) => (
-            <CategoryNode key={child.id} node={child} depth={depth + 1} onEdit={onEdit} onDelete={onDelete} onAddChild={onAddChild} />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-function TagsSection() {
-  const { data: tagsData } = useTags();
-  const createTag = useCreateTag();
-  const deleteTag = useDeleteTag();
-  const [tagName, setTagName] = useState("");
-  const [tagColor, setTagColor] = useState(TAG_COLORS[0]);
-
-  const tags = tagsData?.tags ?? [];
-
-  return (
-    <Card>
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm font-semibold">Теги</CardTitle>
-      </CardHeader>
-      <CardContent className="space-y-3">
-        <div className="flex flex-wrap gap-2">
-          {tags.map((tag) => (
-            <span key={tag.id} className="inline-flex items-center gap-1.5 px-2 py-1 rounded-full border text-xs">
-              <span className="w-2.5 h-2.5 rounded-full" style={{ backgroundColor: tag.color }} />
-              {tag.name}
-              <button onClick={() => deleteTag.mutate(tag.id)} className="text-muted-foreground hover:text-destructive">
-                <X className="w-3 h-3" />
-              </button>
-            </span>
-          ))}
-          {tags.length === 0 && <span className="text-xs text-muted-foreground">Нет тегов</span>}
-        </div>
-        <div className="flex items-center gap-2">
-          <Input
-            value={tagName}
-            onChange={(e) => setTagName(e.target.value)}
-            placeholder="Название тега"
-            className="h-7 text-xs flex-1"
-          />
-          <div className="flex items-center gap-1">
-            {TAG_COLORS.map((c) => (
-              <button
-                key={c}
-                className={cn("w-5 h-5 rounded-full border-2", tagColor === c ? "border-foreground" : "border-transparent")}
-                style={{ backgroundColor: c }}
-                onClick={() => setTagColor(c)}
-              />
-            ))}
-          </div>
-          <Button
-            size="sm"
-            className="h-7 text-xs"
-            onClick={() => {
-              if (!tagName.trim()) return;
-              createTag.mutate({ name: tagName.trim(), color: tagColor });
-              setTagName("");
-            }}
-          >
-            <Plus className="w-3 h-3 mr-1" /> Добавить
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/client/src/pages/finance/income-overview.tsx b/client/src/pages/finance/income-overview.tsx
deleted file mode 100644
index 2d6c6b1..0000000
--- a/client/src/pages/finance/income-overview.tsx
+++ /dev/null
@@ -1,766 +0,0 @@
-import { useState, useMemo, useEffect } from "react";
-import { useLocation } from "wouter";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { TreeNodeRow } from "@/components/finance/TreeNodeRow";
-import { AnalyticsChart } from "@/components/finance/AnalyticsChart";
-import { ColumnFilter } from "@/components/finance/ColumnFilter";
-import { CopyableCell } from "@/components/finance/CopyableCell";
-import { CategoryOverrideDialog } from "@/components/finance/CategoryOverrideDialog";
-import { DraggableColumnList } from "@/components/finance/DraggableColumnList";
-import { DatabaseError } from "@/components/finance/DatabaseError";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { Input } from "@/components/ui/input";
-import { formatCurrency, formatDate } from "@/lib/format";
-import { cn } from "@/lib/utils";
-import {
-  useIncome,
-  useIncomeTreeSummary,
-  useIncomeTimeseries,
-  useIncomeCategories,
-  useIncomeByCategory,
-  useTableConfig,
-  useCreateOverride,
-  useDeleteOverride,
-  type TreeNode,
-  type PaginatedResult,
-} from "@/hooks/useFinance";
-import {
-  Settings2,
-  RotateCcw,
-  Search,
-  ChevronRight,
-  ChevronDown,
-  ArrowUp,
-  ArrowDown,
-  ArrowUpDown,
-  Tag,
-  Layers,
-  BarChart3,
-  FolderOpen,
-  Folder,
-} from "lucide-react";
-
-const TAB_KEY = "omegaprom_income_overview_tab";
-const COLS_KEY = "omegaprom_income_overview_cols";
-const TABLE_COLS_KEY = "omegaprom_income_table_cols";
-const TABLE_ORDER_KEY = "omegaprom_income_table_col_order";
-const BARMODE_KEY = "omegaprom_income_barmode";
-
-const DEFAULT_VISIBLE = ["data", "summa", "statya", "zakazchik", "dochka", "vnuchka", "kommentarii"];
-const ALL_COLS = [
-  "data", "summa", "statya", "zakazchik", "dochka", "vnuchka", "otvetstvenniipokontraktu",
-  "stavkands", "kommentarii", "dogovorkontragenta", "schetnaoplatu", "naznachenieplatezha",
-  "dogovorzakazchika", "statyadop", "nomervhodyaschegodokumenta",
-];
-
-export default function IncomeOverviewPage() {
-  const [activeTab, setActiveTab] = useState<"tree" | "analytics" | "table">(() => {
-    const saved = localStorage.getItem(TAB_KEY);
-    return saved === "analytics" || saved === "table" ? saved : "tree";
-  });
-
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const dr = { from: dateFrom || undefined, to: dateTo || undefined };
-
-  const handleTabChange = (tab: "tree" | "analytics" | "table") => {
-    setActiveTab(tab);
-    localStorage.setItem(TAB_KEY, tab);
-  };
-
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="income" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        {/* Header */}
-        <div className="flex flex-wrap items-start justify-between gap-4">
-          <div>
-            <h1 className="text-2xl font-bold">Доходы</h1>
-            <p className="text-sm text-muted-foreground">Обзор по статьям доходов</p>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="flex items-center gap-1 bg-muted/50 border border-border rounded-lg px-3 py-1.5">
-              <Input
-                type="date"
-                value={dateFrom}
-                onChange={(e) => setDateFrom(e.target.value)}
-                className="h-7 w-[140px] text-xs bg-transparent border-0 p-0"
-              />
-              <span className="text-xs text-muted-foreground">—</span>
-              <Input
-                type="date"
-                value={dateTo}
-                onChange={(e) => setDateTo(e.target.value)}
-                className="h-7 w-[140px] text-xs bg-transparent border-0 p-0"
-              />
-              {(dateFrom || dateTo) && (
-                <button
-                  className="text-muted-foreground hover:text-foreground ml-1"
-                  onClick={() => { setDateFrom(""); setDateTo(""); }}
-                >
-                  ×
-                </button>
-              )}
-            </div>
-          </div>
-        </div>
-
-        {/* Tabs */}
-        <div className="flex gap-1 border-b border-border">
-          {(["tree", "analytics", "table"] as const).map((t) => (
-            <button
-              key={t}
-              onClick={() => handleTabChange(t)}
-              className={cn(
-                "px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-                activeTab === t
-                  ? "border-primary text-primary"
-                  : "border-transparent text-muted-foreground hover:text-foreground"
-              )}
-            >
-              {t === "tree" && "📋 Дерево"}
-              {t === "analytics" && "📊 Аналитика"}
-              {t === "table" && "🗃 Таблица"}
-            </button>
-          ))}
-          <a
-            href="/income/categories"
-            className="px-4 py-2 text-sm font-medium border-b-2 border-transparent text-muted-foreground hover:text-foreground transition-colors"
-          >
-            ⚙ Категории →
-          </a>
-        </div>
-
-        {activeTab === "tree" && <TreeTab dateRange={dr} />}
-        {activeTab === "analytics" && <AnalyticsTab dateRange={dr} />}
-        {activeTab === "table" && <TableTab dateRange={dr} />}
-      </div>
-    </FinanceLayout>
-  );
-}
-
-// =====================
-// Tree Tab
-// =====================
-
-function TreeTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const { data, isLoading, isError } = useIncomeTreeSummary(dateRange);
-  const [search, setSearch] = useState("");
-  const [visibleCols, setVisibleCols] = useState<Set<string>>(() => {
-    const saved = localStorage.getItem(COLS_KEY);
-    return new Set(saved ? JSON.parse(saved) : ["total"]);
-  });
-  const [allExpanded, setAllExpanded] = useState(true);
-
-  const toggleCol = (col: string) => {
-    const next = new Set(visibleCols);
-    if (next.has(col)) next.delete(col);
-    else next.add(col);
-    setVisibleCols(next);
-    localStorage.setItem(COLS_KEY, JSON.stringify(Array.from(next)));
-  };
-
-  if (isLoading) {
-    return (
-      <div className="space-y-2">
-        {Array.from({ length: 8 }).map((_, i) => (
-          <Skeleton key={i} className="h-8 w-full" />
-        ))}
-      </div>
-    );
-  }
-
-  if (isError) return <DatabaseError />;
-
-  const trees = data?.trees ?? [];
-  const uncategorized = data?.uncategorized ?? { total: 0, count: 0 };
-  const grandTotal = data?.grandTotal ?? { total: 0, count: 0 };
-
-  return (
-    <div className="space-y-4">
-      {/* Controls */}
-      <div className="flex items-center justify-between flex-wrap gap-2">
-        <div className="flex items-center gap-2">
-          <span className="text-sm font-medium text-muted-foreground">Статьи доходов</span>
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button variant="outline" size="sm" className="h-7 text-xs gap-1">
-                <Settings2 className="w-3.5 h-3.5" /> Столбцы
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-40 p-2">
-              {[
-                { key: "total", label: "Сумма" },
-                { key: "count", label: "Кол-во" },
-                { key: "percent", label: "% от итого" },
-              ].map((c) => (
-                <label key={c.key} className="flex items-center gap-2 py-1 text-xs cursor-pointer">
-                  <input
-                    type="checkbox"
-                    checked={visibleCols.has(c.key)}
-                    onChange={() => toggleCol(c.key)}
-                  />
-                  {c.label}
-                </label>
-              ))}
-            </PopoverContent>
-          </Popover>
-          <div className="relative">
-            <Search className="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
-            <Input
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              placeholder="Поиск..."
-              className="h-7 w-44 text-xs pl-8"
-            />
-            {search && (
-              <button className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground" onClick={() => setSearch("")}>×</button>
-            )}
-          </div>
-        </div>
-        <div className="flex items-center gap-1">
-          <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={() => setAllExpanded(true)}>Развернуть все</Button>
-          <Button variant="ghost" size="sm" className="h-6 text-xs" onClick={() => setAllExpanded(false)}>Свернуть все</Button>
-        </div>
-      </div>
-
-      {/* Trees */}
-      <div className="space-y-3">
-        {trees.map((tree: any) => (
-          <TreeCard
-            key={tree.id}
-            tree={tree}
-            visibleCols={visibleCols}
-            searchTerm={search}
-            grandTotal={grandTotal.total}
-          />
-        ))}
-
-        {/* Uncategorized */}
-        <Card>
-          <CardContent className="py-3 px-4">
-            <div className="flex items-center gap-2">
-              <Folder className="w-4 h-4 text-muted-foreground" />
-              <span className="text-sm font-medium flex-1">Нераспределённые</span>
-              {visibleCols.has("total") && (
-                <span className="text-sm font-semibold tabular-nums min-w-[120px] text-right">
-                  {formatCurrency(uncategorized.total)}
-                </span>
-              )}
-              {visibleCols.has("count") && (
-                <span className="text-xs text-muted-foreground tabular-nums min-w-[60px] text-right">
-                  {uncategorized.count}
-                </span>
-              )}
-            </div>
-          </CardContent>
-        </Card>
-
-        {/* Grand Total */}
-        <Card className="border-primary/20 bg-primary/5">
-          <CardContent className="py-3 px-4">
-            <div className="flex items-center gap-2 font-bold">
-              <span className="text-sm flex-1">ИТОГО</span>
-              {visibleCols.has("total") && (
-                <span className="text-sm tabular-nums min-w-[120px] text-right text-primary">
-                  {formatCurrency(grandTotal.total)}
-                </span>
-              )}
-              {visibleCols.has("count") && (
-                <span className="text-xs tabular-nums min-w-[60px] text-right">
-                  {grandTotal.count}
-                </span>
-              )}
-              {visibleCols.has("percent") && (
-                <span className="text-xs tabular-nums min-w-[50px] text-right">100%</span>
-              )}
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-    </div>
-  );
-}
-
-function TreeCard({
-  tree,
-  visibleCols,
-  searchTerm,
-  grandTotal,
-}: {
-  tree: any;
-  visibleCols: Set<string>;
-  searchTerm: string;
-  grandTotal: number;
-}) {
-  const [expanded, setExpanded] = useState(true);
-  const [, setLocation] = useLocation();
-
-  return (
-    <Card>
-      <div
-        className="flex items-center gap-2 py-3 px-4 cursor-pointer hover:bg-muted/30 transition-colors border-b border-border"
-        onClick={() => setExpanded((e) => !e)}
-      >
-        {expanded ? (
-          <ChevronDown className="w-4 h-4 text-muted-foreground" />
-        ) : (
-          <ChevronRight className="w-4 h-4 text-muted-foreground" />
-        )}
-        <FolderOpen className="w-4 h-4 text-primary" />
-        <span className="text-sm font-semibold flex-1">{tree.name}</span>
-        {!tree.isPrimary && (
-          <Badge variant="outline" className="text-[10px]">Отчет</Badge>
-        )}
-        <Badge variant="secondary" className="text-[10px]">{tree.nodes?.length ?? 0} узлов</Badge>
-        {visibleCols.has("total") && (
-          <span className="text-sm font-semibold tabular-nums min-w-[120px] text-right">
-            {formatCurrency(tree.total)}
-          </span>
-        )}
-        {visibleCols.has("count") && (
-          <span className="text-xs text-muted-foreground tabular-nums min-w-[60px] text-right">
-            {tree.count}
-          </span>
-        )}
-      </div>
-
-      {expanded && (
-        <CardContent className="px-2 pb-2 pt-0">
-          <div className="flex items-center gap-2 py-2 px-3 mb-1 text-xs text-muted-foreground font-medium border-b border-border">
-            <span className="ml-[52px] flex-1">Статья</span>
-            {visibleCols.has("total") && <span className="min-w-[120px] text-right">Сумма</span>}
-            {visibleCols.has("count") && <span className="min-w-[60px] text-right">Кол-во</span>}
-            {visibleCols.has("percent") && <span className="min-w-[50px] text-right">%</span>}
-          </div>
-          {tree.nodes?.map((node: TreeNode) => (
-            <TreeNodeRow
-              key={node.id}
-              node={node}
-              depth={0}
-              searchTerm={searchTerm}
-              onSelect={(id) => setLocation(`/income/${id}`)}
-            />
-          ))}
-        </CardContent>
-      )}
-    </Card>
-  );
-}
-
-// =====================
-// Analytics Tab
-// =====================
-
-function AnalyticsTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const [mode, setMode] = useState<"dynamics" | "categories">("dynamics");
-  const [groupBy, setGroupBy] = useState<"month" | "quarter" | "year">("month");
-  const [barMode, setBarMode] = useState<"stacked" | "grouped">(() => {
-    const saved = localStorage.getItem(BARMODE_KEY);
-    return saved === "grouped" ? "grouped" : "stacked";
-  });
-
-  const { data, isLoading } = useIncomeTimeseries(dateRange.from, dateRange.to, groupBy);
-
-  const handleBarModeChange = (m: "stacked" | "grouped") => {
-    setBarMode(m);
-    localStorage.setItem(BARMODE_KEY, m);
-  };
-
-  const chartData = useMemo(() => {
-    if (!data?.periods) return [];
-    return data.periods.map((p, i) => ({
-      period: p,
-      total: data.series[0]?.data[i] ?? 0,
-    }));
-  }, [data]);
-
-  if (isLoading) {
-    return (
-      <div className="space-y-3">
-        <Skeleton className="h-8 w-48" />
-        <Skeleton className="h-[300px] w-full" />
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center gap-4 flex-wrap">
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          <Button
-            size="sm"
-            variant={mode === "dynamics" ? "default" : "ghost"}
-            className="h-7 text-xs"
-            onClick={() => setMode("dynamics")}
-          >
-            Динамика
-          </Button>
-          <Button
-            size="sm"
-            variant={mode === "categories" ? "default" : "ghost"}
-            className="h-7 text-xs"
-            onClick={() => setMode("categories")}
-          >
-            Категории
-          </Button>
-        </div>
-
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          {(["month", "quarter", "year"] as const).map((g) => (
-            <Button
-              key={g}
-              size="sm"
-              variant={groupBy === g ? "default" : "ghost"}
-              className="h-7 text-xs"
-              onClick={() => setGroupBy(g)}
-            >
-              {g === "month" ? "Месяц" : g === "quarter" ? "Квартал" : "Год"}
-            </Button>
-          ))}
-        </div>
-
-        <div className="flex gap-1 bg-muted rounded-lg p-1">
-          <Button
-            size="sm"
-            variant={barMode === "stacked" ? "default" : "ghost"}
-            className="h-7 w-7 p-0"
-            onClick={() => handleBarModeChange("stacked")}
-            title="Стопка"
-          >
-            <Layers className="w-3.5 h-3.5" />
-          </Button>
-          <Button
-            size="sm"
-            variant={barMode === "grouped" ? "default" : "ghost"}
-            className="h-7 w-7 p-0"
-            onClick={() => handleBarModeChange("grouped")}
-            title="Группа"
-          >
-            <BarChart3 className="w-3.5 h-3.5" />
-          </Button>
-        </div>
-      </div>
-
-      <Card>
-        <CardHeader className="pb-2">
-          <CardTitle className="text-base font-semibold">
-            Динамика доходов
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          {chartData.length === 0 ? (
-            <div className="text-center py-8 text-sm text-muted-foreground">Нет данных</div>
-          ) : (
-            <AnalyticsChart
-              data={chartData}
-              series={[{ key: "total", label: "Доходы" }]}
-              periods={data?.periods ?? []}
-              barMode={barMode}
-            />
-          )}
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
-
-// =====================
-// Table Tab
-// =====================
-
-function TableTab({ dateRange }: { dateRange: { from?: string; to?: string } }) {
-  const { data: tableConfig } = useTableConfig();
-  const columnLabels = tableConfig?.config?.columnLabels ?? {};
-
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(50);
-  const [sortBy, setSortBy] = useState("data");
-  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
-  const [filters, setFilters] = useState<Record<string, string>>({});
-  const [visibleCols, setVisibleCols] = useState<string[]>(() => {
-    const saved = localStorage.getItem(TABLE_COLS_KEY);
-    return saved ? JSON.parse(saved) : DEFAULT_VISIBLE;
-  });
-  const [colOrder, setColOrder] = useState<string[]>(() => {
-    const saved = localStorage.getItem(TABLE_ORDER_KEY);
-    return saved ? JSON.parse(saved) : DEFAULT_VISIBLE;
-  });
-  const [overrideOpen, setOverrideOpen] = useState(false);
-  const [overrideRecordId, setOverrideRecordId] = useState<string>("");
-
-  const { data, isLoading } = useIncome(page, pageSize, sortBy, sortDir, filters, dateRange);
-  const { data: catData } = useIncomeCategories();
-  const createOverride = useCreateOverride();
-  const deleteOverride = useDeleteOverride();
-
-  const handleSort = (col: string) => {
-    if (sortBy === col) {
-      setSortDir((d) => (d === "desc" ? "asc" : "desc"));
-    } else {
-      setSortBy(col);
-      setSortDir("desc");
-    }
-  };
-
-  const getSortIcon = (col: string) => {
-    if (sortBy !== col) return <ArrowUpDown className="w-3 h-3 text-muted-foreground/50" />;
-    return sortDir === "asc" ? <ArrowUp className="w-3 h-3" /> : <ArrowDown className="w-3 h-3" />;
-  };
-
-  const rows = data?.rows ?? [];
-  const total = data?.total ?? 0;
-  const totalSum = data?.totalSum ?? 0;
-  const totalPages = data?.totalPages ?? 1;
-
-  useEffect(() => {
-    if (totalPages > 0 && page > totalPages) {
-      setPage(totalPages);
-    }
-  }, [totalPages, page]);
-
-  const allColumns = ALL_COLS.map((k) => ({ key: k, label: columnLabels[k] || k }));
-  const displayCols = colOrder.filter((c) => visibleCols.includes(c) && ALL_COLS.includes(c));
-
-  const activeFilters = Object.entries(filters).filter(([, v]) => v);
-
-  return (
-    <div className="flex flex-col flex-1 min-h-0 min-w-0 space-y-3">
-      {/* Stats + Controls */}
-      <div className="flex flex-wrap items-center gap-3 text-sm">
-        <span className="text-muted-foreground">
-          Найдено: <span className="font-bold">{total}</span> записей
-        </span>
-        {totalSum != null && (
-          <Badge variant="secondary">Итого: {formatCurrency(totalSum)}</Badge>
-        )}
-        {sortBy && (
-          <Badge variant="outline" className="text-[10px]">
-            Сортировка: {columnLabels[sortBy] || sortBy} {sortDir === "asc" ? "↑" : "↓"}
-          </Badge>
-        )}
-        <div className="ml-auto flex items-center gap-2">
-          {activeFilters.length > 0 && (
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-7 text-xs gap-1"
-              onClick={() => { setPage(1); setFilters({}); }}
-            >
-              <RotateCcw className="w-3 h-3" /> Сбросить
-            </Button>
-          )}
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button variant="outline" size="sm" className="h-7 text-xs gap-1">
-                <Settings2 className="w-3.5 h-3.5" /> Столбцы
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-52 p-2">
-              <DraggableColumnList
-                allColumns={allColumns}
-                columnOrder={colOrder}
-                visibleCols={visibleCols}
-                onOrderChange={(o) => { setColOrder(o); localStorage.setItem(TABLE_ORDER_KEY, JSON.stringify(o)); }}
-                onToggle={(k) => {
-                  const next = visibleCols.includes(k) ? visibleCols.filter((c) => c !== k) : [...visibleCols, k];
-                  setVisibleCols(next);
-                  localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(next));
-                }}
-                onShowAll={() => { setVisibleCols(ALL_COLS); localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(ALL_COLS)); }}
-                onReset={() => {
-                  setVisibleCols(DEFAULT_VISIBLE);
-                  setColOrder(DEFAULT_VISIBLE);
-                  localStorage.setItem(TABLE_COLS_KEY, JSON.stringify(DEFAULT_VISIBLE));
-                  localStorage.setItem(TABLE_ORDER_KEY, JSON.stringify(DEFAULT_VISIBLE));
-                }}
-              />
-            </PopoverContent>
-          </Popover>
-        </div>
-      </div>
-
-      {/* Active filters */}
-      {activeFilters.length > 0 && (
-        <div className="flex flex-wrap items-center gap-2">
-          {activeFilters.map(([col, val]) => (
-            <Badge key={col} variant="secondary" className="text-xs gap-1 pl-2.5 pr-1.5">
-              {columnLabels[col] || col}: {val}
-              <button
-                className="ml-1 hover:text-destructive"
-                onClick={() => { setPage(1); setFilters((f) => { const n = { ...f }; delete n[col]; return n; }); }}
-              >
-                ×
-              </button>
-            </Badge>
-          ))}
-          <Button variant="ghost" size="sm" className="h-6 text-xs text-muted-foreground" onClick={() => setFilters({})}>
-            Очистить все
-          </Button>
-        </div>
-      )}
-
-      {/* Table */}
-      <Card className="flex-1 min-h-0 flex flex-col">
-        <div className="overflow-auto flex-1 min-h-0">
-          <table className="w-full text-sm" style={{ minWidth: Math.max(displayCols.length * 120, 800) }}>
-            <thead className="sticky top-0 z-10">
-              <tr className="border-b border-border bg-muted">
-                {displayCols.map((col) => (
-                  <th
-                    key={col}
-                    className={cn(
-                      "px-3 py-2.5 text-xs font-medium text-muted-foreground whitespace-nowrap",
-                      col === "summa" ? "text-right" : "text-left"
-                    )}
-                  >
-                    <div className="flex items-center gap-1">
-                      <span className="cursor-pointer hover:text-foreground" onClick={() => handleSort(col)}>
-                        {columnLabels[col] || col}
-                      </span>
-                      <span className="cursor-pointer" onClick={() => handleSort(col)}>
-                        {getSortIcon(col)}
-                      </span>
-                      <Popover>
-                        <PopoverTrigger asChild>
-                          <button className="ml-0.5 text-muted-foreground/50 hover:text-primary">
-                            <Settings2 className="w-3 h-3" />
-                          </button>
-                        </PopoverTrigger>
-                        <PopoverContent className="w-56 p-2">
-                          <ColumnFilter
-                            column={col}
-                            value={filters[col] || ""}
-                            onChange={(v) => { setPage(1); setFilters((f) => ({ ...f, [col]: v })); }}
-                            placeholder={columnLabels[col] || col}
-                            apiEndpoint="/api/income/column-values"
-                            contextFilters={filters}
-                          />
-                        </PopoverContent>
-                      </Popover>
-                    </div>
-                  </th>
-                ))}
-                <th className="w-10 text-center text-xs font-medium text-muted-foreground">Кат.</th>
-              </tr>
-            </thead>
-            <tbody>
-              {isLoading && rows.length === 0 ? (
-                <tr>
-                  <td colSpan={displayCols.length + 1} className="px-3 py-8 text-center text-muted-foreground">
-                    Загрузка...
-                  </td>
-                </tr>
-              ) : rows.length === 0 ? (
-                <tr>
-                  <td colSpan={displayCols.length + 1} className="px-3 py-12 text-center text-muted-foreground">
-                    Данные не найдены
-                  </td>
-                </tr>
-              ) : (
-                rows.map((row: any, idx: number) => (
-                  <tr
-                    key={row.id ?? idx}
-                    className="border-b border-border last:border-0 transition-colors hover:bg-muted/50"
-                  >
-                    {displayCols.map((col) => {
-                      const val = row[col];
-                      const isSum = col === "summa";
-                      return (
-                        <td
-                          key={col}
-                          className={cn(
-                            "px-3 py-3 whitespace-nowrap",
-                            isSum && "font-medium text-right text-chart-1"
-                          )}
-                        >
-                          {val == null || val === "" || val === "0" ? (
-                            <span className="text-muted-foreground">—</span>
-                          ) : col === "data" ? (
-                            formatDate(val)
-                          ) : isSum ? (
-                            formatCurrency(parseFloat(val) || 0)
-                          ) : col === "statya" ? (
-                            <Badge variant="secondary" className="text-xs">{val}</Badge>
-                          ) : col === "kommentarii" || col === "naznachenieplatezha" || col === "zakazchik" ? (
-                            <CopyableCell text={String(val)} />
-                          ) : (
-                            String(val)
-                          )}
-                        </td>
-                      );
-                    })}
-                    <td className="px-3 py-3 text-center">
-                      <button
-                        className={cn(
-                          "w-5 h-5 flex items-center justify-center rounded transition-colors",
-                          row._override_category_id
-                            ? "text-primary bg-primary/10"
-                            : "text-muted-foreground/40 hover:text-muted-foreground"
-                        )}
-                        onClick={() => {
-                          setOverrideRecordId(row.id);
-                          setOverrideOpen(true);
-                        }}
-                        title="Назначить категорию"
-                      >
-                        <Tag className="w-3.5 h-3.5" />
-                      </button>
-                    </td>
-                  </tr>
-                ))
-              )}
-            </tbody>
-          </table>
-        </div>
-
-        {/* Pagination */}
-        {totalPages > 1 && (
-          <div className="flex items-center justify-between px-4 py-3 border-t">
-            <span className="text-xs text-muted-foreground">
-              Стр. {page} из {totalPages}
-            </span>
-            <div className="flex items-center gap-1">
-              <select
-                value={pageSize}
-                onChange={(e) => { setPageSize(Number(e.target.value)); setPage(1); }}
-                className="h-7 text-xs rounded border bg-background px-1 mr-2"
-              >
-                <option value={25}>25</option>
-                <option value={50}>50</option>
-                <option value={100}>100</option>
-                <option value={200}>200</option>
-              </select>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(1)} disabled={page <= 1}>≪</Button>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page - 1)} disabled={page <= 1}>＜</Button>
-              <span className="text-xs px-2">{page} / {totalPages}</span>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page + 1)} disabled={page >= totalPages}>＞</Button>
-              <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(totalPages)} disabled={page >= totalPages}>≫</Button>
-            </div>
-          </div>
-        )}
-      </Card>
-
-      <CategoryOverrideDialog
-        open={overrideOpen}
-        onOpenChange={setOverrideOpen}
-        recordId={overrideRecordId}
-        recordType="income"
-        currentOverrideCategoryId={null}
-        categories={catData?.categories ?? []}
-        onAssign={(recordId, categoryId) => {
-          createOverride.mutate({ type: "income", recordId, categoryId });
-        }}
-        onReset={(recordId) => {
-          deleteOverride.mutate({ type: "income", recordId });
-        }}
-      />
-    </div>
-  );
-}
diff --git a/client/src/pages/finance/income.tsx b/client/src/pages/finance/income.tsx
deleted file mode 100644
index aa78e44..0000000
--- a/client/src/pages/finance/income.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import { useState, useEffect } from "react";
-import { useRoute } from "wouter";
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-import { Card, CardContent } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Input } from "@/components/ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { ColumnFilter } from "@/components/finance/ColumnFilter";
-import { CopyableCell } from "@/components/finance/CopyableCell";
-import { CategoryOverrideDialog } from "@/components/finance/CategoryOverrideDialog";
-import { formatCurrency, formatDate } from "@/lib/format";
-import { cn } from "@/lib/utils";
-import {
-  useIncomeByCategory,
-  useIncomeCategories,
-  useTableConfig,
-  useCreateOverride,
-  useDeleteOverride,
-} from "@/hooks/useFinance";
-import { ArrowUpDown, ArrowUp, ArrowDown, RotateCcw, Settings2, Tag } from "lucide-react";
-
-export default function IncomeDetailPage() {
-  const [match, params] = useRoute("/income/:categoryId");
-  const categoryId = params?.categoryId ?? "";
-  const isUncategorized = categoryId === "uncategorized";
-
-  const { data: catData } = useIncomeCategories();
-  const category = findCategory(catData?.categories ?? [], categoryId);
-  const categoryName = isUncategorized
-    ? "Доходы (нераспределённые)"
-    : category?.name ?? categoryId;
-
-  const [dateFrom, setDateFrom] = useState("");
-  const [dateTo, setDateTo] = useState("");
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(50);
-  const [sortBy, setSortBy] = useState("data");
-  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
-  const [filters, setFilters] = useState<Record<string, string>>({});
-  const [visibleCols] = useState(["data", "summa", "statya", "zakazchik", "kommentarii"]);
-  const [overrideOpen, setOverrideOpen] = useState(false);
-  const [overrideRecordId, setOverrideRecordId] = useState("");
-
-  const dr = { from: dateFrom || undefined, to: dateTo || undefined };
-  const { data, isLoading } = useIncomeByCategory(isUncategorized ? null : categoryId, page, pageSize, filters, dr);
-  const { data: tableConfig } = useTableConfig();
-  const columnLabels = tableConfig?.config?.columnLabels ?? {};
-  const createOverride = useCreateOverride();
-  const deleteOverride = useDeleteOverride();
-
-  const handleSort = (col: string) => {
-    if (sortBy === col) setSortDir((d) => (d === "desc" ? "asc" : "desc"));
-    else { setSortBy(col); setSortDir("desc"); }
-  };
-  const getSortIcon = (col: string) => {
-    if (sortBy !== col) return <ArrowUpDown className="w-3 h-3 text-muted-foreground/50" />;
-    return sortDir === "asc" ? <ArrowUp className="w-3 h-3" /> : <ArrowDown className="w-3 h-3" />;
-  };
-
-  const rows = data?.rows ?? [];
-  const total = data?.total ?? 0;
-  const totalSum = data?.totalSum ?? 0;
-  const totalPages = data?.totalPages ?? 1;
-
-  useEffect(() => {
-    if (totalPages > 0 && page > totalPages) {
-      setPage(totalPages);
-    }
-  }, [totalPages, page]);
-
-  const activeFilters = Object.entries(filters).filter(([, v]) => v);
-
-  return (
-    <FinanceLayout
-      showBack
-      mobileNav={<FinanceBottomNav active="income" onChange={() => {}} />}
-    >
-      <div className="space-y-3 h-full flex flex-col overflow-hidden">
-        <div className="flex flex-wrap items-center justify-between gap-4">
-          <div>
-            <h1 className="text-lg font-semibold">{categoryName}</h1>
-            {category && category.rules && category.rules.length > 0 && (
-              <p className="text-xs text-muted-foreground mt-0.5">
-                {category.rules.map((r: any) => `${r.column} = ${r.value}`).join(", ")}
-              </p>
-            )}
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="flex items-center gap-1 bg-muted/50 border border-border rounded-lg px-3 py-1.5">
-              <Input type="date" value={dateFrom} onChange={(e) => setDateFrom(e.target.value)} className="h-7 w-[140px] text-xs bg-transparent border-0 p-0" />
-              <span className="text-xs text-muted-foreground">—</span>
-              <Input type="date" value={dateTo} onChange={(e) => setDateTo(e.target.value)} className="h-7 w-[140px] text-xs bg-transparent border-0 p-0" />
-            </div>
-          </div>
-        </div>
-
-        <div className="flex flex-wrap items-center gap-3 text-sm">
-          <span className="text-muted-foreground">Найдено: <span className="font-bold">{total}</span></span>
-          {totalSum != null && <Badge variant="secondary">Итого: {formatCurrency(totalSum)}</Badge>}
-          {activeFilters.length > 0 && (
-            <Button variant="ghost" size="sm" className="h-7 text-xs gap-1" onClick={() => { setPage(1); setFilters({}); }}>
-              <RotateCcw className="w-3 h-3" /> Сбросить
-            </Button>
-          )}
-        </div>
-
-        {activeFilters.length > 0 && (
-          <div className="flex flex-wrap items-center gap-2">
-            {activeFilters.map(([col, val]) => (
-              <Badge key={col} variant="secondary" className="text-xs gap-1">
-                {columnLabels[col] || col}: {val}
-                <button onClick={() => { setPage(1); setFilters((f) => { const n = { ...f }; delete n[col]; return n; }); }}>×</button>
-              </Badge>
-            ))}
-          </div>
-        )}
-
-        <Card className="flex-1 min-h-0 flex flex-col">
-          <div className="overflow-auto flex-1 min-h-0">
-            <table className="w-full text-sm" style={{ minWidth: Math.max(visibleCols.length * 120, 800) }}>
-              <thead className="sticky top-0 z-10 bg-muted">
-                <tr className="border-b border-border">
-                  {visibleCols.map((col) => (
-                    <th key={col} className={cn("px-3 py-2.5 text-xs font-medium text-muted-foreground", col === "summa" ? "text-right" : "text-left")}>
-                      <div className="flex items-center gap-1">
-                        <span className="cursor-pointer" onClick={() => handleSort(col)}>{columnLabels[col] || col}</span>
-                        <span onClick={() => handleSort(col)}>{getSortIcon(col)}</span>
-                        <Popover>
-                          <PopoverTrigger asChild>
-                            <button className="ml-0.5 text-muted-foreground/50 hover:text-primary"><Settings2 className="w-3 h-3" /></button>
-                          </PopoverTrigger>
-                          <PopoverContent className="w-56 p-2">
-                            <ColumnFilter column={col} value={filters[col] || ""} onChange={(v) => { setPage(1); setFilters((f) => ({ ...f, [col]: v })); }} placeholder={columnLabels[col] || col} apiEndpoint="/api/income/column-values" contextFilters={filters} />
-                          </PopoverContent>
-                        </Popover>
-                      </div>
-                    </th>
-                  ))}
-                  <th className="w-10 text-center text-xs">Кат.</th>
-                </tr>
-              </thead>
-              <tbody>
-                {isLoading && rows.length === 0 ? (
-                  <tr><td colSpan={visibleCols.length + 1} className="px-3 py-8 text-center text-muted-foreground">Загрузка...</td></tr>
-                ) : rows.length === 0 ? (
-                  <tr><td colSpan={visibleCols.length + 1} className="px-3 py-12 text-center text-muted-foreground">Данные не найдены</td></tr>
-                ) : (
-                  rows.map((row: any, idx: number) => (
-                    <tr key={row.id ?? idx} className="border-b border-border last:border-0 hover:bg-muted/50">
-                      {visibleCols.map((col) => {
-                        const val = row[col];
-                        const isSum = col === "summa";
-                        return (
-                          <td key={col} className={cn("px-3 py-3 whitespace-nowrap", isSum && "font-medium text-right text-chart-1")}>
-                            {val == null || val === "" ? <span className="text-muted-foreground">—</span>
-                              : col === "data" ? formatDate(val)
-                              : isSum ? formatCurrency(parseFloat(val) || 0)
-                              : col === "kommentarii" || col === "naznachenieplatezha" || col === "zakazchik" ? <CopyableCell text={String(val)} />
-                              : String(val)}
-                          </td>
-                        );
-                      })}
-                      <td className="px-3 py-3 text-center">
-                        <button className={cn("w-5 h-5 flex items-center justify-center rounded", row._override_category_id ? "text-primary bg-primary/10" : "text-muted-foreground/40 hover:text-muted-foreground")} onClick={() => { setOverrideRecordId(row.id); setOverrideOpen(true); }}>
-                          <Tag className="w-3.5 h-3.5" />
-                        </button>
-                      </td>
-                    </tr>
-                  ))
-                )}
-              </tbody>
-            </table>
-          </div>
-          {totalPages > 1 && (
-            <div className="flex items-center justify-between px-4 py-3 border-t">
-              <span className="text-xs text-muted-foreground">Стр. {page} из {totalPages}</span>
-              <div className="flex items-center gap-1">
-                <select value={pageSize} onChange={(e) => { setPageSize(Number(e.target.value)); setPage(1); }} className="h-7 text-xs rounded border bg-background px-1 mr-2">
-                  <option value={25}>25</option><option value={50}>50</option><option value={100}>100</option><option value={200}>200</option>
-                </select>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(1)} disabled={page <= 1}>≪</Button>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page - 1)} disabled={page <= 1}>＜</Button>
-                <span className="text-xs px-2">{page} / {totalPages}</span>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(page + 1)} disabled={page >= totalPages}>＞</Button>
-                <Button variant="outline" size="icon" className="h-7 w-7" onClick={() => setPage(totalPages)} disabled={page >= totalPages}>≫</Button>
-              </div>
-            </div>
-          )}
-        </Card>
-
-        <CategoryOverrideDialog
-          open={overrideOpen}
-          onOpenChange={setOverrideOpen}
-          recordId={overrideRecordId}
-          recordType="income"
-          categories={catData?.categories ?? []}
-          onAssign={(recordId, categoryId) => createOverride.mutate({ type: "income", recordId, categoryId })}
-          onReset={(recordId) => deleteOverride.mutate({ type: "income", recordId })}
-        />
-      </div>
-    </FinanceLayout>
-  );
-}
-
-function findCategory(cats: any[], id: string): any | null {
-  for (const c of cats) {
-    if (c.id === id) return c;
-    if (c.children) {
-      const found = findCategory(c.children, id);
-      if (found) return found;
-    }
-  }
-  return null;
-}
diff --git a/client/src/pages/finance/index.ts b/client/src/pages/finance/index.ts
deleted file mode 100644
index d0b0b2b..0000000
--- a/client/src/pages/finance/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Barrel export for finance pages
-export { default as FinanceDashboard } from "./dashboard";
-export { default as IncomeOverview } from "./income-overview";
-export { default as ExpensesOverview } from "./expenses-overview";
-export { default as IncomeDetail } from "./income";
-export { default as ExpensesDetail } from "./expenses";
-export { default as IncomeCategories } from "./income-categories";
-export { default as ExpenseCategories } from "./expense-categories";
-export { default as FinanceSettingsPage } from "./settings";
diff --git a/client/src/pages/finance/settings.tsx b/client/src/pages/finance/settings.tsx
deleted file mode 100644
index 91e0be4..0000000
--- a/client/src/pages/finance/settings.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { FinanceLayout } from "@/components/finance/FinanceLayout";
-import { FinanceSettingsPanel } from "@/components/finance/FinanceSettings";
-import { FinanceBottomNav } from "@/components/finance/FinanceBottomNav";
-
-export default function FinanceSettingsPage() {
-  return (
-    <FinanceLayout
-      mobileNav={<FinanceBottomNav active="settings" onChange={() => {}} />}
-    >
-      <div className="space-y-4">
-        <h1 className="text-xl font-bold">Настройки</h1>
-        <FinanceSettingsPanel />
-      </div>
-    </FinanceLayout>
-  );
-}
diff --git a/client/src/pages/salary.tsx b/client/src/pages/salary.tsx
deleted file mode 100644
index 3a59694..0000000
--- a/client/src/pages/salary.tsx
+++ /dev/null
@@ -1,1041 +0,0 @@
-import { useState, useMemo } from "react";
-import Layout from "@/components/Layout";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-import { MultiSelectPopover } from "@/components/MultiSelectPopover";
-import { useToast } from "@/hooks/use-toast";
-import { formatCurrency } from "@/lib/utils";
-import {
-  useNeof,
-  useZof,
-  useZofAreas,
-  useAssignZofArea,
-  useDeleteZofAssign,
-  useSalaryDbStatus,
-  useSalaryMonthly,
-  useGoogleStatus,
-  useGoogleAuthUrl,
-  useSalarySync,
-  useSalaryAreas,
-  useCreateSalaryArea,
-  useDeleteSalaryArea,
-} from "@/hooks/useFinance";
-import {
-  Banknote,
-  AlertCircle,
-  ChevronDown,
-  ChevronRight,
-  Users,
-  ArrowRightLeft,
-  BarChart3,
-  Layers,
-  X,
-  RefreshCw,
-  Database,
-  LogIn,
-  ExternalLink,
-  Trash2,
-  Plus,
-} from "lucide-react";
-import {
-  BarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip as ReTooltip,
-  ResponsiveContainer,
-  Legend,
-} from "recharts";
-
-// =====================
-// Helpers
-// =====================
-
-function parsePeriod(p: string): { m: number; y: number } {
-  const parts = p.split(".");
-  const m = parseInt(parts[0], 10) || 0;
-  let y = parseInt(parts[1], 10) || 0;
-  if (y < 50) y += 2000;
-  else if (y < 100) y += 1900;
-  return { m, y };
-}
-
-function periodToNum(p: string): number {
-  const { m, y } = parsePeriod(p);
-  return y * 12 + m;
-}
-
-function periodCompareDesc(a: string, b: string): number {
-  return periodToNum(b) - periodToNum(a);
-}
-
-function periodCompareAsc(a: string, b: string): number {
-  return periodToNum(a) - periodToNum(b);
-}
-
-const MONTH_NAMES = [
-  "Январь","Февраль","Март","Апрель","Май","Июнь",
-  "Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь",
-];
-
-function formatPeriodLabel(p: string): string {
-  const { m, y } = parsePeriod(p);
-  return `${MONTH_NAMES[m - 1] || ""} ${y}`;
-}
-
-const CHART_COLORS = [
-  "#2563eb","#e11d48","#16a34a","#f59e0b","#8b5cf6",
-  "#06b6d4","#ea580c","#84cc16","#ec4899","#14b8a6",
-  "#a855f7","#eab308","#6366f1","#f43f5e","#10b981",
-  "#d946ef","#0ea5e9","#f97316","#22c55e","#e879f9",
-];
-
-// =====================
-// неОФ Tab
-// =====================
-
-function NeofTab() {
-  const { data: neofData, isLoading, isError, refetch } = useNeof();
-  const { data: dbStatus } = useSalaryDbStatus();
-  const [expandedAreas, setExpandedAreas] = useState<Set<string>>(new Set());
-  const [expandedMonths, setExpandedMonths] = useState<Set<string>>(new Set());
-  const [selectedAreas, setSelectedAreas] = useState<Set<string>>(new Set());
-  const [selectedMonths, setSelectedMonths] = useState<Set<string>>(new Set());
-
-  const areas = neofData?.areas ?? [];
-  const allAreaItems = useMemo(() => areas.map((a) => ({ value: a.id, label: a.name })), [areas]);
-  const allMonthSet = useMemo(() => {
-    const s = new Set<string>();
-    areas.forEach((a) => a.months.forEach((m) => s.add(m.month)));
-    return Array.from(s).sort(periodCompareDesc);
-  }, [areas]);
-  const allMonthItems = useMemo(() => allMonthSet.map((m) => ({ value: m, label: formatPeriodLabel(m) })), [allMonthSet]);
-
-  const filteredAreas = useMemo(() => {
-    return areas
-      .filter((a) => selectedAreas.size === 0 || selectedAreas.has(a.id))
-      .map((a) => ({
-        ...a,
-        months: a.months
-          .filter((m) => selectedMonths.size === 0 || selectedMonths.has(m.month))
-          .sort((a, b) => periodCompareDesc(a.month, b.month)),
-      }))
-      .filter((a) => a.months.length > 0);
-  }, [areas, selectedAreas, selectedMonths]);
-
-  const grandTotal = useMemo(() => {
-    let employees = 0, baza = 0, kv = 0;
-    filteredAreas.forEach((a) =>
-      a.months.forEach((m) => {
-        employees += m.employees.length;
-        m.employees.forEach((e) => {
-          baza += e.baza;
-          kv += e.kVydache;
-        });
-      })
-    );
-    return { employees, baza, kv };
-  }, [filteredAreas]);
-
-  const toggleArea = (id: string) => {
-    const next = new Set(expandedAreas);
-    if (next.has(id)) next.delete(id); else next.add(id);
-    setExpandedAreas(next);
-  };
-  const toggleMonth = (key: string) => {
-    const next = new Set(expandedMonths);
-    if (next.has(key)) next.delete(key); else next.add(key);
-    setExpandedMonths(next);
-  };
-
-  if (isLoading) {
-    return (
-      <div className="space-y-3">
-        <Skeleton className="h-16 w-full" />
-        <Skeleton className="h-32 w-full" />
-        <Skeleton className="h-32 w-full" />
-      </div>
-    );
-  }
-
-  if (isError) {
-    return (
-      <Card>
-        <CardContent className="py-6 flex items-center gap-3 text-red-600">
-          <AlertCircle className="w-5 h-5" />
-          <span className="text-sm">Ошибка загрузки данных</span>
-          <Button size="sm" variant="outline" className="ml-auto text-xs" onClick={() => refetch()}>
-            <RefreshCw className="w-3 h-3 mr-1" /> Обновить
-          </Button>
-        </CardContent>
-      </Card>
-    );
-  }
-
-  const hasDbData = (dbStatus?.totalRows ?? 0) > 0;
-
-  return (
-    <div className="space-y-3">
-      {/* Status card */}
-      <Card>
-        <CardContent className="py-3 flex items-center gap-3 flex-wrap">
-          <Database className="w-4 h-4 text-muted-foreground" />
-          <span className="text-xs text-muted-foreground">
-            {dbStatus?.totalRows ?? 0} записей | {dbStatus?.monthCount ?? 0} мес. | {dbStatus?.areas?.length ?? 0} участков
-          </span>
-        </CardContent>
-      </Card>
-
-      {!hasDbData ? (
-        <div className="text-center py-8 text-muted-foreground">
-          <Banknote className="w-8 h-8 mx-auto mb-2 opacity-50" />
-          <p className="text-sm">В базе нет данных. Загрузите данные в таблицу <code>opneof</code>.</p>
-        </div>
-      ) : (
-        <>
-          <div className="flex flex-wrap gap-2">
-            <MultiSelectPopover label="Участки" items={allAreaItems} selected={selectedAreas} onChange={setSelectedAreas} />
-            <MultiSelectPopover label="Месяцы" items={allMonthItems} selected={selectedMonths} onChange={setSelectedMonths} />
-            {(selectedAreas.size > 0 || selectedMonths.size > 0) && (
-              <Button variant="ghost" size="sm" className="h-8 text-xs gap-1" onClick={() => { setSelectedAreas(new Set()); setSelectedMonths(new Set()); }}>
-                <X className="w-3 h-3" /> Сбросить
-              </Button>
-            )}
-          </div>
-
-          {filteredAreas.length > 0 && (
-            <Card className="bg-muted/30">
-              <CardContent className="py-2 flex items-center gap-4 text-xs">
-                <span className="font-medium">Итого:</span>
-                <span>{grandTotal.employees} записей</span>
-                <span>База: {formatCurrency(grandTotal.baza)}</span>
-                <span>К выдаче: {formatCurrency(grandTotal.kv)}</span>
-              </CardContent>
-            </Card>
-          )}
-
-          {filteredAreas.length === 0 && (
-            <div className="text-center py-4 text-xs text-muted-foreground">Нет данных по выбранным фильтрам</div>
-          )}
-
-          <div className="space-y-2">
-            {filteredAreas.map((area) => {
-              const areaExpanded = expandedAreas.has(area.id);
-              const areaBaza = area.months.reduce((s, m) => s + m.employees.reduce((ss, e) => ss + e.baza, 0), 0);
-              const areaKv = area.months.reduce((s, m) => s + m.employees.reduce((ss, e) => ss + e.kVydache, 0), 0);
-              return (
-                <Card key={area.id} className="overflow-hidden">
-                  <CardHeader className="py-2 px-3 cursor-pointer" onClick={() => toggleArea(area.id)}>
-                    <div className="flex items-center justify-between">
-                      <div className="flex items-center gap-2">
-                        {areaExpanded ? <ChevronDown className="w-4 h-4 text-muted-foreground" /> : <ChevronRight className="w-4 h-4 text-muted-foreground" />}
-                        <CardTitle className="text-xs font-semibold">{area.name}</CardTitle>
-                        <Badge variant="outline" className="text-[10px]">{area.months.length} мес.</Badge>
-                      </div>
-                      <div className="hidden sm:flex items-center gap-2 text-[11px] text-muted-foreground">
-                        <span>База: {formatCurrency(areaBaza)}</span>
-                        <span>К выдаче: {formatCurrency(areaKv)}</span>
-                      </div>
-                    </div>
-                  </CardHeader>
-                  {areaExpanded && (
-                    <CardContent className="px-3 pb-3 pt-0 space-y-2">
-                      {area.months.map((month) => {
-                        const key = `${area.id}_${month.month}`;
-                        const monthExpanded = expandedMonths.has(key);
-                        const monthBaza = month.employees.reduce((s, e) => s + e.baza, 0);
-                        const monthKv = month.employees.reduce((s, e) => s + e.kVydache, 0);
-                        return (
-                          <div key={key} className="border rounded-lg overflow-hidden">
-                            <button
-                              className="w-full flex items-center justify-between px-2 py-1.5 text-xs hover:bg-muted/50 transition-colors"
-                              onClick={() => toggleMonth(key)}
-                            >
-                              <div className="flex items-center gap-2">
-                                {monthExpanded ? <ChevronDown className="w-3 h-3 text-muted-foreground" /> : <ChevronRight className="w-3 h-3 text-muted-foreground" />}
-                                <span className="font-medium">{formatPeriodLabel(month.month)}</span>
-                                <Badge variant="secondary" className="text-[10px] gap-1"><Users className="w-3 h-3" />{month.employees.length}</Badge>
-                              </div>
-                              <div className="hidden sm:flex items-center gap-2 text-[11px] text-muted-foreground">
-                                <span>База: {formatCurrency(monthBaza)}</span>
-                                <span>К выдаче: {formatCurrency(monthKv)}</span>
-                              </div>
-                            </button>
-                            {monthExpanded && (
-                              <div className="px-2 pb-2">
-                                <table className="w-full text-[11px]">
-                                  <thead className="bg-muted">
-                                    <tr><th className="px-2 py-1 text-left font-medium text-muted-foreground">ФИО</th><th className="px-2 py-1 text-right font-medium text-muted-foreground">База</th><th className="px-2 py-1 text-right font-medium text-muted-foreground">К выдаче</th></tr>
-                                  </thead>
-                                  <tbody>
-                                    {month.employees.map((emp, idx) => (
-                                      <tr key={idx} className="border-t"><td className="px-2 py-1">{emp.fio}</td><td className="px-2 py-1 text-right">{formatCurrency(emp.baza)}</td><td className="px-2 py-1 text-right">{formatCurrency(emp.kVydache)}</td></tr>
-                                    ))}
-                                  </tbody>
-                                </table>
-                              </div>
-                            )}
-                          </div>
-                        );
-                      })}
-                    </CardContent>
-                  )}
-                </Card>
-              );
-            })}
-          </div>
-        </>
-      )}
-    </div>
-  );
-}
-
-// =====================
-// ОФ Tab
-// =====================
-
-function ZofTab() {
-  const { data: zofData, isLoading, isError, refetch } = useZof();
-  const { data: areasData } = useZofAreas();
-  const assignMutation = useAssignZofArea();
-  const deleteAssignMutation = useDeleteZofAssign();
-  const [expandedAreas, setExpandedAreas] = useState<Set<string>>(new Set());
-  const [expandedMonths, setExpandedMonths] = useState<Set<string>>(new Set());
-  const [selectedAreas, setSelectedAreas] = useState<Set<string>>(new Set());
-  const [selectedMonths, setSelectedMonths] = useState<Set<string>>(new Set());
-  const [assigning, setAssigning] = useState<string | null>(null);
-
-  const areas = zofData?.areas ?? [];
-  const areaItems = useMemo(() => areas.map((a) => ({ value: a.id, label: a.name })), [areas]);
-  const allMonthSet = useMemo(() => {
-    const s = new Set<string>();
-    areas.forEach((a) => a.months.forEach((m) => s.add(m.month)));
-    return Array.from(s).sort(periodCompareDesc);
-  }, [areas]);
-  const monthItems = useMemo(() => allMonthSet.map((m) => ({ value: m, label: formatPeriodLabel(m) })), [allMonthSet]);
-
-  const filteredAreas = useMemo(() => {
-    return areas
-      .filter((a) => selectedAreas.size === 0 || selectedAreas.has(a.id))
-      .map((a) => ({
-        ...a,
-        months: a.months
-          .filter((m) => selectedMonths.size === 0 || selectedMonths.has(m.month))
-          .sort((a, b) => periodCompareDesc(a.month, b.month)),
-      }))
-      .filter((a) => a.months.length > 0);
-  }, [areas, selectedAreas, selectedMonths]);
-
-  const grandTotal = useMemo(() => {
-    let count = 0, nach = 0, ndfl = 0, strah = 0;
-    filteredAreas.forEach((a) =>
-      a.months.forEach((m) => {
-        count += m.employees.length;
-        m.employees.forEach((e) => {
-          nach += e.nachislenobezndfl;
-          ndfl += e.summandfl;
-          strah += e.strahov;
-        });
-      })
-    );
-    return { count, nach, ndfl, strah };
-  }, [filteredAreas]);
-
-  const toggleArea = (id: string) => {
-    const next = new Set(expandedAreas);
-    if (next.has(id)) next.delete(id); else next.add(id);
-    setExpandedAreas(next);
-  };
-  const toggleMonth = (key: string) => {
-    const next = new Set(expandedMonths);
-    if (next.has(key)) next.delete(key); else next.add(key);
-    setExpandedMonths(next);
-  };
-
-  const handleAssign = (fioLetters: string, fioDisplay: string, areaId: string, areaName: string, canonicalFio: string) => {
-    assignMutation.mutate({ fioLetters, fioDisplay, areaId, areaName, canonicalFio });
-    setAssigning(null);
-  };
-
-  if (isLoading) {
-    return (
-      <div className="space-y-3">
-        <Skeleton className="h-16 w-full" />
-        <Skeleton className="h-32 w-full" />
-        <Skeleton className="h-32 w-full" />
-      </div>
-    );
-  }
-
-  if (isError) {
-    return (
-      <Card>
-        <CardContent className="py-6 flex items-center gap-3 text-red-600">
-          <AlertCircle className="w-5 h-5" />
-          <span className="text-sm">Ошибка загрузки данных</span>
-          <Button size="sm" variant="outline" className="ml-auto text-xs" onClick={() => refetch()}>
-            <RefreshCw className="w-3 h-3 mr-1" /> Обновить
-          </Button>
-        </CardContent>
-      </Card>
-    );
-  }
-
-  return (
-    <div className="space-y-3">
-      <div className="flex flex-wrap gap-2">
-        <MultiSelectPopover label="Участки" items={areaItems} selected={selectedAreas} onChange={setSelectedAreas} />
-        <MultiSelectPopover label="Месяцы" items={monthItems} selected={selectedMonths} onChange={setSelectedMonths} />
-        {(selectedAreas.size > 0 || selectedMonths.size > 0) && (
-          <Button variant="ghost" size="sm" className="h-8 text-xs gap-1" onClick={() => { setSelectedAreas(new Set()); setSelectedMonths(new Set()); }}>
-            <X className="w-3 h-3" /> Сбросить
-          </Button>
-        )}
-      </div>
-
-      {filteredAreas.length > 0 && (
-        <Card className="bg-muted/30">
-          <CardContent className="py-2 flex items-center gap-4 text-xs flex-wrap">
-            <span className="font-medium">Итого:</span>
-            <span>{grandTotal.count} записей</span>
-            <span>Нач. б/НДФЛ: {formatCurrency(grandTotal.nach)}</span>
-            <span>НДФЛ: {formatCurrency(grandTotal.ndfl)}</span>
-            <span>Страх.: {formatCurrency(grandTotal.strah)}</span>
-          </CardContent>
-        </Card>
-      )}
-
-      {filteredAreas.length === 0 && !isLoading && (
-        <div className="text-center py-8 text-muted-foreground">
-          <Banknote className="w-8 h-8 mx-auto mb-2 opacity-50" />
-          <p className="text-sm">Нет данных</p>
-        </div>
-      )}
-
-      <div className="space-y-2">
-        {filteredAreas.map((area) => {
-          const areaExpanded = expandedAreas.has(area.id);
-          const areaNach = area.months.reduce((s, m) => s + m.employees.reduce((ss, e) => ss + e.nachislenobezndfl, 0), 0);
-          const areaNdfl = area.months.reduce((s, m) => s + m.employees.reduce((ss, e) => ss + e.summandfl, 0), 0);
-          const areaStrah = area.months.reduce((s, m) => s + m.employees.reduce((ss, e) => ss + e.strahov, 0), 0);
-          return (
-            <Card key={area.id} className="overflow-hidden">
-              <CardHeader className="py-2 px-3 cursor-pointer" onClick={() => toggleArea(area.id)}>
-                <div className="flex items-center justify-between">
-                  <div className="flex items-center gap-2">
-                    {areaExpanded ? <ChevronDown className="w-4 h-4 text-muted-foreground" /> : <ChevronRight className="w-4 h-4 text-muted-foreground" />}
-                    <CardTitle className="text-xs font-semibold">{area.name}</CardTitle>
-                    <Badge variant="outline" className="text-[10px]">{area.months.length} мес.</Badge>
-                  </div>
-                  <div className="hidden sm:flex items-center gap-2 text-[11px] text-muted-foreground">
-                    <span>Нач: {formatCurrency(areaNach)}</span>
-                    <span>НДФЛ: {formatCurrency(areaNdfl)}</span>
-                    <span>Страх: {formatCurrency(areaStrah)}</span>
-                  </div>
-                </div>
-              </CardHeader>
-              {areaExpanded && (
-                <CardContent className="px-3 pb-3 pt-0 space-y-2">
-                  {area.months.map((month) => {
-                    const key = `${area.id}_${month.month}`;
-                    const monthExpanded = expandedMonths.has(key);
-                    const monthNach = month.employees.reduce((s, e) => s + e.nachislenobezndfl, 0);
-                    const monthNdfl = month.employees.reduce((s, e) => s + e.summandfl, 0);
-                    const monthStrah = month.employees.reduce((s, e) => s + e.strahov, 0);
-                    return (
-                      <div key={key} className="border rounded-lg overflow-hidden">
-                        <button
-                          className="w-full flex items-center justify-between px-2 py-1.5 text-xs hover:bg-muted/50 transition-colors"
-                          onClick={() => toggleMonth(key)}
-                        >
-                          <div className="flex items-center gap-2">
-                            {monthExpanded ? <ChevronDown className="w-3 h-3 text-muted-foreground" /> : <ChevronRight className="w-3 h-3 text-muted-foreground" />}
-                            <span className="font-medium">{formatPeriodLabel(month.month)}</span>
-                            <Badge variant="secondary" className="text-[10px] gap-1"><Users className="w-3 h-3" />{month.employees.length}</Badge>
-                          </div>
-                          <div className="hidden sm:flex items-center gap-2 text-[11px] text-muted-foreground">
-                            <span>Нач: {formatCurrency(monthNach)}</span>
-                            <span>НДФЛ: {formatCurrency(monthNdfl)}</span>
-                            <span>Страх: {formatCurrency(monthStrah)}</span>
-                          </div>
-                        </button>
-                        {monthExpanded && (
-                          <div className="px-2 pb-2">
-                            <table className="w-full text-[11px]">
-                              <thead className="bg-muted">
-                                <tr>
-                                  <th className="px-2 py-1 text-left font-medium text-muted-foreground">ФИО</th>
-                                  <th className="px-2 py-1 text-right font-medium text-muted-foreground">Нач. б/НДФЛ</th>
-                                  <th className="px-2 py-1 text-right font-medium text-muted-foreground">НДФЛ</th>
-                                  <th className="px-2 py-1 text-right font-medium text-muted-foreground">Страх.</th>
-                                  <th className="px-2 py-1 text-right font-medium text-muted-foreground"></th>
-                                </tr>
-                              </thead>
-                              <tbody>
-                                {month.employees.map((emp, idx) => (
-                                  <tr key={idx} className="border-t">
-                                    <td className="px-2 py-1">{emp.fio}</td>
-                                    <td className="px-2 py-1 text-right">{formatCurrency(emp.nachislenobezndfl)}</td>
-                                    <td className="px-2 py-1 text-right">{formatCurrency(emp.summandfl)}</td>
-                                    <td className="px-2 py-1 text-right">{formatCurrency(emp.strahov)}</td>
-                                    <td className="px-2 py-1 text-right">
-                                      <Popover open={assigning === emp.fioLetters} onOpenChange={(o) => setAssigning(o ? emp.fioLetters : null)}>
-                                        <PopoverTrigger asChild>
-                                          <Button
-                                            size="sm"
-                                            variant={area.id === "unassigned" ? "outline" : "ghost"}
-                                            className={`h-6 text-[10px] gap-1 ${area.id === "unassigned" ? "text-amber-600 border-amber-200 hover:bg-amber-50" : "opacity-40 hover:opacity-100"}`}
-                                          >
-                                            {area.id === "unassigned" ? (
-                                              <><ArrowRightLeft className="w-3 h-3" /> Участок</>
-                                            ) : (
-                                              <ArrowRightLeft className="w-3 h-3" />
-                                            )}
-                                          </Button>
-                                        </PopoverTrigger>
-                                        <PopoverContent className="w-56 p-2">
-                                          <div className="text-xs font-medium mb-1.5">
-                                            {area.id === "unassigned" ? "Назначить участок:" : "Переместить в участок:"}
-                                          </div>
-                                          <div className="space-y-0.5 max-h-48 overflow-y-auto">
-                                            {areasData?.areas?.map((a) => (
-                                              <button
-                                                key={a.id}
-                                                className={`w-full flex items-center gap-2 px-2 py-1 rounded text-xs transition-colors ${a.id === area.id ? "bg-primary/10 text-primary" : "hover:bg-muted"}`}
-                                                onClick={() => handleAssign(emp.fioLetters, emp.fio, a.id, a.name, emp.canonicalFio)}
-                                              >
-                                                {a.id === area.id && <ChevronDown className="w-3 h-3" />}
-                                                {a.name}
-                                              </button>
-                                            ))}
-                                            {area.id !== "unassigned" && (
-                                              <button
-                                                className="w-full flex items-center gap-2 px-2 py-1 rounded text-xs text-red-600 hover:bg-red-50 transition-colors"
-                                                onClick={() => { deleteAssignMutation.mutate(emp.fioLetters); setAssigning(null); }}
-                                              >
-                                                <X className="w-3 h-3" /> Сбросить привязку
-                                              </button>
-                                            )}
-                                          </div>
-                                        </PopoverContent>
-                                      </Popover>
-                                    </td>
-                                  </tr>
-                                ))}
-                              </tbody>
-                            </table>
-                          </div>
-                        )}
-                      </div>
-                    );
-                  })}
-                </CardContent>
-              )}
-            </Card>
-          );
-        })}
-      </div>
-    </div>
-  );
-}
-
-// =====================
-// Analytics Tab
-// =====================
-
-function AnalyticsTab() {
-  const { data: neofData, isLoading } = useNeof();
-  const { data: dbStatus } = useSalaryDbStatus();
-  const [metric, setMetric] = useState<"kVydache" | "baza">("kVydache");
-  const [drillAreaId, setDrillAreaId] = useState<string | null>(null);
-  const [drillAreaName, setDrillAreaName] = useState("");
-  const [barMode, setBarMode] = useState<"stacked" | "grouped">(() => {
-    const saved = localStorage.getItem("omegaprom_salary_barmode");
-    return saved === "grouped" ? "grouped" : "stacked";
-  });
-  const [filterAreas, setFilterAreas] = useState<Set<string>>(new Set());
-  const [filterEmployees, setFilterEmployees] = useState<Set<string>>(new Set());
-
-  const areas = neofData?.areas ?? [];
-  const hasData = (dbStatus?.totalRows ?? 0) > 0;
-
-  const allPeriods = useMemo(() => {
-    const s = new Set<string>();
-    areas.forEach((a) => a.months.forEach((m) => s.add(m.month)));
-    return Array.from(s).sort(periodCompareAsc);
-  }, [areas]);
-
-  const allAreaItems = useMemo(() => areas.map((a) => ({ value: a.id, label: a.name })), [areas]);
-
-  const filteredData = useMemo(() => {
-    return areas
-      .filter((a) => filterAreas.size === 0 || filterAreas.has(a.id))
-      .map((a) => ({
-        ...a,
-        months: a.months.map((m) => ({
-          ...m,
-          employees: m.employees.filter((e) => filterEmployees.size === 0 || filterEmployees.has(e.fio)),
-        })).filter((m) => m.employees.length > 0),
-      }))
-      .filter((a) => a.months.length > 0);
-  }, [areas, filterAreas, filterEmployees]);
-
-  const allEmployeeNames = useMemo(() => {
-    const s = new Set<string>();
-    filteredData.forEach((a) => a.months.forEach((m) => m.employees.forEach((e) => s.add(e.fio))));
-    return Array.from(s).sort();
-  }, [filteredData]);
-
-  const employeeItems = useMemo(() => allEmployeeNames.map((n) => ({ value: n, label: n })), [allEmployeeNames]);
-
-  // Chart data without drilldown
-  const chartDataNoDrill = useMemo(() => {
-    if (drillAreaId) return [];
-    return allPeriods.map((period) => {
-      const row: Record<string, any> = { period };
-      filteredData.forEach((area) => {
-        const month = area.months.find((m) => m.month === period);
-        row[area.id] = month ? month.employees.reduce((s, e) => s + (metric === "kVydache" ? e.kVydache : e.baza), 0) : 0;
-      });
-      return row;
-    });
-  }, [allPeriods, filteredData, metric, drillAreaId]);
-
-  // Chart data with drilldown
-  const chartDataDrill = useMemo(() => {
-    if (!drillAreaId) return [];
-    const area = filteredData.find((a) => a.id === drillAreaId);
-    if (!area) return [];
-    const employees = new Set<string>();
-    area.months.forEach((m) => m.employees.forEach((e) => employees.add(e.fio)));
-    return Array.from(employees).map((fio) => {
-      const row: Record<string, any> = { employee: fio };
-      area.months.forEach((m) => {
-        const emp = m.employees.find((e) => e.fio === fio);
-        row[m.month] = emp ? (metric === "kVydache" ? emp.kVydache : emp.baza) : 0;
-        row[`__baza__${m.month}`] = emp ? emp.baza : 0;
-      });
-      return row;
-    });
-  }, [filteredData, drillAreaId, metric]);
-
-  const series = useMemo(() => {
-    if (drillAreaId) {
-      const area = filteredData.find((a) => a.id === drillAreaId);
-      return area ? area.months.map((m) => ({ key: m.month, label: formatPeriodLabel(m.month) })) : [];
-    }
-    return filteredData.map((a) => ({ key: a.id, label: a.name }));
-  }, [filteredData, drillAreaId]);
-
-  const displaySeries = useMemo(() => {
-    if (series.length <= 15) return series;
-    const sums = series.map((s) => {
-      const dataArr = drillAreaId ? chartDataDrill : chartDataNoDrill;
-      return { ...s, total: dataArr.reduce((acc, row) => acc + (row[s.key] || 0), 0) };
-    });
-    sums.sort((a, b) => b.total - a.total);
-    const top = sums.slice(0, 14);
-    const rest = sums.slice(14);
-    return [...top, { key: "__others__", label: `Остальные (${rest.length})` }];
-  }, [series, drillAreaId, chartDataNoDrill, chartDataDrill]);
-
-  const handleBarModeChange = (mode: "stacked" | "grouped") => {
-    setBarMode(mode);
-    localStorage.setItem("omegaprom_salary_barmode", mode);
-  };
-
-  if (isLoading) {
-    return (
-      <div className="space-y-3">
-        <Skeleton className="h-8 w-48" />
-        <Skeleton className="h-[300px] w-full" />
-      </div>
-    );
-  }
-
-  if (!hasData) {
-    return (
-      <div className="text-center py-8 text-muted-foreground">
-        <BarChart3 className="w-8 h-8 mx-auto mb-2 opacity-50" />
-        <p className="text-sm">Нет данных в базе</p>
-      </div>
-    );
-  }
-
-  const chartData = drillAreaId ? chartDataDrill : chartDataNoDrill;
-  const isHorizontal = !!drillAreaId;
-
-  return (
-    <div className="space-y-3">
-      {/* Controls */}
-      <div className="flex flex-wrap items-center gap-2">
-        <div className="flex items-center gap-1 border rounded-md p-0.5">
-          <Button size="sm" variant={metric === "kVydache" ? "default" : "ghost"} className="h-7 text-xs" onClick={() => setMetric("kVydache")}>К выдаче</Button>
-          <Button size="sm" variant={metric === "baza" ? "default" : "ghost"} className="h-7 text-xs" onClick={() => setMetric("baza")}>База</Button>
-        </div>
-
-        <MultiSelectPopover label="Участки" items={allAreaItems} selected={filterAreas} onChange={setFilterAreas} />
-        <MultiSelectPopover label="Сотрудники" items={employeeItems} selected={filterEmployees} onChange={setFilterEmployees} search />
-
-        {(filterAreas.size > 0 || filterEmployees.size > 0) && (
-          <Button variant="ghost" size="sm" className="h-8 text-xs gap-1" onClick={() => { setFilterAreas(new Set()); setFilterEmployees(new Set()); }}>
-            <X className="w-3 h-3" /> Сбросить
-          </Button>
-        )}
-
-        <div className="ml-auto flex items-center gap-1">
-          <Button size="sm" variant={barMode === "stacked" ? "default" : "ghost"} className="h-7 w-7 p-0" onClick={() => handleBarModeChange("stacked")} title="Стопка">
-            <Layers className="w-3.5 h-3.5" />
-          </Button>
-          <Button size="sm" variant={barMode === "grouped" ? "default" : "ghost"} className="h-7 w-7 p-0" onClick={() => handleBarModeChange("grouped")} title="Группа">
-            <BarChart3 className="w-3.5 h-3.5" />
-          </Button>
-        </div>
-      </div>
-
-      {drillAreaId && (
-        <div className="flex items-center gap-2 text-xs">
-          <Button variant="ghost" size="sm" className="h-6 text-xs px-1" onClick={() => { setDrillAreaId(null); setDrillAreaName(""); }}>
-            Все участки
-          </Button>
-          <ChevronRight className="w-3 h-3 text-muted-foreground" />
-          <span className="font-medium">{drillAreaName}</span>
-        </div>
-      )}
-
-      <Card>
-        <CardHeader className="py-3">
-          <CardTitle className="text-sm">
-            {metric === "kVydache" ? "К выдаче" : "База"} {drillAreaId ? `по сотрудникам — ${drillAreaName}` : "по участкам"}
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          {chartData.length === 0 ? (
-            <div className="text-center py-8 text-xs text-muted-foreground">Нет данных</div>
-          ) : (
-            <ResponsiveContainer width="100%" height={400}>
-              <BarChart data={chartData} layout={isHorizontal ? "vertical" : "horizontal"} margin={{ top: 8, right: 16, left: isHorizontal ? 80 : 8, bottom: 8 }}>
-                <CartesianGrid strokeDasharray="3 3" />
-                {isHorizontal ? (
-                  <>
-                    <XAxis type="number" tickFormatter={(v) => formatCurrency(v).replace("₽", "")} />
-                    <YAxis dataKey="employee" type="category" width={80} tick={{ fontSize: 11 }} />
-                  </>
-                ) : (
-                  <>
-                    <XAxis dataKey="period" tick={{ fontSize: 11 }} />
-                    <YAxis tickFormatter={(v) => formatCurrency(v).replace("₽", "")} />
-                  </>
-                )}
-                <ReTooltip
-                  content={({ active, payload, label }) => {
-                    if (!active || !payload?.length) return null;
-                    const total = payload.reduce((s, p) => s + (Number(p.value) || 0), 0);
-                    return (
-                      <div className="bg-background border rounded-md p-2 shadow-sm text-xs">
-                        <div className="font-medium mb-1">{label}</div>
-                        <div className="font-semibold mb-1">Итого: {formatCurrency(total)}</div>
-                        {payload
-                          .filter((p) => p.value && Number(p.value) > 0)
-                          .sort((a, b) => Number(b.value) - Number(a.value))
-                          .map((p, idx) => (
-                            <div key={idx} className="flex items-center gap-1.5">
-                              <span className="w-2 h-2 rounded-full" style={{ backgroundColor: p.color }} />
-                              <span className="flex-1">{p.name}</span>
-                              <span className="font-medium">{formatCurrency(Number(p.value))}</span>
-                            </div>
-                          ))}
-                      </div>
-                    );
-                  }}
-                />
-                <Legend wrapperStyle={{ fontSize: 11 }} />
-                {displaySeries.map((s, idx) => (
-                  <Bar
-                    key={s.key}
-                    dataKey={s.key}
-                    name={s.label}
-                    fill={CHART_COLORS[idx % CHART_COLORS.length]}
-                    stackId={barMode === "stacked" && !isHorizontal ? "a" : undefined}
-                    radius={barMode === "grouped" && !isHorizontal ? [3, 3, 0, 0] : undefined}
-                    onClick={() => {
-                      if (!drillAreaId) {
-                        setDrillAreaId(s.key);
-                        setDrillAreaName(s.label);
-                      }
-                    }}
-                  />
-                ))}
-              </BarChart>
-            </ResponsiveContainer>
-          )}
-        </CardContent>
-      </Card>
-
-      {!drillAreaId && <div className="text-[11px] text-muted-foreground text-center">Нажмите на сегмент или легенду для детализации по участку</div>}
-    </div>
-  );
-}
-
-// =====================
-// Google Sheets source
-// =====================
-
-function GoogleSourceSection() {
-  const { toast } = useToast();
-  const { data: googleStatus, isLoading: statusLoading } = useGoogleStatus();
-  const { refetch: refetchAuthUrl } = useGoogleAuthUrl();
-  const syncMutation = useSalarySync();
-  const { data: areasData, isLoading: areasLoading } = useSalaryAreas();
-  const createArea = useCreateSalaryArea();
-  const deleteArea = useDeleteSalaryArea();
-
-  const [newName, setNewName] = useState("");
-  const [newUrl, setNewUrl] = useState("");
-  const [newFioCol, setNewFioCol] = useState("B");
-  const [newBazaCol, setNewBazaCol] = useState("F");
-  const [newKVydacheCol, setNewKVydacheCol] = useState("J");
-
-  const loggedIn = googleStatus?.loggedIn === true;
-  const areas = areasData?.areas ?? [];
-
-  const handleLogin = async () => {
-    try {
-      const res = await refetchAuthUrl();
-      const url = res.data?.url;
-      if (url) {
-        window.open(url, "_blank");
-      } else {
-        toast({ title: "Не удалось получить ссылку авторизации", variant: "destructive" });
-      }
-    } catch {
-      toast({ title: "Не удалось получить ссылку авторизации", variant: "destructive" });
-    }
-  };
-
-  const handleSync = () => {
-    syncMutation.mutate(undefined, {
-      onSuccess: (data) => {
-        if (data.authRequired) {
-          toast({ title: "Требуется авторизация Google", variant: "destructive" });
-          return;
-        }
-        let description = `Добавлено: ${data.added}, обновлено: ${data.updated}, удалено: ${data.deleted}`;
-        if (data.errors?.length) description += `. Ошибок: ${data.errors.length}`;
-        toast({ title: "Синхронизация завершена", description });
-      },
-      onError: (err) => {
-        toast({ title: "Ошибка синхронизации", description: err.message, variant: "destructive" });
-      },
-    });
-  };
-
-  const handleAddArea = () => {
-    if (!newName.trim() || !newUrl.trim()) {
-      toast({ title: "Заполните название и ссылку на таблицу", variant: "destructive" });
-      return;
-    }
-    createArea.mutate(
-      {
-        name: newName.trim(),
-        spreadsheetUrl: newUrl.trim(),
-        fioCol: newFioCol.trim().toUpperCase() || undefined,
-        bazaCol: newBazaCol.trim().toUpperCase() || undefined,
-        kVydacheCol: newKVydacheCol.trim().toUpperCase() || undefined,
-      },
-      {
-        onSuccess: () => {
-          setNewName("");
-          setNewUrl("");
-          setNewFioCol("B");
-          setNewBazaCol("F");
-          setNewKVydacheCol("J");
-        },
-      }
-    );
-  };
-
-  return (
-    <Card>
-      <CardHeader className="py-3">
-        <CardTitle className="text-sm">Источник данных (Google Sheets)</CardTitle>
-      </CardHeader>
-      <CardContent className="space-y-4">
-        <div className="flex flex-wrap items-center gap-2">
-          {statusLoading ? (
-            <Skeleton className="h-8 w-48" />
-          ) : loggedIn ? (
-            <Badge variant="outline" className="text-xs gap-1.5 py-1">
-              <span className="w-2 h-2 rounded-full bg-green-500" />
-              Авторизован: {googleStatus?.email || "Google"}
-            </Badge>
-          ) : (
-            <Badge variant="outline" className="text-xs gap-1.5 py-1 text-muted-foreground">
-              <span className="w-2 h-2 rounded-full bg-muted-foreground/50" />
-              Google не авторизован
-            </Badge>
-          )}
-          <div className="flex items-center gap-2 ml-auto">
-            {!loggedIn && (
-              <Button size="sm" variant="outline" className="h-8 text-xs gap-1.5" onClick={handleLogin}>
-                <LogIn className="w-3.5 h-3.5" />
-                Войти через Google
-              </Button>
-            )}
-            <Button
-              size="sm"
-              className="h-8 text-xs gap-1.5"
-              onClick={handleSync}
-              disabled={syncMutation.isPending || !loggedIn}
-            >
-              {syncMutation.isPending ? <RefreshCw className="w-3.5 h-3.5 animate-spin" /> : <RefreshCw className="w-3.5 h-3.5" />}
-              Синхронизировать
-            </Button>
-          </div>
-        </div>
-
-        <div className="space-y-2">
-          <p className="text-xs font-medium text-muted-foreground">Участки ({areas.length})</p>
-          {areasLoading ? (
-            <div className="space-y-2">
-              {[1, 2].map(i => <Skeleton key={i} className="h-14 rounded-lg" />)}
-            </div>
-          ) : areas.length === 0 ? (
-            <p className="text-sm text-muted-foreground">Участки не добавлены</p>
-          ) : (
-            areas.map(area => (
-              <div key={area.id} className="flex items-center justify-between gap-3 rounded-lg border p-3">
-                <div className="min-w-0 flex-1">
-                  <p className="font-medium text-sm truncate">{area.name}</p>
-                  <p className="text-xs text-muted-foreground truncate">
-                    ID: {area.spreadsheetId || "—"}
-                    {area.fioCol || area.bazaCol || area.kVydacheCol
-                      ? ` · Столбцы: ФИО=${area.fioCol || "B"}, База=${area.bazaCol || "F"}, К выдаче=${area.kVydacheCol || "J"}`
-                      : ""}
-                  </p>
-                  {area.spreadsheetUrl && (
-                    <a
-                      href={area.spreadsheetUrl}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-xs text-muted-foreground hover:text-foreground hover:underline inline-flex items-center gap-1 mt-0.5"
-                    >
-                      <ExternalLink className="w-3 h-3" />
-                      Открыть таблицу
-                    </a>
-                  )}
-                </div>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="h-8 w-8 text-muted-foreground hover:text-destructive shrink-0"
-                  onClick={() => deleteArea.mutate(area.id)}
-                  disabled={deleteArea.isPending}
-                >
-                  <Trash2 className="w-4 h-4" />
-                </Button>
-              </div>
-            ))
-          )}
-        </div>
-
-        <div className="rounded-lg border p-3 space-y-3">
-          <p className="text-sm font-medium">Добавить участок</p>
-          <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-            <div className="space-y-1.5">
-              <Label className="text-xs">Название участка</Label>
-              <Input
-                value={newName}
-                onChange={e => setNewName(e.target.value)}
-                placeholder="Например: Производство"
-                className="h-8 text-sm"
-              />
-            </div>
-            <div className="space-y-1.5">
-              <Label className="text-xs">Ссылка на Google Таблицу</Label>
-              <Input
-                value={newUrl}
-                onChange={e => setNewUrl(e.target.value)}
-                placeholder="https://docs.google.com/spreadsheets/d/..."
-                className="h-8 text-sm"
-              />
-            </div>
-          </div>
-          <div className="space-y-1.5">
-            <Label className="text-xs">Столбцы (буква, опционально)</Label>
-            <div className="grid grid-cols-3 gap-2 max-w-xs">
-              <div>
-                <Label className="text-xs text-muted-foreground">ФИО</Label>
-                <Input value={newFioCol} onChange={e => setNewFioCol(e.target.value)} className="h-7 text-xs uppercase" maxLength={2} />
-              </div>
-              <div>
-                <Label className="text-xs text-muted-foreground">База</Label>
-                <Input value={newBazaCol} onChange={e => setNewBazaCol(e.target.value)} className="h-7 text-xs uppercase" maxLength={2} />
-              </div>
-              <div>
-                <Label className="text-xs text-muted-foreground">К выдаче</Label>
-                <Input value={newKVydacheCol} onChange={e => setNewKVydacheCol(e.target.value)} className="h-7 text-xs uppercase" maxLength={2} />
-              </div>
-            </div>
-          </div>
-          <Button
-            size="sm"
-            className="gap-1.5"
-            onClick={handleAddArea}
-            disabled={createArea.isPending || !newName.trim() || !newUrl.trim()}
-          >
-            <Plus className="w-3.5 h-3.5" />
-            Добавить
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
-  );
-}
-
-// =====================
-// Main Page
-// =====================
-
-export default function SalaryPage() {
-  const [tab, setTab] = useState(() => {
-    const saved = localStorage.getItem("omegaprom_salary_tab");
-    return saved === "neof" || saved === "analytics" ? saved : "of";
-  });
-
-  const handleTabChange = (value: string) => {
-    setTab(value);
-    localStorage.setItem("omegaprom_salary_tab", value);
-  };
-
-  return (
-    <Layout>
-      <div className="space-y-4">
-        <div>
-          <h1 className="text-xl font-bold">Зарплата</h1>
-          <p className="text-xs text-muted-foreground mt-0.5">Данные из PostgreSQL</p>
-        </div>
-
-        <GoogleSourceSection />
-
-        <Tabs value={tab} onValueChange={handleTabChange}>
-          <TabsList className="h-8" data-testid="salary-tabs">
-            <TabsTrigger value="of" className="text-xs h-7 px-3" data-testid="tab-of">ОФ</TabsTrigger>
-            <TabsTrigger value="neof" className="text-xs h-7 px-3" data-testid="tab-neof">неОФ</TabsTrigger>
-            <TabsTrigger value="analytics" className="text-xs h-7 px-3" data-testid="tab-analytics">Аналитика</TabsTrigger>
-          </TabsList>
-          <TabsContent value="of" className="mt-3"><ZofTab /></TabsContent>
-          <TabsContent value="neof" className="mt-3"><NeofTab /></TabsContent>
-          <TabsContent value="analytics" className="mt-3"><AnalyticsTab /></TabsContent>
-        </Tabs>
-      </div>
-    </Layout>
-  );
-}
diff --git a/server/finance-di2/audit-agent.ts b/server/finance-di2/audit-agent.ts
index 0a709b5..ae36e5a 100644
--- a/server/finance-di2/audit-agent.ts
+++ b/server/finance-di2/audit-agent.ts
@@ -47,9 +47,33 @@ interface DirectionAudit {
   treeBreakdown: { name: string; total: number; count: number; isPrimary: boolean }[];
 }
 
-const auditHistory: AuditResult[] = [];
+const HISTORY_PATH = path.join(process.cwd(), "data", "finance-audit-history.json");
 const MAX_HISTORY = 50;
 
+let auditHistory: AuditResult[] = [];
+
+// Персистентность истории аудита (порт из удалённого server/finance/audit.ts):
+// загрузка при старте модуля, запись после каждого runIntegrityAudit.
+function loadHistory(): void {
+  if (!fs.existsSync(HISTORY_PATH)) return;
+  try {
+    const parsed = JSON.parse(fs.readFileSync(HISTORY_PATH, "utf-8"));
+    if (Array.isArray(parsed)) auditHistory = parsed;
+  } catch {
+    // повреждённый файл — начинаем с чистой истории
+  }
+}
+
+function saveHistory(): void {
+  try {
+    fs.writeFileSync(HISTORY_PATH, JSON.stringify(auditHistory, null, 2), "utf-8");
+  } catch (err) {
+    console.error("[AUDIT-AGENT] Ошибка сохранения истории:", err);
+  }
+}
+
+loadHistory();
+
 function loadJSON(filePath: string): any {
   try {
     return JSON.parse(fs.readFileSync(filePath, "utf-8"));
@@ -437,6 +461,7 @@ export async function runIntegrityAudit(): Promise<AuditResult> {
 
   auditHistory.unshift(result);
   if (auditHistory.length > MAX_HISTORY) auditHistory.pop();
+  saveHistory();
 
   console.log(`[AUDIT-AGENT] Аудит завершён: ${result.summary}`);
   console.log(`[AUDIT-AGENT]   Доходы: БД=${income.dbCount} строк, деревья=${income.treeCount}, excluded=${income.excludedCount}, нераспр=${income.uncategorizedCount}, gap=${income.gapCount}`);
diff --git a/server/finance-di2/audit-scheduler.ts b/server/finance-di2/audit-scheduler.ts
new file mode 100644
index 0000000..151c593
--- /dev/null
+++ b/server/finance-di2/audit-scheduler.ts
@@ -0,0 +1,53 @@
+// Планировщик аудита целостности DI2: ежедневно в 03:00 (МСК) + первый запуск через 10 сек после старта.
+// Порт из удалённого server/finance/audit.ts (без node-cron, setInterval-проверка).
+
+import { runIntegrityAudit, getAuditHistory } from "./audit-agent";
+
+const TICK_MS = 60_000;
+const MSK_OFFSET_MS = 3 * 60 * 60 * 1000; // МСК = UTC+3
+const AUDIT_HOUR_MSK = 3;
+
+let lastRunDay: string | null = getAuditHistory()[0]?.timestamp
+  ? new Date(new Date(getAuditHistory()[0].timestamp).getTime() + MSK_OFFSET_MS).toISOString().slice(0, 10)
+  : null;
+let schedulerStarted = false;
+
+function mskToday(): string {
+  return new Date(Date.now() + MSK_OFFSET_MS).toISOString().slice(0, 10);
+}
+
+function mskHourNow(): number {
+  return new Date(Date.now() + MSK_OFFSET_MS).getUTCHours();
+}
+
+async function tick(): Promise<void> {
+  const today = mskToday();
+  if (lastRunDay === today) return; // сегодня уже запускался
+  if (mskHourNow() < AUDIT_HOUR_MSK) return; // ещё не наступило 03:00 по МСК
+  lastRunDay = today;
+  try {
+    await runIntegrityAudit();
+  } catch (err) {
+    console.error("[AUDIT-AGENT] Ошибка при выполнении аудита:", err);
+  }
+}
+
+export function startAuditScheduler(): void {
+  if (schedulerStarted) return; // защита от повторной регистрации роутов (тесты и т.п.)
+  schedulerStarted = true;
+
+  setInterval(() => {
+    tick().catch((err) => console.error("[AUDIT-AGENT] Tick error:", err));
+  }, TICK_MS);
+  console.log("[AUDIT-AGENT] Планировщик запущен (ежедневно в 03:00 по МСК)");
+
+  // Первый запуск через 10 секунд после старта сервера
+  setTimeout(async () => {
+    try {
+      const result = await runIntegrityAudit();
+      lastRunDay = new Date(new Date(result.timestamp).getTime() + MSK_OFFSET_MS).toISOString().slice(0, 10);
+    } catch (err) {
+      console.error("[AUDIT-AGENT] Ошибка при начальном аудите:", err);
+    }
+  }, 10000);
+}
diff --git a/server/finance-di2/db-client.ts b/server/finance-di2/db-client.ts
index 60ae3af..568df39 100644
--- a/server/finance-di2/db-client.ts
+++ b/server/finance-di2/db-client.ts
@@ -1,5 +1,5 @@
-// Обёртка над существующим пулом финансовой БД iistwin (server/finance/db-client.ts).
-// DI2-код импортирует эти имена из "./db-client" — второй пул не создаётся.
+// Обёртка над пулом финансовой БД (./db-core) — DI2-код импортирует эти имена из "./db-client".
+// Пул перенесён из удалённого server/finance/db-client.ts (единый источник — db-core).
 
 import type { DbConnectionConfig } from "./schema";
 import {
@@ -9,12 +9,12 @@ import {
   setConfig,
   isConnectionError,
   getPoolClient,
-} from "../finance/db-client";
+} from "./db-core";
 
 export { query, testConnection, setConfig, isConnectionError, getPoolClient };
 
 // В DI2 getConfig() всегда возвращал конфиг (не null) и включал password.
-// iistwin-версия отдаёт конфиг без пароля и может вернуть null — приводим к DI2-совместимой форме.
+// Ядро отдаёт конфиг без пароля и может вернуть null — приводим к DI2-совместимой форме.
 export function getConfig(): DbConnectionConfig {
   const cfg = financeGetConfig();
   if (!cfg) {
diff --git a/server/finance/db-client.ts b/server/finance-di2/db-core.ts
similarity index 97%
rename from server/finance/db-client.ts
rename to server/finance-di2/db-core.ts
index b0543c2..f208d7c 100644
--- a/server/finance/db-client.ts
+++ b/server/finance-di2/db-core.ts
@@ -75,7 +75,7 @@ export async function query<T extends QueryResultRow = any>(sql: string, params?
   return p.query<T>(sql, params);
 }
 
-// Клиент для ручных транзакций (BEGIN/COMMIT/ROLLBACK) — см. google-sheets.ts (синхронизация зарплат)
+// Клиент для ручных транзакций (BEGIN/COMMIT/ROLLBACK) — см. google-auth.ts (синхронизация зарплат)
 export async function getPoolClient(): Promise<PoolClient> {
   const p = getPool();
   return p.connect();
diff --git a/server/finance-di2/index.ts b/server/finance-di2/index.ts
index 17e9fb3..75aca97 100644
--- a/server/finance-di2/index.ts
+++ b/server/finance-di2/index.ts
@@ -5,6 +5,7 @@ import type { Express } from "express";
 import express from "express";
 import { authenticateToken, requirePermission } from "../middleware/auth.middleware";
 import { registerRoutes } from "./routes";
+import { startAuditScheduler } from "./audit-scheduler";
 
 const DI2_PREFIXES = [
   "/api/income",
@@ -52,4 +53,8 @@ export async function registerDi2Routes(app: Express): Promise<void> {
   await registerRoutes(null as any, router as any);
 
   app.use(router);
+
+  // Планировщик аудита целостности (03:00 МСК) — запускается один раз благодаря
+  // флагу schedulerStarted внутри startAuditScheduler.
+  startAuditScheduler();
 }
diff --git a/server/finance/audit.ts b/server/finance/audit.ts
deleted file mode 100644
index 508b248..0000000
--- a/server/finance/audit.ts
+++ /dev/null
@@ -1,566 +0,0 @@
-import { type Express } from "express";
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { resolve } from "path";
-import { query } from "./db-client";
-import {
-  getTableConfig,
-  getIncomeCategories,
-  getExpenseCategories,
-  getIncomeAutoDetectConfig,
-  getExpenseAutoDetectConfig,
-  type IncomeCategoryFile,
-  type AutoDetectConfig,
-} from "./table-config";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-// =====================
-// Аудит целостности финансовых данных (перенесено из Data-Insight2 audit-agent.ts)
-// =====================
-
-interface CategoryRule {
-  column: string;
-  operator: string;
-  value: string;
-}
-
-interface Category {
-  id: string;
-  name: string;
-  rules: CategoryRule[];
-  ruleLogic?: "and" | "or";
-  children: Category[];
-  excluded?: boolean;
-  autoDetected?: boolean;
-  treeId?: string;
-}
-
-interface AuditResult {
-  timestamp: string;
-  income: DirectionAudit;
-  expense: DirectionAudit;
-  status: "ok" | "warning" | "error";
-  summary: string;
-}
-
-interface DirectionAudit {
-  dbTotal: number;
-  dbCount: number;
-  treeTotal: number;
-  treeCount: number;
-  excludedTotal: number;
-  excludedCount: number;
-  uncategorizedTotal: number;
-  uncategorizedCount: number;
-  gapTotal: number;
-  gapCount: number;
-  gapRows: { columns: Record<string, string>; sum: number; count: number }[];
-  treeBreakdown: { name: string; total: number; count: number; isPrimary: boolean }[];
-}
-
-const HISTORY_PATH = resolve(process.cwd(), "data", "finance-audit-history.json");
-const MAX_HISTORY = 50;
-
-let auditHistory: AuditResult[] = [];
-
-function loadHistory(): void {
-  if (!existsSync(HISTORY_PATH)) return;
-  try {
-    const parsed = JSON.parse(readFileSync(HISTORY_PATH, "utf-8"));
-    if (Array.isArray(parsed)) auditHistory = parsed;
-  } catch {
-    // повреждённый файл — начинаем с чистой истории
-  }
-}
-
-function saveHistory(): void {
-  try {
-    writeFileSync(HISTORY_PATH, JSON.stringify(auditHistory, null, 2), "utf-8");
-  } catch (err) {
-    console.error("[AUDIT-AGENT] Ошибка сохранения истории:", err);
-  }
-}
-
-loadHistory();
-
-function flattenCategories(cats: Category[]): Category[] {
-  const result: Category[] = [];
-  for (const cat of cats) {
-    result.push(cat);
-    if (cat.children?.length) result.push(...flattenCategories(cat.children));
-  }
-  return result;
-}
-
-function matchTokens(haystack: string, needle: string): boolean {
-  const tokens = needle.split(/\s+/).filter(Boolean);
-  const lower = haystack.toLowerCase();
-  return tokens.every(t => lower.includes(t.toLowerCase()));
-}
-
-function rowMatchesRule(row: Record<string, any>, rule: CategoryRule): boolean {
-  const val = row[rule.column];
-  if (val === undefined) return false;
-  switch (rule.operator) {
-    case "equals": return val === rule.value;
-    case "contains": return typeof val === "string" && matchTokens(val, rule.value);
-    case "not_equals": return val !== rule.value;
-    case "greater_than": return Number(val) > Number(rule.value);
-    case "less_than": return Number(val) < Number(rule.value);
-    case "equal_number": return Number(val) === Number(rule.value);
-    default: return val === rule.value;
-  }
-}
-
-function rowMatchesRules(row: Record<string, any>, rules: CategoryRule[], logic: "and" | "or" = "and"): boolean {
-  if (!rules || rules.length === 0) return false;
-  if (logic === "or") return rules.some(r => rowMatchesRule(row, r));
-  return rules.every(r => rowMatchesRule(row, r));
-}
-
-function collectRuleColumns(cats: Category[]): Set<string> {
-  const cols = new Set<string>();
-  for (const cat of cats) {
-    for (const rule of (cat.rules || [])) cols.add(rule.column);
-    if (cat.children?.length) {
-      for (const col of collectRuleColumns(cat.children)) cols.add(col);
-    }
-  }
-  return cols;
-}
-
-function rowMatchesAutoPath(row: Record<string, any>, autoPath: { ruleSets: CategoryRule[][]; logic: ("and" | "or") }): boolean {
-  for (let i = 0; i < autoPath.ruleSets.length - 1; i++) {
-    if (!rowMatchesRules(row, autoPath.ruleSets[i])) return false;
-  }
-  return rowMatchesRules(row, autoPath.ruleSets[autoPath.ruleSets.length - 1], autoPath.logic);
-}
-
-function computeNodeFromAgg(
-  cat: Category,
-  siblings: Category[],
-  ancestorRuleSets: CategoryRule[][],
-  ancestorIds: Set<string>,
-  allFlat: Category[],
-  autoPaths: { ruleSets: CategoryRule[][]; logic: ("and" | "or") }[],
-  aggRows: Record<string, any>[],
-  exclPaths: { id: string; ruleSets: CategoryRule[][]; logic: ("and" | "or") }[] = []
-): { total: number; count: number; excluded: boolean; children: any[] } {
-  const catLogic = cat.ruleLogic || "and";
-  const idx = siblings.indexOf(cat);
-  const laterSibs = siblings.slice(idx + 1);
-
-  const allRuleSets = [...ancestorRuleSets, cat.rules];
-
-  let total = 0;
-  let count = 0;
-  for (const row of aggRows) {
-    const ancestorMatch = ancestorRuleSets.every(rs => rowMatchesRules(row, rs));
-    if (!ancestorMatch || !rowMatchesRules(row, cat.rules, catLogic)) continue;
-    if (laterSibs.some(sib => rowMatchesRules(row, sib.rules, sib.ruleLogic || "and"))) continue;
-    if (!cat.autoDetected && exclPaths.some(ep => ep.id !== cat.id && !ancestorIds.has(ep.id) && ep.ruleSets.every((rs, i) => i < ep.ruleSets.length - 1 ? rowMatchesRules(row, rs) : rowMatchesRules(row, rs, ep.logic)))) continue;
-    if (!cat.autoDetected && autoPaths.some(ap => rowMatchesAutoPath(row, ap))) continue;
-    if (cat.children?.length && cat.children.some(child => (child.rules?.length || 0) > 0 && rowMatchesRules(row, child.rules, child.ruleLogic || "and"))) continue;
-    total += row.total;
-    count += row.cnt;
-  }
-
-  const children: any[] = [];
-  if (cat.children?.length) {
-    const childAncestorIds = new Set(ancestorIds);
-    childAncestorIds.add(cat.id);
-    for (const child of cat.children) {
-      children.push(computeNodeFromAgg(child, cat.children, allRuleSets, childAncestorIds, allFlat, autoPaths, aggRows, exclPaths));
-    }
-  }
-
-  return { total, count, excluded: !!cat.excluded, children };
-}
-
-function nodeSubtreeTotal(n: { total: number; excluded: boolean; children: any[] }): number {
-  if (n.excluded) {
-    let t = 0;
-    for (const ch of n.children) t += nodeSubtreeTotal(ch);
-    return t;
-  }
-  let t = n.total;
-  for (const ch of n.children) t += nodeSubtreeTotal(ch);
-  return t;
-}
-
-function nodeSubtreeCount(n: { count: number; excluded: boolean; children: any[] }): number {
-  if (n.excluded) {
-    let c = 0;
-    for (const ch of n.children) c += nodeSubtreeCount(ch);
-    return c;
-  }
-  let c = n.count;
-  for (const ch of n.children) c += nodeSubtreeCount(ch);
-  return c;
-}
-
-function nodeExcludedTotal(n: { total: number; excluded: boolean; children: any[] }): number {
-  if (n.excluded) {
-    let t = n.total;
-    for (const ch of n.children) t += nodeExcludedTotal(ch);
-    return t;
-  }
-  let t = 0;
-  for (const ch of n.children) t += nodeExcludedTotal(ch);
-  return t;
-}
-
-function nodeExcludedCount(n: { count: number; excluded: boolean; children: any[] }): number {
-  if (n.excluded) {
-    let c = n.count;
-    for (const ch of n.children) c += nodeExcludedCount(ch);
-    return c;
-  }
-  let c = 0;
-  for (const ch of n.children) c += nodeExcludedCount(ch);
-  return c;
-}
-
-async function auditDirection(
-  table: string,
-  sumColumn: string,
-  cats: Category[],
-  autoConfig: AutoDetectConfig,
-  allowedColumns: string[]
-): Promise<DirectionAudit> {
-  const allFlat = flattenCategories(cats);
-
-  const ruleColumns = collectRuleColumns(cats);
-  for (const tree of autoConfig.trees) {
-    for (const col of tree.columns) ruleColumns.add(col);
-  }
-  const groupCols = ruleColumns.size > 0
-    ? [...ruleColumns].filter(c => allowedColumns.includes(c))
-    : allowedColumns.slice(0, 4);
-
-  const selectCols = groupCols.map(c => `"${c}"`).join(", ");
-  const aggResult = await query(
-    `SELECT ${selectCols}, SUM("${sumColumn}"::numeric) as total, COUNT(*) as cnt FROM "${table}" GROUP BY ${selectCols}`,
-    []
-  );
-
-  const aggRows = aggResult.rows.map((r: any) => {
-    const row: Record<string, any> = { total: Number(r.total), cnt: Number(r.cnt) };
-    for (const col of groupCols) row[col] = r[col] ?? "";
-    return row;
-  });
-
-  let dbTotal = 0, dbCount = 0;
-  for (const row of aggRows) { dbTotal += row.total; dbCount += row.cnt; }
-
-  const primaryTreeIds = new Set(autoConfig.trees.filter(t => t.isPrimary).map(t => t.id));
-
-  const groupedByTree = new Map<string, Category[]>();
-  for (const cat of cats) {
-    const tid = cat.treeId || "__manual__";
-    if (!groupedByTree.has(tid)) groupedByTree.set(tid, []);
-    groupedByTree.get(tid)!.push(cat);
-  }
-
-  const autoPaths: { ruleSets: CategoryRule[][]; logic: ("and" | "or") }[] = [];
-  const excludedPaths: { id: string; ruleSets: CategoryRule[][]; logic: ("and" | "or") }[] = [];
-  function collectAllPaths(categories: Category[], ancestors: CategoryRule[][]) {
-    for (const cat of categories) {
-      const path = [...ancestors, cat.rules || []];
-      if (cat.excluded) {
-        excludedPaths.push({ id: cat.id, ruleSets: path, logic: (cat.ruleLogic || "and") });
-      } else if (cat.autoDetected && cat.rules?.length) {
-        autoPaths.push({ ruleSets: path, logic: (cat.ruleLogic || "and") });
-      }
-      if (cat.children?.length) {
-        collectAllPaths(cat.children, path);
-      }
-    }
-  }
-  collectAllPaths(cats, []);
-
-  const treeBreakdown: { name: string; total: number; count: number; isPrimary: boolean }[] = [];
-  let allTreeTotal = 0, allTreeCount = 0;
-  let allExclTotal = 0, allExclCount = 0;
-
-  for (const [tid, treeCats] of groupedByTree) {
-    const isPrimary = tid === "__manual__" || primaryTreeIds.has(tid);
-    const treeName = tid === "__manual__"
-      ? "Ручные категории"
-      : autoConfig.trees.find(t => t.id === tid)?.name || tid;
-
-    const nodes: any[] = [];
-    for (const cat of treeCats) {
-      nodes.push(computeNodeFromAgg(cat, treeCats, [], new Set(), allFlat, autoPaths, aggRows, excludedPaths));
-    }
-
-    const tTotal = nodes.reduce((s, n) => s + nodeSubtreeTotal(n), 0);
-    const tCount = nodes.reduce((s, n) => s + nodeSubtreeCount(n), 0);
-    const eTotal = nodes.reduce((s, n) => s + nodeExcludedTotal(n), 0);
-    const eCount = nodes.reduce((s, n) => s + nodeExcludedCount(n), 0);
-
-    treeBreakdown.push({ name: treeName, total: tTotal, count: tCount, isPrimary });
-
-    if (isPrimary) {
-      allTreeTotal += tTotal;
-      allTreeCount += tCount;
-      allExclTotal += eTotal;
-      allExclCount += eCount;
-    }
-  }
-
-  function isRowMatchedByTreeAudit(row: Record<string, any>, treeCats: Category[]): boolean {
-    for (const cat of treeCats) {
-      const catLogic = cat.ruleLogic || "and";
-      if (!cat.rules?.length || !rowMatchesRules(row, cat.rules, catLogic)) continue;
-      return true;
-    }
-    return false;
-  }
-
-  let uncatTotal = 0, uncatCount = 0;
-  const gapRows: { columns: Record<string, string>; sum: number; count: number }[] = [];
-
-  for (const row of aggRows) {
-    let matched = false;
-    for (const [tid, treeCats] of groupedByTree) {
-      const isPrimary = tid === "__manual__" || primaryTreeIds.has(tid);
-      if (!isPrimary) continue;
-      if (isRowMatchedByTreeAudit(row, treeCats)) { matched = true; break; }
-    }
-    if (!matched) {
-      uncatTotal += row.total;
-      uncatCount += row.cnt;
-    }
-  }
-
-  const accountedTotal = allTreeTotal + allExclTotal + uncatTotal;
-  const accountedCount = allTreeCount + allExclCount + uncatCount;
-  const gapTotal = dbTotal - accountedTotal;
-  const gapCount = dbCount - accountedCount;
-
-  if (Math.abs(gapCount) > 0) {
-    for (const row of aggRows) {
-      let inTree = false;
-      let inUncat = true;
-      for (const [tid, treeCats] of groupedByTree) {
-        const isPrimary = tid === "__manual__" || primaryTreeIds.has(tid);
-        if (!isPrimary) continue;
-        if (isRowMatchedByTreeAudit(row, treeCats)) { inUncat = false; break; }
-      }
-      if (!inUncat) {
-        for (const [tid, treeCats] of groupedByTree) {
-          const isPrimary = tid === "__manual__" || primaryTreeIds.has(tid);
-          if (!isPrimary) continue;
-          for (const cat of treeCats) {
-            if (isRowCapturedByNode(row, cat, treeCats, [], new Set(), allFlat, autoPaths, excludedPaths)) {
-              inTree = true; break;
-            }
-          }
-          if (inTree) break;
-        }
-      }
-      if (!inUncat && !inTree) {
-        const cols: Record<string, string> = {};
-        for (const col of groupCols) cols[col] = String(row[col] || "");
-        gapRows.push({ columns: cols, sum: row.total, count: row.cnt });
-      }
-    }
-  }
-
-  return {
-    dbTotal, dbCount,
-    treeTotal: allTreeTotal, treeCount: allTreeCount,
-    excludedTotal: allExclTotal, excludedCount: allExclCount,
-    uncategorizedTotal: uncatTotal, uncategorizedCount: uncatCount,
-    gapTotal: Math.round(gapTotal * 100) / 100,
-    gapCount,
-    gapRows: gapRows.slice(0, 50),
-    treeBreakdown,
-  };
-}
-
-function isRowCapturedByNode(
-  row: Record<string, any>,
-  cat: Category,
-  siblings: Category[],
-  ancestorRuleSets: CategoryRule[][],
-  ancestorIds: Set<string>,
-  allFlat: Category[],
-  autoPaths: { ruleSets: CategoryRule[][]; logic: ("and" | "or") }[],
-  exclPaths: { id: string; ruleSets: CategoryRule[][]; logic: ("and" | "or") }[] = []
-): boolean {
-  const catLogic = cat.ruleLogic || "and";
-  const idx = siblings.indexOf(cat);
-  const laterSibs = siblings.slice(idx + 1);
-
-  const ancestorMatch = ancestorRuleSets.every(rs => rowMatchesRules(row, rs));
-  if (!ancestorMatch || !rowMatchesRules(row, cat.rules, catLogic)) return false;
-  if (laterSibs.some(sib => rowMatchesRules(row, sib.rules, sib.ruleLogic || "and"))) return false;
-  if (!cat.autoDetected && exclPaths.some(ep => ep.id !== cat.id && !ancestorIds.has(ep.id) && ep.ruleSets.every((rs, i) => i < ep.ruleSets.length - 1 ? rowMatchesRules(row, rs) : rowMatchesRules(row, rs, ep.logic)))) return false;
-  if (!cat.autoDetected && autoPaths.some(ap => rowMatchesAutoPath(row, ap))) return false;
-
-  if (cat.children?.length && cat.children.some(child => (child.rules?.length || 0) > 0 && rowMatchesRules(row, child.rules, child.ruleLogic || "and"))) {
-    const allRuleSets = [...ancestorRuleSets, cat.rules];
-    const childAncestorIds = new Set(ancestorIds);
-    childAncestorIds.add(cat.id);
-    for (const child of cat.children) {
-      if (isRowCapturedByNode(row, child, cat.children, allRuleSets, childAncestorIds, allFlat, autoPaths, exclPaths)) return true;
-    }
-    return false;
-  }
-
-  return true;
-}
-
-const INCOME_COLUMNS = [
-  "statya", "zakazchik", "dochka", "vnuchka", "kommentarii", "stavkands",
-  "naznachenieplatezha", "otvetstvenniipokontraktu", "dogovorkontragenta",
-  "dogovorzakazchika", "statyadop", "schetnaoplatu", "nomervhodyaschegodokumenta",
-];
-
-const EXPENSE_COLUMNS = [
-  "statya", "dochka", "vnuchka", "zakazchik", "naznachenieplatezha",
-  "statyadop", "kommentarii", "otvetstvenniipokontraktu", "dogovorzakazchika",
-  "dogovorkontragenta",
-];
-
-let auditRunning = false;
-
-export async function runIntegrityAudit(): Promise<AuditResult> {
-  if (auditRunning) throw new Error("Аудит уже выполняется");
-  auditRunning = true;
-  try {
-    console.log("[AUDIT-AGENT] Запуск аудита целостности данных...");
-
-    const config = getTableConfig();
-
-    const [income, expense] = await Promise.all([
-      auditDirection(
-        config.incomeTable,
-        config.incomeSumColumn,
-        getIncomeCategories() as Category[],
-        getIncomeAutoDetectConfig(),
-        INCOME_COLUMNS
-      ),
-      auditDirection(
-        config.expenseTable,
-        config.expenseSumColumn,
-        getExpenseCategories() as Category[],
-        getExpenseAutoDetectConfig(),
-        EXPENSE_COLUMNS
-      ),
-    ]);
-
-    const hasGap = income.gapCount !== 0 || expense.gapCount !== 0;
-    const status = hasGap ? "warning" : "ok";
-
-    const summaryParts: string[] = [];
-    if (income.gapCount === 0 && expense.gapCount === 0) {
-      summaryParts.push("Все строки распределены корректно");
-    } else {
-      if (income.gapCount !== 0) summaryParts.push(`Доходы: ${income.gapCount} строк (${income.gapTotal.toLocaleString("ru")}₽) не распределены`);
-      if (expense.gapCount !== 0) summaryParts.push(`Расходы: ${expense.gapCount} строк (${expense.gapTotal.toLocaleString("ru")}₽) не распределены`);
-    }
-
-    const result: AuditResult = {
-      timestamp: new Date().toISOString(),
-      income,
-      expense,
-      status,
-      summary: summaryParts.join(". "),
-    };
-
-    auditHistory.unshift(result);
-    if (auditHistory.length > MAX_HISTORY) auditHistory.pop();
-    saveHistory();
-
-    console.log(`[AUDIT-AGENT] Аудит завершён: ${result.summary}`);
-    console.log(`[AUDIT-AGENT]   Доходы: БД=${income.dbCount} строк, деревья=${income.treeCount}, excluded=${income.excludedCount}, нераспр=${income.uncategorizedCount}, gap=${income.gapCount}`);
-    console.log(`[AUDIT-AGENT]   Расходы: БД=${expense.dbCount} строк, деревья=${expense.treeCount}, excluded=${expense.excludedCount}, нераспр=${expense.uncategorizedCount}, gap=${expense.gapCount}`);
-
-    return result;
-  } finally {
-    auditRunning = false;
-  }
-}
-
-export function getAuditHistory(): AuditResult[] {
-  return auditHistory;
-}
-
-// =====================
-// Планировщик: ежедневно в 03:00 (МСК), без node-cron
-// =====================
-
-const TICK_MS = 60_000;
-const MSK_OFFSET_MS = 3 * 60 * 60 * 1000; // МСК = UTC+3
-const AUDIT_HOUR_MSK = 3;
-
-let lastRunDay: string | null = auditHistory[0]?.timestamp
-  ? new Date(new Date(auditHistory[0].timestamp).getTime() + MSK_OFFSET_MS).toISOString().slice(0, 10)
-  : null;
-let schedulerStarted = false;
-
-function mskToday(): string {
-  return new Date(Date.now() + MSK_OFFSET_MS).toISOString().slice(0, 10);
-}
-
-function mskHourNow(): number {
-  return new Date(Date.now() + MSK_OFFSET_MS).getUTCHours();
-}
-
-async function tick(): Promise<void> {
-  const today = mskToday();
-  if (lastRunDay === today) return; // сегодня уже запускался
-  if (mskHourNow() < AUDIT_HOUR_MSK) return; // ещё не наступило 03:00 по МСК
-  lastRunDay = today;
-  try {
-    await runIntegrityAudit();
-  } catch (err) {
-    console.error("[AUDIT-AGENT] Ошибка при выполнении аудита:", err);
-  }
-}
-
-export function startAuditScheduler(): void {
-  if (schedulerStarted) return;
-  schedulerStarted = true;
-
-  setInterval(() => {
-    tick().catch((err) => console.error("[AUDIT-AGENT] Tick error:", err));
-  }, TICK_MS);
-  console.log("[AUDIT-AGENT] Планировщик запущен (ежедневно в 03:00 по МСК)");
-
-  // Первый запуск через 10 секунд после старта сервера
-  setTimeout(async () => {
-    try {
-      const result = await runIntegrityAudit();
-      lastRunDay = new Date(new Date(result.timestamp).getTime() + MSK_OFFSET_MS).toISOString().slice(0, 10);
-    } catch (err) {
-      console.error("[AUDIT-AGENT] Ошибка при начальном аудите:", err);
-    }
-  }, 10000);
-}
-
-// =====================
-// HTTP endpoints
-// =====================
-
-export function registerAuditRoutes(app: Express) {
-  app.get("/api/audit/history", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    res.json({ success: true, history: getAuditHistory() });
-  });
-
-  app.post("/api/audit/run", authenticateToken, requirePermission('finance.manage'), async (_req: AuthenticatedRequest, res) => {
-    try {
-      const result = await runIntegrityAudit();
-      res.json({ success: true, result });
-    } catch (err: any) {
-      console.error("[AUDIT-AGENT] Ошибка ручного запуска:", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/audit/status", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    res.json({ success: true, last: auditHistory[0] || null, running: auditRunning });
-  });
-}
diff --git a/server/finance/auto-detect.ts b/server/finance/auto-detect.ts
deleted file mode 100644
index 380aeda..0000000
--- a/server/finance/auto-detect.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import {
-  getIncomeAutoDetectConfig,
-  setIncomeAutoDetectConfig,
-  getExpenseAutoDetectConfig,
-  setExpenseAutoDetectConfig,
-  getIncomeCategories,
-  setIncomeCategories,
-  getExpenseCategories,
-  setExpenseCategories,
-  getTableConfig,
-} from "./table-config";
-import * as cache from "./cache";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-function getConfig(type: string) {
-  return type === "expense" ? getExpenseAutoDetectConfig() : getIncomeAutoDetectConfig();
-}
-function setConfig(type: string, config: any) {
-  return type === "expense" ? setExpenseAutoDetectConfig(config) : setIncomeAutoDetectConfig(config);
-}
-function getCategories(type: string) {
-  return type === "expense" ? getExpenseCategories() : getIncomeCategories();
-}
-function setCategories(type: string, cats: any[]) {
-  return type === "expense" ? setExpenseCategories(cats) : setIncomeCategories(cats);
-}
-
-function buildWhere(filters: any[], filterLogic: string): string {
-  if (!filters || filters.length === 0) return "";
-  const logic = filterLogic === "or" ? " OR " : " AND ";
-  const clauses = filters.map((f: any) => `"${f.column}" ILIKE '%${f.value.replace(/'/g, "''")}%'"`);
-  return "WHERE " + clauses.join(logic);
-}
-
-export function registerAutoDetectRoutes(app: Express): void {
-  // GET /api/:type-categories/auto-detect/config
-  app.get("/api/income-categories/auto-detect/config", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, config: getIncomeAutoDetectConfig() });
-  });
-  app.get("/api/expense-categories/auto-detect/config", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, config: getExpenseAutoDetectConfig() });
-  });
-
-  // POST /api/:type-categories/auto-detect/config/trees
-  app.post("/api/income-categories/auto-detect/config/trees", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getIncomeAutoDetectConfig();
-    const tree = { ...req.body, id: crypto.randomUUID() };
-    config.trees.push(tree);
-    setIncomeAutoDetectConfig(config);
-    res.status(201).json({ success: true, tree });
-  });
-  app.post("/api/expense-categories/auto-detect/config/trees", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getExpenseAutoDetectConfig();
-    const tree = { ...req.body, id: crypto.randomUUID() };
-    config.trees.push(tree);
-    setExpenseAutoDetectConfig(config);
-    res.status(201).json({ success: true, tree });
-  });
-
-  // PUT /api/:type-categories/auto-detect/config/trees/:treeId
-  app.put("/api/income-categories/auto-detect/config/trees/:treeId", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getIncomeAutoDetectConfig();
-    const idx = config.trees.findIndex((t) => t.id === req.params.treeId);
-    if (idx >= 0) { config.trees[idx] = { ...config.trees[idx], ...req.body }; setIncomeAutoDetectConfig(config); }
-    res.json({ success: true });
-  });
-  app.put("/api/expense-categories/auto-detect/config/trees/:treeId", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getExpenseAutoDetectConfig();
-    const idx = config.trees.findIndex((t) => t.id === req.params.treeId);
-    if (idx >= 0) { config.trees[idx] = { ...config.trees[idx], ...req.body }; setExpenseAutoDetectConfig(config); }
-    res.json({ success: true });
-  });
-
-  // DELETE /api/:type-categories/auto-detect/config/trees/:treeId
-  app.delete("/api/income-categories/auto-detect/config/trees/:treeId", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getIncomeAutoDetectConfig();
-    config.trees = config.trees.filter((t) => t.id !== req.params.treeId);
-    setIncomeAutoDetectConfig(config);
-    res.json({ success: true });
-  });
-  app.delete("/api/expense-categories/auto-detect/config/trees/:treeId", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const config = getExpenseAutoDetectConfig();
-    config.trees = config.trees.filter((t) => t.id !== req.params.treeId);
-    setExpenseAutoDetectConfig(config);
-    res.json({ success: true });
-  });
-
-  // GET /api/:type-categories/auto-detect/preview?treeId=...
-  app.get("/api/income-categories/auto-detect/preview", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await previewAutoDetect(req, res, "income");
-  });
-  app.get("/api/expense-categories/auto-detect/preview", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await previewAutoDetect(req, res, "expense");
-  });
-
-  // POST /api/:type-categories/auto-detect?treeId=...
-  app.post("/api/income-categories/auto-detect", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await runAutoDetect(req, res, "income");
-  });
-  app.post("/api/expense-categories/auto-detect", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await runAutoDetect(req, res, "expense");
-  });
-
-  // POST /api/:type-categories/auto-detect/sync?treeId=...
-  app.post("/api/income-categories/auto-detect/sync", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await runAutoDetect(req, res, "income", true);
-  });
-  app.post("/api/expense-categories/auto-detect/sync", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await runAutoDetect(req, res, "expense", true);
-  });
-
-  // DELETE /api/:type-categories/auto-detect?treeId=...
-  app.delete("/api/income-categories/auto-detect", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    deleteAutoDetect(req, res, "income");
-  });
-  app.delete("/api/expense-categories/auto-detect", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    deleteAutoDetect(req, res, "expense");
-  });
-}
-
-async function previewAutoDetect(req: AuthenticatedRequest, res: any, type: string) {
-  try {
-    const treeId = req.query.treeId as string;
-    const config = getConfig(type);
-    const tree = config.trees.find((t: any) => t.id === treeId);
-    if (!tree) { res.status(404).json({ success: false, error: "Дерево не найдено" }); return; }
-
-    const tconf = getTableConfig();
-    const table = type === "expense" ? tconf.expenseTable : tconf.incomeTable;
-    const colResult = await query(`SELECT DISTINCT "${tree.columns[0]}" FROM "${table}" WHERE "${tree.columns[0]}" IS NOT NULL LIMIT 20`);
-    const categories = colResult.rows.map((r: any, i: number) => ({
-      id: crypto.randomUUID(),
-      name: r[tree.columns[0]],
-      rules: [{ column: tree.columns[0], operator: "equals" as const, value: r[tree.columns[0]] }],
-      ruleLogic: "and",
-      children: [],
-    }));
-    res.json({ success: true, categories });
-  } catch (err: any) {
-    res.status(500).json({ success: false, error: err.message });
-  }
-}
-
-async function runAutoDetect(req: AuthenticatedRequest, res: any, type: string, sync: boolean = false) {
-  try {
-    const treeId = req.query.treeId as string;
-    const config = getConfig(type);
-    const tree = config.trees.find((t: any) => t.id === treeId);
-    if (!tree) { res.status(404).json({ success: false, error: "Дерево не найдено" }); return; }
-
-    const tconf = getTableConfig();
-    const table = type === "expense" ? tconf.expenseTable : tconf.incomeTable;
-    const { clause, params } = buildWhereQuery(tree.filters, tree.filterLogic);
-    const colResult = await query(`SELECT DISTINCT "${tree.columns[0]}" FROM "${table}" ${clause} AND "${tree.columns[0]}" IS NOT NULL`, params);
-
-    const currentCats = getCategories(type);
-    const newCats = colResult.rows.map((r: any) => ({
-      id: crypto.randomUUID(),
-      name: r[tree.columns[0]],
-      rules: [{ column: tree.columns[0], operator: "equals", value: r[tree.columns[0]] }],
-      ruleLogic: "and",
-      excluded: false,
-      autoDetected: true,
-      treeId: tree.id,
-      children: [],
-    }));
-
-    if (sync) {
-      // Remove old auto-detected categories for this tree
-      const cleaned = currentCats.filter((c: any) => c.treeId !== tree.id);
-      setCategories(type, [...cleaned, ...newCats]);
-    } else {
-      setCategories(type, [...currentCats, ...newCats]);
-    }
-
-    cache.invalidatePrefix(`${type}:`);
-    res.json({ success: true, created: newCats.length });
-  } catch (err: any) {
-    res.status(500).json({ success: false, error: err.message });
-  }
-}
-
-function deleteAutoDetect(req: AuthenticatedRequest, res: any, type: string) {
-  const treeId = req.query.treeId as string;
-  const currentCats = getCategories(type);
-  const cleaned = currentCats.filter((c: any) => c.treeId !== treeId);
-  setCategories(type, cleaned);
-  cache.invalidatePrefix(`${type}:`);
-  res.json({ success: true });
-}
-
-function buildWhereQuery(filters: any[], filterLogic: string): { clause: string; params: any[] } {
-  if (!filters || filters.length === 0) return { clause: "", params: [] };
-  const logic = filterLogic === "or" ? " OR " : " AND ";
-  const conditions: string[] = [];
-  const params: any[] = [];
-  let idx = 1;
-  for (const f of filters) {
-    conditions.push(`"${f.column}" ILIKE $${idx}`);
-    params.push(`%${f.value}%`);
-    idx++;
-  }
-  return { clause: `WHERE ${conditions.join(logic)}`, params };
-}
diff --git a/server/finance/cache.ts b/server/finance/cache.ts
deleted file mode 100644
index de72169..0000000
--- a/server/finance/cache.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-type CacheEntry<T> = { data: T; expiresAt: number };
-
-const store = new Map<string, CacheEntry<any>>();
-const DEFAULT_TTL_MS = 60 * 1000; // 60 seconds
-
-export function get<T>(key: string): T | undefined {
-  const entry = store.get(key);
-  if (!entry) return undefined;
-  if (Date.now() > entry.expiresAt) {
-    store.delete(key);
-    return undefined;
-  }
-  return entry.data;
-}
-
-export function set<T>(key: string, data: T, ttlMs = DEFAULT_TTL_MS): void {
-  store.set(key, { data, expiresAt: Date.now() + ttlMs });
-}
-
-export function invalidate(keyPattern?: string): void {
-  if (!keyPattern) {
-    store.clear();
-    return;
-  }
-  for (const key of store.keys()) {
-    if (key.includes(keyPattern)) {
-      store.delete(key);
-    }
-  }
-}
-
-export function invalidatePrefix(prefix: string): void {
-  for (const key of store.keys()) {
-    if (key.startsWith(prefix)) {
-      store.delete(key);
-    }
-  }
-}
diff --git a/server/finance/calculations.ts b/server/finance/calculations.ts
deleted file mode 100644
index 28024f0..0000000
--- a/server/finance/calculations.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import * as cache from "./cache";
-import {
-  getTableConfig,
-  getIncomeCategories,
-  getExpenseCategories,
-  type IncomeCategoryFile,
-} from "./table-config";
-import { applyCategoryRules } from "./category-matching";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-// =====================
-// Расчёты: НДС и налог на прибыль (перенесено из Data-Insight2)
-// =====================
-
-const parseRate = (r: string): number => {
-  const m = r.match(/(\d+)/);
-  return m ? Number(m[1]) / 100 : 0;
-};
-const isNoVatRate = (r: string): boolean => parseRate(r) === 0;
-const r2 = (v: number) => Math.round(v * 100) / 100;
-
-function buildDateConds(params: unknown[], dateFrom?: string, dateTo?: string): string {
-  const conds: string[] = ["1=1"];
-  if (dateFrom) { params.push(dateFrom); conds.push(`data >= $${params.length}`); }
-  if (dateTo) { params.push(dateTo); conds.push(`data <= $${params.length}`); }
-  return `WHERE ${conds.join(" AND ")}`;
-}
-
-export function registerCalculationRoutes(app: Express) {
-  app.get("/api/calculations/vat", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { dateFrom, dateTo } = req.query;
-      const config = getTableConfig();
-      const cacheKey = `calc:vat:${dateFrom}:${dateTo}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const incParams: unknown[] = [];
-      const expParams: unknown[] = [];
-      const incWhere = buildDateConds(incParams, dateFrom as string, dateTo as string);
-      const expWhere = buildDateConds(expParams, dateFrom as string, dateTo as string);
-
-      const [incByRate, expByRate, incMonthly, expMonthly] = await Promise.all([
-        query(`SELECT COALESCE(stavkands, 'Без НДС') as rate, COUNT(*) as cnt, COALESCE(SUM("${config.incomeSumColumn}"), 0) as total FROM "${config.incomeTable}" ${incWhere} GROUP BY COALESCE(stavkands, 'Без НДС') ORDER BY total DESC`, incParams),
-        query(`SELECT COALESCE(stavkands, 'Без НДС') as rate, COUNT(*) as cnt, COALESCE(SUM("${config.expenseSumColumn}"), 0) as total FROM "${config.expenseTable}" ${expWhere} GROUP BY COALESCE(stavkands, 'Без НДС') ORDER BY total DESC`, expParams),
-        query(`SELECT TO_CHAR(data, 'YYYY-MM') as period, COALESCE(stavkands, 'Без НДС') as rate, COALESCE(SUM("${config.incomeSumColumn}"), 0) as total FROM "${config.incomeTable}" ${incWhere} GROUP BY TO_CHAR(data, 'YYYY-MM'), COALESCE(stavkands, 'Без НДС') ORDER BY period`, incParams),
-        query(`SELECT TO_CHAR(data, 'YYYY-MM') as period, COALESCE(stavkands, 'Без НДС') as rate, COALESCE(SUM("${config.expenseSumColumn}"), 0) as total FROM "${config.expenseTable}" ${expWhere} GROUP BY TO_CHAR(data, 'YYYY-MM'), COALESCE(stavkands, 'Без НДС') ORDER BY period`, expParams),
-      ]);
-
-      const incomeByRate = incByRate.rows.map((r: any) => ({
-        rate: r.rate,
-        count: Number(r.cnt),
-        total: Number(r.total),
-        vat: Number(r.total) * parseRate(r.rate) / (1 + parseRate(r.rate)),
-      }));
-
-      const expenseByRate = expByRate.rows.map((r: any) => ({
-        rate: r.rate,
-        count: Number(r.cnt),
-        total: Number(r.total),
-        vat: Number(r.total) * parseRate(r.rate) / (1 + parseRate(r.rate)),
-      }));
-
-      const totalIncomeVat = incomeByRate.reduce((s: number, r: any) => s + r.vat, 0);
-      const totalExpenseVat = expenseByRate.reduce((s: number, r: any) => s + r.vat, 0);
-
-      const periodsSet = new Set<string>();
-      [...incMonthly.rows, ...expMonthly.rows].forEach((r: any) => periodsSet.add(r.period));
-      const periods = [...periodsSet].sort();
-
-      const monthly = periods.map(p => {
-        let incVat = 0;
-        let expVat = 0;
-        incMonthly.rows.filter((r: any) => r.period === p).forEach((r: any) => {
-          const rate = parseRate(r.rate);
-          incVat += Number(r.total) * rate / (1 + rate);
-        });
-        expMonthly.rows.filter((r: any) => r.period === p).forEach((r: any) => {
-          const rate = parseRate(r.rate);
-          expVat += Number(r.total) * rate / (1 + rate);
-        });
-        return { period: p, incomeVat: r2(incVat), expenseVat: r2(expVat), toPay: r2(incVat - expVat) };
-      });
-
-      const result = {
-        success: true,
-        incomeByRate,
-        expenseByRate,
-        totalIncomeVat: r2(totalIncomeVat),
-        totalExpenseVat: r2(totalExpenseVat),
-        toPay: r2(totalIncomeVat - totalExpenseVat),
-        monthly,
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[calculations/vat]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.post("/api/calculations/profit-tax", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { dateFrom, dateTo, taxRate: taxRateParam } = req.query;
-      const { incomeCategories, expenseCategories, chartCategories } = req.body || {};
-      const config = getTableConfig();
-      const cacheKey = `calc:profit-tax:${dateFrom}:${dateTo}:${taxRateParam}:${JSON.stringify(req.body || {})}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      // Мапа id узла → { node, parentId } по всем деревьям категорий (для excluded-предков)
-      function buildNodeMap(cats: IncomeCategoryFile[]): Map<string, { node: IncomeCategoryFile; parentId: string | null }> {
-        const map = new Map<string, { node: IncomeCategoryFile; parentId: string | null }>();
-        const walk = (nodes: IncomeCategoryFile[], parentId: string | null) => {
-          for (const n of nodes) {
-            map.set(n.id, { node: n, parentId });
-            if (n.children?.length) walk(n.children, n.id);
-          }
-        };
-        walk(cats, null);
-        return map;
-      }
-      function isExcluded(map: Map<string, { node: IncomeCategoryFile; parentId: string | null }>, id: string): boolean {
-        let cur = map.get(id);
-        while (cur) {
-          if (cur.node.excluded) return true;
-          cur = cur.parentId ? map.get(cur.parentId) : undefined;
-        }
-        return false;
-      }
-
-      // Выбираем строки за период из базовых таблиц, категорию определяем в JS через applyCategoryRules
-      async function loadDirection(
-        table: string,
-        sumColumn: string,
-        categories: IncomeCategoryFile[],
-        catFilter?: string[],
-      ) {
-        const params: unknown[] = [];
-        const where = buildDateConds(params, dateFrom as string, dateTo as string);
-        const rowsResult = await query(
-          `SELECT data, "${sumColumn}" as amount, COALESCE(stavkands, 'Без НДС') as rate, TO_CHAR(data, 'YYYY-MM') as period FROM "${table}" ${where}`,
-          params
-        );
-        const nodeMap = buildNodeMap(categories);
-
-        const exclMap = new Map<string, number>();
-        const chartSet = new Set((catFilter || []));
-        const monthlyMap = new Map<string, { incVat: number; incVatAmt: number; incNoVat: number; inc: number }>();
-
-        let withVat = 0, vatAmount = 0, noVat = 0, total = 0;
-
-        for (const row of rowsResult.rows as any[]) {
-          const catId = applyCategoryRules(row, categories);
-          if (!catId) continue; // без категории — в расчёте не участвуют (в источнике их нет в derevo-таблицах)
-          const node = nodeMap.get(catId);
-          if (!node) continue;
-          if (isExcluded(nodeMap, catId)) {
-            exclMap.set(node.node.name, (exclMap.get(node.node.name) || 0) + (parseFloat(row.amount) || 0));
-            continue;
-          }
-          if (chartSet.size > 0 && !chartSet.has(catId)) continue;
-
-          const amount = parseFloat(row.amount) || 0;
-          total += amount;
-          const period = row.period;
-          const m = monthlyMap.get(period) || { incVat: 0, incVatAmt: 0, incNoVat: 0, inc: 0 };
-          m.inc += amount;
-          if (isNoVatRate(row.rate)) {
-            noVat += amount;
-            m.incNoVat += amount;
-          } else {
-            const rate = parseRate(row.rate);
-            const vat = amount * rate / (1 + rate);
-            withVat += amount;
-            vatAmount += vat;
-            m.incVat += amount;
-            m.incVatAmt += vat;
-          }
-          monthlyMap.set(period, m);
-        }
-
-        const excluded = Array.from(exclMap.entries())
-          .filter(([, t]) => t > 0)
-          .map(([name, t]) => ({ name, total: r2(t) }));
-
-        return { withVat, vatAmount, noVat, total, monthlyMap, excluded };
-      }
-
-      const incCatFilter = incomeCategories && Array.isArray(incomeCategories) && incomeCategories.length > 0 ? incomeCategories as string[] : undefined;
-      const expCatFilter = expenseCategories && Array.isArray(expenseCategories) && expenseCategories.length > 0 ? expenseCategories as string[] : undefined;
-
-      const [inc, exp] = await Promise.all([
-        loadDirection(config.incomeTable, config.incomeSumColumn, getIncomeCategories(), incCatFilter),
-        loadDirection(config.expenseTable, config.expenseSumColumn, getExpenseCategories(), expCatFilter),
-      ]);
-
-      const incomeWithVatBase = inc.withVat - inc.vatAmount;
-      const expenseWithVatBase = exp.withVat - exp.vatAmount;
-      const profit = (incomeWithVatBase - expenseWithVatBase) + (inc.noVat - exp.noVat);
-      const taxRate = taxRateParam ? Number(taxRateParam) / 100 : 0.20;
-      const tax = profit > 0 ? profit * taxRate : 0;
-
-      const periodsSet = new Set<string>();
-      for (const p of inc.monthlyMap.keys()) periodsSet.add(p);
-      for (const p of exp.monthlyMap.keys()) periodsSet.add(p);
-      const periods = [...periodsSet].sort();
-
-      const monthly = periods.map(p => {
-        const mi = inc.monthlyMap.get(p) || { incVat: 0, incVatAmt: 0, incNoVat: 0, inc: 0 };
-        const me = exp.monthlyMap.get(p) || { incVat: 0, incVatAmt: 0, incNoVat: 0, inc: 0 };
-        const prof = ((mi.incVat - mi.incVatAmt) - (me.incVat - me.incVatAmt)) + (mi.incNoVat - me.incNoVat);
-        return { period: p, income: r2(mi.inc), expenses: r2(me.inc), profit: r2(prof), tax: r2(prof > 0 ? prof * taxRate : 0) };
-      });
-
-      // Помесячная агрегация по категориям графиков
-      let categoryMonthly: { id: string; name: string; type: string; data: { period: string; amount: number }[] }[] = [];
-      if (chartCategories && Array.isArray(chartCategories) && chartCategories.length > 0) {
-        const chartCatPromises = (chartCategories as { id: string; type: string; name?: string }[]).map(async (cc) => {
-          const isIncome = cc.type === "income";
-          const table = isIncome ? config.incomeTable : config.expenseTable;
-          const sumColumn = isIncome ? config.incomeSumColumn : config.expenseSumColumn;
-          const categories = isIncome ? getIncomeCategories() : getExpenseCategories();
-          const nodeMap = buildNodeMap(categories);
-          const catNode = nodeMap.get(cc.id);
-
-          const params: unknown[] = [];
-          const where = buildDateConds(params, dateFrom as string, dateTo as string);
-          const rowsResult = await query(
-            `SELECT "${sumColumn}" as amount, TO_CHAR(data, 'YYYY-MM') as period FROM "${table}" ${where}`,
-            params
-          );
-
-          const periodMap = new Map<string, number>();
-          for (const row of rowsResult.rows as any[]) {
-            const catId = applyCategoryRules(row, categories);
-            if (catId !== cc.id) continue;
-            if (catNode && isExcluded(nodeMap, cc.id)) continue;
-            const period = row.period;
-            periodMap.set(period, (periodMap.get(period) || 0) + (parseFloat(row.amount) || 0));
-          }
-
-          return {
-            id: cc.id,
-            name: cc.name || (catNode?.node.name ?? cc.id),
-            type: cc.type,
-            data: [...periodMap.entries()].sort((a, b) => (a[0] < b[0] ? -1 : 1)).map(([period, amount]) => ({ period, amount: r2(amount) })),
-          };
-        });
-        categoryMonthly = await Promise.all(chartCatPromises);
-      }
-
-      const result = {
-        success: true,
-        income: r2(inc.total), expenses: r2(exp.total),
-        totalIncome: r2(inc.total), totalExpenses: r2(exp.total),
-        incomeWithVat: r2(inc.withVat), incomeVatAmount: r2(inc.vatAmount), incomeWithVatBase: r2(incomeWithVatBase), incomeNoVat: r2(inc.noVat),
-        expenseWithVat: r2(exp.withVat), expenseVatAmount: r2(exp.vatAmount), expenseWithVatBase: r2(expenseWithVatBase), expenseNoVat: r2(exp.noVat),
-        profit: r2(profit), taxRate, tax: r2(tax), monthly,
-        excludedIncomeCategories: inc.excluded, excludedExpenseCategories: exp.excluded,
-        categoryMonthly,
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[calculations/profit-tax]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
diff --git a/server/finance/category-matching.ts b/server/finance/category-matching.ts
deleted file mode 100644
index 1e00249..0000000
--- a/server/finance/category-matching.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Матчинг строк финансовых таблиц по правилам категорий (деревья).
-// Переиспользуется routes.ts (tree-summary, категории) и calculations.ts (налог на прибыль).
-
-export function matchRule(row: Record<string, any>, rule: { column: string; operator: string; value: string }): boolean {
-  const val = row[rule.column];
-  const strVal = val == null ? "" : String(val);
-  const numVal = parseFloat(strVal);
-  const ruleNum = parseFloat(rule.value);
-
-  switch (rule.operator) {
-    case "equals": return strVal === rule.value;
-    case "not_equals": return strVal !== rule.value;
-    case "contains": return strVal.toLowerCase().includes(rule.value.toLowerCase());
-    case "greater_than": return !isNaN(numVal) && !isNaN(ruleNum) && numVal > ruleNum;
-    case "less_than": return !isNaN(numVal) && !isNaN(ruleNum) && numVal < ruleNum;
-    case "equal_number": return !isNaN(numVal) && !isNaN(ruleNum) && numVal === ruleNum;
-    default: return false;
-  }
-}
-
-// Возвращает id глубочайшей совпавшей категории или null
-export function applyCategoryRules(row: Record<string, any>, categories: any[]): string | null {
-  for (const cat of categories) {
-    const match = cat.ruleLogic === "or"
-      ? cat.rules.some((r: any) => matchRule(row, r))
-      : cat.rules.every((r: any) => matchRule(row, r));
-    if (match) {
-      if (cat.children && cat.children.length > 0) {
-        const child = applyCategoryRules(row, cat.children);
-        if (child) return child;
-      }
-      return cat.id;
-    }
-  }
-  return null;
-}
-
-// Сумма статистики категории со всеми потомками (статистика хранится по id глубочайшей совпавшей категории)
-function subtreeStats(
-  cat: any,
-  treeTotals: Map<string, { total: number; count: number }>
-): { total: number; count: number } {
-  const own = treeTotals.get(cat.id) || { total: 0, count: 0 };
-  let total = own.total;
-  let count = own.count;
-  for (const child of cat.children || []) {
-    const s = subtreeStats(child, treeTotals);
-    total += s.total;
-    count += s.count;
-  }
-  return { total, count };
-}
-
-// Группировка корневых категорий по деревьям автоопределения (как в Data-Insight2):
-// корни с treeId из конфигурации дерева — в это дерево, остальные — в «Ручные категории».
-export function buildGroupedTrees(
-  categories: any[],
-  autoConfig: { trees: Array<{ id: string; name: string; isPrimary?: boolean }> },
-  treeTotals: Map<string, { total: number; count: number }>,
-  buildTreeNodes: (roots: any[]) => any[]
-): Array<{ id: string; name: string; isPrimary: boolean; total: number; count: number; nodes: any[] }> {
-  const configIds = new Set(autoConfig.trees.map((t) => t.id));
-  const manualRoots = categories.filter((c) => !c.treeId || !configIds.has(c.treeId));
-  const trees: Array<{ id: string; name: string; isPrimary: boolean; total: number; count: number; nodes: any[] }> = [];
-
-  if (manualRoots.length > 0) {
-    trees.push({
-      id: "__manual__",
-      name: "Ручные категории",
-      isPrimary: true,
-      total: manualRoots.reduce((s, c) => s + subtreeStats(c, treeTotals).total, 0),
-      count: manualRoots.reduce((s, c) => s + subtreeStats(c, treeTotals).count, 0),
-      nodes: buildTreeNodes(manualRoots),
-    });
-  }
-
-  for (const treeCfg of autoConfig.trees) {
-    const roots = categories.filter((c) => c.treeId === treeCfg.id);
-    trees.push({
-      id: treeCfg.id,
-      name: treeCfg.name,
-      isPrimary: !!treeCfg.isPrimary,
-      total: roots.reduce((s, c) => s + subtreeStats(c, treeTotals).total, 0),
-      count: roots.reduce((s, c) => s + subtreeStats(c, treeTotals).count, 0),
-      nodes: buildTreeNodes(roots),
-    });
-  }
-
-  return trees;
-}
-
diff --git a/server/finance/contract-sync.ts b/server/finance/contract-sync.ts
deleted file mode 100644
index ed5abde..0000000
--- a/server/finance/contract-sync.ts
+++ /dev/null
@@ -1,369 +0,0 @@
-import { query } from "./db-client";
-import { getTableConfig } from "./table-config";
-import { storage } from "../storage";
-import { sql } from "drizzle-orm";
-import { db } from "../db";
-import { formatFieldValueForTitle, buildTableRowMap } from "../routes/shared";
-import { findCustomerByInn } from "./sync-utils";
-
-const LEGAL_ENTITY_FORM_ID = 7;
-const CUSTOMER_FORM_ID = 8;
-const OMEGA_PROM_NAME = "ОМЕГАПРОМ";
-
-export interface ParsedContract {
-  raw: string;
-  number: string;
-  date: string; // YYYY-MM-DD
-  inn: string;
-}
-
-export interface ContractSyncItem {
-  raw: string;
-  number: string;
-  date: string;
-  inn: string;
-  customerTaskId?: number;
-}
-
-export interface SyncApplyContract {
-  raw: string;
-  number: string;
-  date: string;
-  inn: string;
-  customerTaskId: number;
-}
-
-function parseDate(dateStr: string): string | null {
-  const match = dateStr.match(/^(\d{2})\.(\d{2})\.(\d{2,4})$/);
-  if (!match) return null;
-  const [, day, month, yearStr] = match;
-  let year = parseInt(yearStr, 10);
-  if (yearStr.length === 2) {
-    year = year >= 50 ? 1900 + year : 2000 + year;
-  }
-  return `${year}-${month}-${day}`;
-}
-
-export function parseContractString(raw: string): { number: string; date: string } | null {
-  const trimmed = raw.trim();
-  if (!trimmed) return null;
-
-  // Extract number: everything after № (with optional space) up to " от "
-  const numberMatch = trimmed.match(/№\s*([^\s].*?)\s+от\s/);
-  if (!numberMatch) return null;
-  const number = numberMatch[1].trim();
-
-  // Extract date: DD.MM.YY or DD.MM.YYYY
-  const dateMatch = trimmed.match(/(\d{2})\.(\d{2})\.(\d{2,4})/);
-  if (!dateMatch) return null;
-  const date = parseDate(`${dateMatch[1]}.${dateMatch[2]}.${dateMatch[3]}`);
-  if (!date) return null;
-
-  return { number, date };
-}
-
-export async function getUniqueFinanceContracts(): Promise<{
-  contracts: ParsedContract[];
-  skipped: number;
-}> {
-  const config = getTableConfig();
-  const result = await query(
-    `SELECT DISTINCT "dogovorzakazchika" as raw, "innzakazchika" as inn FROM "${config.incomeTable}" WHERE "dogovorzakazchika" IS NOT NULL AND "dogovorzakazchika" <> ''`
-  );
-
-  const contracts: ParsedContract[] = [];
-  let skipped = 0;
-  const seen = new Set<string>();
-
-  for (const row of result.rows) {
-    const raw = String(row.raw || "").trim();
-    const parsed = parseContractString(raw);
-    if (!parsed) {
-      skipped++;
-      continue;
-    }
-
-    const inn = row.inn ? String(row.inn).trim() : "";
-    if (!inn || inn === "0") {
-      skipped++;
-      continue;
-    }
-
-    const key = `${parsed.number}:${parsed.date}:${inn}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-
-    contracts.push({ raw, number: parsed.number, date: parsed.date, inn });
-  }
-
-  contracts.sort((a, b) => a.raw.localeCompare(b.raw));
-  return { contracts, skipped };
-}
-
-export async function findOmegaPromTaskId(organizationId: number): Promise<number | null> {
-  const result = await db.execute(sql`
-    SELECT id FROM tasks
-    WHERE form_id = ${LEGAL_ENTITY_FORM_ID}
-      AND organization_id = ${organizationId}
-      AND title ILIKE ${"%" + OMEGA_PROM_NAME + "%"}
-    ORDER BY id
-    LIMIT 1
-  `);
-  const rows = result.rows as Array<{ id: number }>;
-  return rows[0]?.id ?? null;
-}
-
-export async function findExistingContracts(
-  formId: number,
-  organizationId: number
-): Promise<Set<string>> {
-  const formFields = await storage.getFormFields(formId, organizationId);
-  const contractField = formFields.find((f) => f.type === "contract-number");
-  const customerField = formFields.find((f) => f.type === "task" && f.linkedFormId === CUSTOMER_FORM_ID);
-
-  if (!contractField || !customerField) {
-    return new Set();
-  }
-
-  const result = await db.execute(sql`
-    SELECT t.id
-    FROM tasks t
-    JOIN task_field_values v1 ON t.id = v1.task_id AND t.form_id = v1.form_id
-    JOIN task_field_values v2 ON t.id = v2.task_id AND t.form_id = v2.form_id
-    WHERE t.form_id = ${formId}
-      AND t.organization_id = ${organizationId}
-      AND v1.field_id = ${contractField.id}
-      AND v1.value IS NOT NULL
-      AND v2.field_id = ${customerField.id}
-      AND v2.value IS NOT NULL
-  `);
-
-  const existing = new Set<string>();
-  for (const row of result.rows as Array<{ id: number }>) {
-    // Load field values for this task
-    const values = await storage.getTaskFieldValues(row.id, organizationId);
-    const contractValue = values.find((v) => v.fieldId === contractField.id)?.value;
-    const customerValue = values.find((v) => v.fieldId === customerField.id)?.value;
-    if (contractValue && customerValue) {
-      try {
-        const parsed = typeof contractValue === "string" ? JSON.parse(contractValue) : contractValue;
-        const number = parsed?.value || "";
-        const customerId = String(customerValue).trim();
-        if (number && customerId) {
-          existing.add(`${number}:${customerId}`);
-        }
-      } catch {
-        // ignore parse errors
-      }
-    }
-  }
-  return existing;
-}
-
-export async function previewContractSync(
-  formId: number,
-  organizationId: number
-): Promise<{
-  auto: ContractSyncItem[];
-  ambiguous: Array<ContractSyncItem & { reason: string }>;
-  existing: ContractSyncItem[];
-  skipped: number;
-}> {
-  const { contracts, skipped } = await getUniqueFinanceContracts();
-  const omegaPromTaskId = await findOmegaPromTaskId(organizationId);
-  const existingContracts = await findExistingContracts(formId, organizationId);
-
-  const auto: ContractSyncItem[] = [];
-  const ambiguous: Array<ContractSyncItem & { reason: string }> = [];
-  const existing: ContractSyncItem[] = [];
-
-  for (const contract of contracts) {
-    const customerTaskId = await findCustomerByInn(contract.inn, organizationId);
-    const existingKey = `${contract.number}:${customerTaskId || ""}`;
-
-    if (existingContracts.has(existingKey)) {
-      existing.push(contract);
-      continue;
-    }
-
-    if (!omegaPromTaskId) {
-      ambiguous.push({ ...contract, reason: "Не найдено юр.лицо ОМЕГАПРОМ" });
-      continue;
-    }
-
-    if (!customerTaskId) {
-      ambiguous.push({ ...contract, reason: `Не найден заказчик по ИНН ${contract.inn}` });
-      continue;
-    }
-
-    auto.push({ ...contract, customerTaskId });
-  }
-
-  return { auto, ambiguous, existing, skipped };
-}
-
-export async function createContractTask(
-  formId: number,
-  organizationId: number,
-  createdBy: number,
-  contract: SyncApplyContract,
-  omegaPromTaskId: number
-): Promise<{ taskId: number; title: string }> {
-  const formFields = await storage.getFormFields(formId, organizationId);
-
-  const contractField = formFields.find((f) => f.type === "contract-number");
-  const dateField = formFields.find((f) => f.type === "date");
-  const customerField = formFields.find((f) => f.type === "task" && f.linkedFormId === CUSTOMER_FORM_ID);
-
-  if (!contractField) {
-    throw new Error("В форме не найдено поле типа contract-number");
-  }
-  if (!dateField) {
-    throw new Error("В форме не найдено поле типа date");
-  }
-  if (!customerField) {
-    throw new Error("В форме не найдено поле типа task, связанное с формой Заказчик");
-  }
-
-  const form = await storage.getForm(formId, organizationId);
-  if (!form) {
-    throw new Error("Форма не найдена");
-  }
-
-  let statuses = await storage.getFormStatuses(formId, organizationId);
-  if (statuses.length === 0) {
-    const defaultStatus = await storage.createFormStatus({
-      formId,
-      organizationId,
-      name: "Новый",
-      color: "#e5e7eb",
-      isInitial: true,
-      isFinal: false,
-      position: 0,
-    } as any);
-    statuses = [defaultStatus];
-  }
-  const initialStatus = statuses[0];
-
-  // Build title from template or fallback
-  const title = form.titleTemplate
-    ? contract.number
-    : `Договор №${contract.number}`;
-
-  // Extract parentTaskId from contract-number field
-  const contractValue = JSON.stringify({
-    mode: "theirs",
-    value: contract.number,
-    legalEntityTaskId: omegaPromTaskId,
-  });
-
-  const task = await storage.createTask({
-    title,
-    formId,
-    organizationId,
-    createdBy,
-    currentStatusId: initialStatus.id,
-    description: null,
-    assignedTo: null,
-    dueDate: null,
-    completedAt: null,
-    parentTaskId: omegaPromTaskId,
-  } as any);
-
-  // Insert field values
-  const fieldValues = [
-    { fieldId: contractField.id, value: contractValue },
-    { fieldId: dateField.id, value: contract.date },
-    { fieldId: customerField.id, value: String(contract.customerTaskId) },
-  ];
-
-  for (const { fieldId, value } of fieldValues) {
-    await storage.createTaskFieldValue({
-      taskId: task.id,
-      fieldId,
-      formId,
-      value,
-    });
-  }
-
-  // Create task relation for customer field if needed
-  if (customerField.taskRelationType) {
-    if (customerField.taskRelationType === "parent") {
-      await storage.upsertTaskRelation({
-        parentTaskId: contract.customerTaskId,
-        childTaskId: task.id,
-        fieldId: customerField.id,
-        organizationId,
-      });
-    } else if (customerField.taskRelationType === "child") {
-      await storage.upsertTaskRelation({
-        parentTaskId: task.id,
-        childTaskId: contract.customerTaskId,
-        fieldId: customerField.id,
-        organizationId,
-      });
-    }
-  }
-
-  // Recalculate title if template exists
-  if (form.titleTemplate) {
-    const [allFormFields, savedValues, titleStatuses, titleUsers, titleRoles] = await Promise.all([
-      storage.getFormFields(formId, organizationId),
-      storage.getTaskFieldValues(task.id, organizationId),
-      storage.getFormStatuses(formId, organizationId),
-      storage.getUsersByOrganization(organizationId),
-      storage.getRoles(organizationId),
-    ]);
-    const fieldCodeMap = new Map(allFormFields.map((f) => [f.code, f]));
-    const valueByFieldId = new Map(savedValues.map((v) => [v.fieldId, v.value]));
-    const usersMap = new Map(titleUsers.map((u) => [u.id, u]));
-    const rolesMap = new Map(titleRoles.map((r) => [r.id, r]));
-
-    const { buildSystemFieldValues } = await import("../routes/shared");
-    const sysValues = await buildSystemFieldValues(task, organizationId, { statuses: titleStatuses, usersMap });
-    const tableRowMap = await buildTableRowMap(allFormFields, organizationId);
-    const computedTitle = form.titleTemplate.replace(/\{\{([^}]+)\}\}/g, (_, code: string) => {
-      if (sysValues.has(code)) return sysValues.get(code)!;
-      const fld = fieldCodeMap.get(code);
-      if (!fld) return "";
-      const val = valueByFieldId.get(fld.id);
-      return val === null || val === undefined ? "" : formatFieldValueForTitle(val, fld.type, { usersMap, rolesMap, tableRowMap }, fld.options);
-    });
-    await storage.updateTask(task.id, organizationId, { title: computedTitle });
-  }
-
-  return { taskId: task.id, title };
-}
-
-export async function applyContractSync(
-  formId: number,
-  organizationId: number,
-  createdBy: number,
-  contracts: SyncApplyContract[]
-): Promise<{ created: number; skipped: number; errors: Array<{ raw: string; error: string }> }> {
-  const omegaPromTaskId = await findOmegaPromTaskId(organizationId);
-  if (!omegaPromTaskId) {
-    throw new Error("Не найдено юр.лицо ОМЕГАПРОМ");
-  }
-
-  const existingContracts = await findExistingContracts(formId, organizationId);
-  let created = 0;
-  let skipped = 0;
-  const errors: Array<{ raw: string; error: string }> = [];
-
-  for (const contract of contracts) {
-    try {
-      const key = `${contract.number}:${contract.customerTaskId}`;
-      if (existingContracts.has(key)) {
-        skipped++;
-        continue;
-      }
-      await createContractTask(formId, organizationId, createdBy, contract, omegaPromTaskId);
-      created++;
-    } catch (err: any) {
-      errors.push({ raw: contract.raw, error: err.message || "Ошибка создания" });
-    }
-  }
-
-  return { created, skipped, errors };
-}
diff --git a/server/finance/customer-sync.ts b/server/finance/customer-sync.ts
deleted file mode 100644
index 4d3c776..0000000
--- a/server/finance/customer-sync.ts
+++ /dev/null
@@ -1,402 +0,0 @@
-import { query } from "./db-client";
-import { getTableConfig } from "./table-config";
-import { storage } from "../storage";
-import { decrypt } from "../crypto";
-import { sql } from "drizzle-orm";
-import { db } from "../db";
-import { formatFieldValueForTitle, buildTableRowMap } from "../routes/shared";
-import { findCustomerByInn } from "./sync-utils";
-
-export interface DadataCompany {
-  value: string;
-  data: {
-    inn: string;
-    kpp: string;
-    ogrn: string;
-    name: {
-      full_with_opf: string;
-      short_with_opf: string;
-    };
-    management?: {
-      name: string;
-      post: string;
-    };
-    address?: {
-      value: string;
-    };
-    state?: {
-      status: string;
-    };
-  };
-}
-
-export interface SyncPreviewItem {
-  name: string;
-  inn: string;
-  suggestions: DadataCompany[];
-}
-
-export interface SyncApplyCustomer {
-  name: string;
-  inn: string;
-  selectedDadata?: DadataCompany;
-}
-
-const OPF_LIST = ["ООО", "АО", "ПАО", "ЗАО", "ОАО", "ИП"];
-
-function cleanCompanyName(name: string): string {
-  let cleaned = name.trim();
-
-  // Remove OPF from beginning with space after (e.g. "ООО Ромашка")
-  for (const opf of OPF_LIST) {
-    const regex = new RegExp(`^${opf}\\s+`, "i");
-    cleaned = cleaned.replace(regex, "");
-  }
-
-  // Cut everything from first occurrence of " OPF" (e.g. "АВТОДОК-СЕТЬ ООО ЭДО СБИС")
-  for (const opf of OPF_LIST) {
-    const idx = cleaned.toUpperCase().indexOf(` ${opf}`);
-    if (idx !== -1) {
-      cleaned = cleaned.substring(0, idx).trim();
-      break;
-    }
-  }
-
-  // Remove quotes
-  cleaned = cleaned.replace(/["']/g, "").trim();
-
-  return cleaned;
-}
-
-function normalizeInn(inn: string): string {
-  return inn.trim().toLowerCase();
-}
-
-function isValidInn(inn: string): boolean {
-  const trimmed = inn.trim();
-  if (!trimmed || trimmed === "0" || trimmed === "") return false;
-  return /^\d{10,12}$/.test(trimmed);
-}
-
-function getDadataValue(company: DadataCompany, key: string): string {
-  switch (key) {
-    case "name.full_with_opf":
-      return company.data.name?.full_with_opf || "";
-    case "name.short_with_opf":
-      return company.data.name?.short_with_opf || "";
-    case "inn":
-      return company.data.inn || "";
-    case "kpp":
-      return company.data.kpp || "";
-    case "ogrn":
-      return company.data.ogrn || "";
-    case "management.name":
-      return company.data.management?.name || "";
-    case "management.post":
-      return company.data.management?.post || "";
-    default:
-      return "";
-  }
-}
-
-export interface FinanceCustomer {
-  name: string;
-  inn: string;
-}
-
-export async function getUniqueFinanceCustomers(): Promise<{
-  customers: FinanceCustomer[];
-  skipped: number;
-}> {
-  const config = getTableConfig();
-  const incomeResult = await query(
-    `SELECT DISTINCT "zakazchik" as name, "innzakazchika" as inn FROM "${config.incomeTable}" WHERE "zakazchik" IS NOT NULL AND "zakazchik" <> ''`
-  );
-
-  const customers: FinanceCustomer[] = [];
-  let skipped = 0;
-  const seenInns = new Set<string>();
-
-  for (const row of incomeResult.rows) {
-    const rawInn = row.inn ? String(row.inn).trim() : "";
-    if (!isValidInn(rawInn)) {
-      skipped++;
-      continue;
-    }
-    const inn = normalizeInn(rawInn);
-    if (seenInns.has(inn)) continue;
-    seenInns.add(inn);
-    customers.push({
-      name: cleanCompanyName(row.name || ""),
-      inn,
-    });
-  }
-
-  customers.sort((a, b) => a.inn.localeCompare(b.inn));
-  return { customers, skipped };
-}
-
-export async function findExistingCustomerInns(
-  formId: number,
-  organizationId: number
-): Promise<Set<string>> {
-  const formFields = await storage.getFormFields(formId, organizationId);
-  const companyField = formFields.find((f) => f.type === "company");
-  if (!companyField || !companyField.companyAutofill) {
-    // Fallback: compare by name if no INN field configured
-    return new Set();
-  }
-
-  const autofill = companyField.companyAutofill as Record<string, string>;
-  const innFieldCode = autofill["inn"];
-  if (!innFieldCode) {
-    return new Set();
-  }
-
-  const innField = formFields.find((f) => f.code === innFieldCode);
-  if (!innField) {
-    return new Set();
-  }
-
-  const result = await db.execute(sql`
-    SELECT DISTINCT LOWER(TRIM(value #>> '{}')) as inn
-    FROM task_field_values
-    WHERE form_id = ${formId} AND field_id = ${innField.id} AND value IS NOT NULL AND TRIM(value #>> '{}') <> ''
-  `);
-  const existing = new Set<string>();
-  for (const row of result.rows as Array<{ inn: string }>) {
-    if (row.inn) existing.add(normalizeInn(row.inn));
-  }
-  return existing;
-}
-
-async function getDadataApiKey(organizationId: number): Promise<string | null> {
-  const orgService = await storage.getExternalServiceByType("dadata", organizationId);
-  if (orgService && orgService.apiKey) {
-    return decrypt(orgService.apiKey);
-  }
-  return process.env.DADATA_API_KEY || null;
-}
-
-export async function resolveCompanyViaDadata(
-  queryStr: string,
-  organizationId: number
-): Promise<DadataCompany[]> {
-  const apiKey = await getDadataApiKey(organizationId);
-  if (!apiKey) {
-    return [];
-  }
-
-  const response = await fetch("https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/party", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Accept: "application/json",
-      Authorization: `Token ${apiKey}`,
-    },
-    body: JSON.stringify({ query: queryStr, count: 10 }),
-  });
-
-  if (!response.ok) {
-    console.error("Dadata API error:", await response.text());
-    return [];
-  }
-
-  const data = (await response.json()) as { suggestions: DadataCompany[] };
-  return data.suggestions || [];
-}
-
-export async function buildCustomFields(
-  formId: number,
-  organizationId: number,
-  company: DadataCompany
-): Promise<{ title: string; customFields: Record<string, string> }> {
-  const formFields = await storage.getFormFields(formId, organizationId);
-  const companyField = formFields.find((f) => f.type === "company");
-  if (!companyField) {
-    throw new Error(`В форме ${formId} не найдено поле типа company`);
-  }
-
-  const cleanValue = cleanCompanyName(company.value);
-  const customFields: Record<string, string> = {};
-  customFields[`customField_${companyField.id}`] = cleanValue;
-
-  if (companyField.companyAutofill && typeof companyField.companyAutofill === "object") {
-    const autofill = companyField.companyAutofill as Record<string, string>;
-    for (const [dadataKey, targetFieldCode] of Object.entries(autofill)) {
-      if (!targetFieldCode || targetFieldCode === "none") continue;
-      const targetField = formFields.find((f) => f.code === targetFieldCode);
-      if (targetField) {
-        const value = getDadataValue(company, dadataKey);
-        customFields[`customField_${targetField.id}`] = value;
-      }
-    }
-  }
-
-  const title = cleanCompanyName(company.data.name?.short_with_opf || company.value);
-  return { title, customFields };
-}
-
-export async function createCustomerTask(
-  formId: number,
-  organizationId: number,
-  createdBy: number,
-  company: DadataCompany
-): Promise<{ taskId: number; title: string }> {
-  const { title, customFields } = await buildCustomFields(formId, organizationId, company);
-
-  const form = await storage.getForm(formId, organizationId);
-  if (!form) {
-    throw new Error("Форма не найдена");
-  }
-
-  const statuses = await storage.getFormStatuses(formId, organizationId);
-  const initialStatus = statuses[0];
-  if (!initialStatus) {
-    throw new Error("У формы нет ни одного статуса");
-  }
-
-  const task = await storage.createTask({
-    title,
-    formId,
-    organizationId,
-    createdBy,
-    currentStatusId: initialStatus.id,
-    description: null,
-    assignedTo: null,
-    dueDate: null,
-    completedAt: null,
-    parentTaskId: null,
-  } as any);
-
-  const fieldMap = new Map((await storage.getFormFields(formId, organizationId)).map((f) => [f.id, f]));
-  for (const [fieldKey, value] of Object.entries(customFields)) {
-    const match = fieldKey.match(/^customField_(\d+)$/);
-    if (!match) continue;
-    const fieldId = parseInt(match[1]);
-    const field = fieldMap.get(fieldId);
-    if (!field) continue;
-
-    await storage.createTaskFieldValue({
-      taskId: task.id,
-      fieldId,
-      formId,
-      value,
-    });
-  }
-
-  if (form.titleTemplate) {
-    const [allFormFields, savedValues, titleStatuses, titleUsers, titleRoles] = await Promise.all([
-      storage.getFormFields(formId, organizationId),
-      storage.getTaskFieldValues(task.id, organizationId),
-      storage.getFormStatuses(formId, organizationId),
-      storage.getUsersByOrganization(organizationId),
-      storage.getRoles(organizationId),
-    ]);
-    const fieldCodeMap = new Map(allFormFields.map((f) => [f.code, f]));
-    const valueByFieldId = new Map(savedValues.map((v) => [v.fieldId, v.value]));
-    const usersMap = new Map(titleUsers.map((u) => [u.id, u]));
-    const rolesMap = new Map(titleRoles.map((r) => [r.id, r]));
-
-    const { buildSystemFieldValues } = await import("../routes/shared");
-    const sysValues = await buildSystemFieldValues(task, organizationId, { statuses: titleStatuses, usersMap });
-    const tableRowMap = await buildTableRowMap(allFormFields, organizationId);
-    const computedTitle = form.titleTemplate.replace(/\{\{([^}]+)\}\}/g, (_, code: string) => {
-      if (sysValues.has(code)) return sysValues.get(code)!;
-      const fld = fieldCodeMap.get(code);
-      if (!fld) return "";
-      const val = valueByFieldId.get(fld.id);
-      return val === null || val === undefined ? "" : formatFieldValueForTitle(val, fld.type, { usersMap, rolesMap, tableRowMap }, fld.options);
-    });
-    await storage.updateTask(task.id, organizationId, { title: computedTitle });
-  }
-
-  return { taskId: task.id, title };
-}
-
-function matchByName(suggestions: DadataCompany[], customerName: string): DadataCompany | null {
-  const target = cleanCompanyName(customerName).toUpperCase();
-  const matches = suggestions.filter((s) => {
-    const candidate = cleanCompanyName(s.value).toUpperCase();
-    return candidate === target;
-  });
-  if (matches.length === 1) return matches[0];
-  return null;
-}
-
-export async function previewCustomerSync(
-  formId: number,
-  organizationId: number
-): Promise<{
-  auto: Array<{ name: string; inn: string; company: DadataCompany }>;
-  ambiguous: SyncPreviewItem[];
-  existing: Array<{ name: string; inn: string }>;
-  skipped: number;
-}> {
-  const { customers, skipped } = await getUniqueFinanceCustomers();
-  const existingInns = await findExistingCustomerInns(formId, organizationId);
-
-  const auto: Array<{ name: string; inn: string; company: DadataCompany }> = [];
-  const ambiguous: SyncPreviewItem[] = [];
-  const existing: Array<{ name: string; inn: string }> = [];
-
-  for (const customer of customers) {
-    if (existingInns.has(customer.inn)) {
-      existing.push(customer);
-      continue;
-    }
-
-    let suggestions = await resolveCompanyViaDadata(customer.inn, organizationId);
-
-    // Filter by exact INN match — DaData sometimes returns similar INNs (e.g. 10-digit vs 12-digit)
-    suggestions = suggestions.filter((s) => normalizeInn(s.data.inn || "") === customer.inn);
-
-    if (suggestions.length === 1) {
-      auto.push({ name: customer.name, inn: customer.inn, company: suggestions[0] });
-    } else if (suggestions.length > 1) {
-      const matched = matchByName(suggestions, customer.name);
-      if (matched) {
-        auto.push({ name: customer.name, inn: customer.inn, company: matched });
-      } else {
-        ambiguous.push({ name: customer.name, inn: customer.inn, suggestions });
-      }
-    } else {
-      ambiguous.push({ name: customer.name, inn: customer.inn, suggestions: [] });
-    }
-  }
-
-  return { auto, ambiguous, existing, skipped };
-}
-
-export async function applyCustomerSync(
-  formId: number,
-  organizationId: number,
-  createdBy: number,
-  customers: SyncApplyCustomer[]
-): Promise<{ created: number; skipped: number; errors: Array<{ name: string; inn: string; error: string }> }> {
-  let created = 0;
-  let skipped = 0;
-  const errors: Array<{ name: string; inn: string; error: string }> = [];
-
-  for (const customer of customers) {
-    try {
-      const company = customer.selectedDadata;
-      if (!company) {
-        errors.push({ name: customer.name, inn: customer.inn, error: "Не выбрана компания" });
-        continue;
-      }
-      // Guard against duplicates: re-check INN before creating
-      const existingId = await findCustomerByInn(customer.inn, organizationId);
-      if (existingId) {
-        skipped++;
-        continue;
-      }
-      await createCustomerTask(formId, organizationId, createdBy, company);
-      created++;
-    } catch (err: any) {
-      errors.push({ name: customer.name, inn: customer.inn, error: err.message || "Ошибка создания" });
-    }
-  }
-
-  return { created, skipped, errors };
-}
diff --git a/server/finance/debt.ts b/server/finance/debt.ts
deleted file mode 100644
index 622f779..0000000
--- a/server/finance/debt.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import * as cache from "./cache";
-import { getTableConfig } from "./table-config";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-// =====================
-// Дебиторская задолженность (перенесено из Data-Insight2)
-// =====================
-
-function getDebtTable(): string {
-  return getTableConfig().debtTable || "vw_debt_active";
-}
-
-async function getMaxPeriod(): Promise<string> {
-  const cacheKey = "debt:__max_period__";
-  const cached = cache.get<string>(cacheKey);
-  if (cached) return cached;
-  const res = await query(`SELECT MAX(period) as mp FROM ${getDebtTable()}`);
-  const mp = res.rows[0]?.mp ? new Date(res.rows[0].mp).toISOString() : new Date().toISOString();
-  cache.set(cacheKey, mp);
-  return mp;
-}
-
-function parseDate(d: unknown): string | null {
-  if (!d) return null;
-  return new Date(d as string).toISOString();
-}
-
-async function buildDebtWhere(req: any) {
-  const { period, klassprosrochki, kontragent, dogovor, otvetstvennii } = req.query;
-  const conditions: string[] = [];
-  const params: unknown[] = [];
-
-  if (period) { params.push(period); conditions.push(`period = $${params.length}`); }
-  else { const mp = await getMaxPeriod(); params.push(mp); conditions.push(`period = $${params.length}`); }
-
-  if (klassprosrochki) {
-    const arr = String(klassprosrochki).split(",").filter(Boolean);
-    if (arr.length > 0) {
-      const placeholders = arr.map(v => { params.push(v); return `$${params.length}`; });
-      conditions.push(`klassprosrochki IN (${placeholders.join(",")})`);
-    }
-  }
-  if (kontragent) {
-    const arr = String(kontragent).split(",").filter(Boolean);
-    if (arr.length > 0) {
-      const placeholders = arr.map(v => { params.push(v); return `$${params.length}`; });
-      conditions.push(`kontragent IN (${placeholders.join(",")})`);
-    }
-  }
-  if (dogovor) {
-    params.push(`%${dogovor}%`);
-    conditions.push(`dogovor ILIKE $${params.length}`);
-  }
-  if (otvetstvennii) {
-    const arr = String(otvetstvennii).split(",").filter(Boolean);
-    if (arr.length > 0) {
-      const placeholders = arr.map(v => { params.push(v); return `$${params.length}`; });
-      conditions.push(`otvetstvennii IN (${placeholders.join(",")})`);
-    }
-  }
-
-  return { where: `WHERE ${conditions.join(" AND ")}`, params };
-}
-
-const OVERDUE_CLASSES = ["0", "1-30", "31-60", "61-90", "91-365", "> 365"];
-
-function classKey(cls: string | null): string {
-  if (!cls || cls === "0") return "cls0";
-  if (cls === "1-30") return "cls1_30";
-  if (cls === "31-60") return "cls31_60";
-  if (cls === "61-90") return "cls61_90";
-  if (cls === "91-365") return "cls91_365";
-  return "cls365plus";
-}
-
-function debtCacheKey(prefix: string, queryParams: Record<string, unknown>): string {
-  return `${prefix}:${JSON.stringify(queryParams)}`;
-}
-
-export function registerDebtRoutes(app: Express) {
-  app.get("/api/debt/analytics", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const cacheKey = debtCacheKey("debt:analytics", req.query as Record<string, unknown>);
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { where, params } = await buildDebtWhere(req);
-      const { page = "1", pageSize = "20" } = req.query;
-      const pg = Number(page);
-      const ps = Math.min(Number(pageSize), 100);
-      const offset = (pg - 1) * ps;
-
-      const [summaryRes, byKontragentRes, byManagerRes, byClassRes, totalRes, updatedRes, pagedKontragentsRes] = await Promise.all([
-        query(`SELECT COALESCE(SUM(summadolga),0) as total_debt, COALESCE(SUM(summaprosrocheno),0) as total_overdue FROM ${getDebtTable()} ${where}`, params),
-        query(`SELECT kontragent, klassprosrochki, COALESCE(SUM(summadolga),0) as total FROM ${getDebtTable()} ${where} GROUP BY kontragent, klassprosrochki`, params),
-        query(`SELECT otvetstvennii, klassprosrochki, COALESCE(SUM(summadolga),0) as total FROM ${getDebtTable()} ${where} GROUP BY otvetstvennii, klassprosrochki`, params),
-        query(`SELECT CASE WHEN klassprosrochki IS NULL OR klassprosrochki = '0' THEN 'Не просрочено' ELSE klassprosrochki END as cls, COALESCE(SUM(summadolga),0) as total FROM ${getDebtTable()} ${where} GROUP BY cls ORDER BY total DESC`, params),
-        query(`SELECT COUNT(DISTINCT kontragent) as cnt FROM ${getDebtTable()} ${where}`, params),
-        query(`SELECT MAX(dataobnovleniyazapisi) as updated_at FROM ${getDebtTable()} ${where}`, params),
-        query(`SELECT kontragent, COALESCE(SUM(summadolga),0) as total_debt, COALESCE(SUM(summaprosrocheno),0) as total_overdue FROM ${getDebtTable()} ${where} GROUP BY kontragent ORDER BY total_debt DESC LIMIT ${ps} OFFSET ${offset}`, params),
-      ]);
-
-      const kontragentMap = new Map<string, any>();
-      byKontragentRes.rows.forEach((r: any) => {
-        const name = r.kontragent || "Без контрагента";
-        if (!kontragentMap.has(name)) kontragentMap.set(name, { name, total: 0, cls0: 0, cls1_30: 0, cls31_60: 0, cls61_90: 0, cls91_365: 0, cls365plus: 0 });
-        const entry = kontragentMap.get(name)!;
-        const val = Number(r.total);
-        entry.total += val;
-        entry[classKey(r.klassprosrochki)] += val;
-      });
-      const byKontragent = Array.from(kontragentMap.values()).sort((a, b) => b.total - a.total).slice(0, 10);
-
-      const managerMap = new Map<string, any>();
-      byManagerRes.rows.forEach((r: any) => {
-        const name = r.otvetstvennii && r.otvetstvennii !== "0" ? r.otvetstvennii : "Не назначен";
-        if (!managerMap.has(name)) managerMap.set(name, { name, total: 0, cls0: 0, cls1_30: 0, cls31_60: 0, cls61_90: 0, cls91_365: 0, cls365plus: 0 });
-        const entry = managerMap.get(name)!;
-        const val = Number(r.total);
-        entry.total += val;
-        entry[classKey(r.klassprosrochki)] += val;
-      });
-      const byManager = Array.from(managerMap.values()).sort((a, b) => b.total - a.total).slice(0, 10);
-
-      const byOverdueClass = byClassRes.rows.map((r: any) => ({ cls: r.cls, total: Number(r.total) }));
-
-      const pagedKontragentNames = pagedKontragentsRes.rows.map((r: any) => r.kontragent);
-      let pagedGroups: any[] = [];
-      const totalKontragents = Number(totalRes.rows[0].cnt);
-
-      if (pagedKontragentNames.length > 0) {
-        const detailParams = [...params];
-        const namePlaceholders = pagedKontragentNames.map((n: string) => { detailParams.push(n); return `$${detailParams.length}`; });
-        const detailRes = await query(`
-          SELECT kontragent, dogovor, COALESCE(summadokumenta,0) as summadokumenta, dokumentraschetov,
-                 COALESCE(summaoplacheno,0) as summaoplacheno, COALESCE(summadolga,0) as summadolga,
-                 COALESCE(summaprosrocheno,0) as summaprosrocheno, COALESCE(otsrochkapodogovoru,0) as otsrochkapodogovoru,
-                 COALESCE(dneiprosrocheno,0) as dneiprosrocheno
-          FROM ${getDebtTable()} ${where} AND kontragent IN (${namePlaceholders.join(",")})
-          ORDER BY kontragent, summadolga DESC
-        `, detailParams);
-
-        const groupMap = new Map<string, { kontragent: string; totalDebt: number; totalOverdue: number; rows: any[] }>();
-        pagedKontragentsRes.rows.forEach((r: any) => {
-          groupMap.set(r.kontragent, { kontragent: r.kontragent, totalDebt: Number(r.total_debt), totalOverdue: Number(r.total_overdue), rows: [] });
-        });
-        detailRes.rows.forEach((r: any) => {
-          const g = groupMap.get(r.kontragent);
-          if (g) {
-            g.rows.push({
-              dogovor: r.dogovor || "",
-              summadokumenta: Number(r.summadokumenta),
-              dokumentraschetov: r.dokumentraschetov || "",
-              summaoplacheno: Number(r.summaoplacheno),
-              summadolga: Number(r.summadolga),
-              summaprosrocheno: Number(r.summaprosrocheno),
-              otsrochkapodogovoru: Number(r.otsrochkapodogovoru),
-              dneiprosrocheno: Number(r.dneiprosrocheno),
-            });
-          }
-        });
-        pagedGroups = pagedKontragentsRes.rows.map((r: any) => groupMap.get(r.kontragent)!);
-      }
-
-      const result = {
-        success: true,
-        summary: {
-          updatedAt: updatedRes.rows[0]?.updated_at ? parseDate(updatedRes.rows[0].updated_at) : null,
-          totalDebt: Number(summaryRes.rows[0].total_debt),
-          totalOverdue: Number(summaryRes.rows[0].total_overdue),
-        },
-        byKontragent,
-        byManager,
-        byOverdueClass,
-        table: {
-          rows: pagedGroups,
-          total: totalKontragents,
-          page: pg,
-          pageSize: ps,
-          totalPages: Math.ceil(totalKontragents / ps),
-        },
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[debt/analytics]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/debt/dynamics", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const cacheKey = debtCacheKey("debt:dynamics", req.query as Record<string, unknown>);
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { dateFrom, dateTo, kontragent } = req.query;
-      const conditions: string[] = [];
-      const params: unknown[] = [];
-
-      if (dateFrom) { params.push(dateFrom); conditions.push(`period >= $${params.length}`); }
-      if (dateTo) { params.push(dateTo); conditions.push(`period <= $${params.length}`); }
-      if (kontragent) { params.push(kontragent); conditions.push(`kontragent = $${params.length}`); }
-
-      const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-
-      const dbResult = await query(`
-        SELECT period, COALESCE(SUM(summadolga),0) as total_debt, COALESCE(SUM(summaprosrocheno),0) as total_overdue
-        FROM ${getDebtTable()} ${where}
-        GROUP BY period
-        ORDER BY period
-      `, params);
-
-      let rows = dbResult.rows.map((r: any) => ({
-        period: parseDate(r.period),
-        totalDebt: Number(r.total_debt),
-        totalOverdue: Number(r.total_overdue),
-      }));
-
-      if (rows.length > 300) {
-        const step = Math.ceil(rows.length / 300);
-        rows = rows.filter((_: any, i: number) => i % step === 0 || i === rows.length - 1);
-      }
-
-      const result = { success: true, rows };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[debt/dynamics]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/debt/dynamics/kontragenty", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const cacheKey = debtCacheKey("debt:dyn-kontr", req.query as Record<string, unknown>);
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { period, dateTo } = req.query;
-      const params: unknown[] = [];
-      let periodClause: string;
-
-      if (period) {
-        params.push(period);
-        periodClause = `period = $${params.length}`;
-      } else if (dateTo) {
-        params.push(dateTo);
-        periodClause = `period = (SELECT MAX(period) FROM ${getDebtTable()} WHERE period <= $${params.length})`;
-      } else {
-        const mp = await getMaxPeriod();
-        params.push(mp);
-        periodClause = `period = $${params.length}`;
-      }
-
-      const where = `WHERE ${periodClause}`;
-
-      const dbResult = await query(`
-        SELECT kontragent, COALESCE(SUM(summadokumenta),0) as summadokumenta, COALESCE(SUM(summaoplacheno),0) as summaoplacheno,
-               COALESCE(SUM(summadolga),0) as summadolga, COALESCE(SUM(summaprosrocheno),0) as summaprosrocheno,
-               MAX(dneiprosrocheno) as dneiprosrocheno
-        FROM ${getDebtTable()} ${where}
-        GROUP BY kontragent ORDER BY summadolga DESC
-      `, params);
-
-      const result = {
-        success: true,
-        rows: dbResult.rows.map((r: any) => ({
-          kontragent: r.kontragent,
-          summadokumenta: Number(r.summadokumenta),
-          summaoplacheno: Number(r.summaoplacheno),
-          summadolga: Number(r.summadolga),
-          summaprosrocheno: Number(r.summaprosrocheno),
-          dneiprosrocheno: Number(r.dneiprosrocheno),
-        })),
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[debt/dynamics/kontragenty]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/debt/filters", authenticateToken, requirePermission('finance.manage'), async (_req: AuthenticatedRequest, res) => {
-    try {
-      const cacheKey = "debt:filters";
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const maxPeriod = await getMaxPeriod();
-      const [periods, klassprosrochki, organizaciya, otvetstvennii, kontragenty] = await Promise.all([
-        query(`SELECT DISTINCT period FROM ${getDebtTable()} ORDER BY period DESC LIMIT 30`),
-        query(`SELECT DISTINCT klassprosrochki FROM ${getDebtTable()} WHERE klassprosrochki IS NOT NULL ORDER BY klassprosrochki`),
-        query(`SELECT DISTINCT organizaciya FROM ${getDebtTable()} WHERE organizaciya IS NOT NULL ORDER BY organizaciya`),
-        query(`SELECT DISTINCT otvetstvennii FROM ${getDebtTable()} WHERE period = $1 AND otvetstvennii IS NOT NULL AND otvetstvennii != '0' ORDER BY otvetstvennii`, [maxPeriod]),
-        query(`SELECT DISTINCT kontragent FROM ${getDebtTable()} WHERE period = $1 AND kontragent IS NOT NULL ORDER BY kontragent`, [maxPeriod]),
-      ]);
-      const result = {
-        success: true,
-        filters: {
-          periods: periods.rows.map(r => parseDate(r.period)),
-          klassprosrochki: klassprosrochki.rows.map(r => r.klassprosrochki),
-          organizaciya: organizaciya.rows.map(r => r.organizaciya),
-          otvetstvennii: otvetstvennii.rows.map(r => r.otvetstvennii),
-          kontragenty: kontragenty.rows.map(r => r.kontragent),
-        },
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      console.error("[debt/filters]", err);
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
diff --git a/server/finance/google-sheets.ts b/server/finance/google-sheets.ts
deleted file mode 100644
index bcbd0da..0000000
--- a/server/finance/google-sheets.ts
+++ /dev/null
@@ -1,494 +0,0 @@
-import { type Express } from "express";
-import { google } from "googleapis";
-import { readFileSync, writeFileSync, existsSync, unlinkSync, mkdirSync } from "fs";
-import { resolve, dirname } from "path";
-import { query, getPoolClient } from "./db-client";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-// =====================
-// Google OAuth + участки + синхронизация зарплат (перенесено из Data-Insight2)
-// =====================
-
-const TOKENS_PATH = resolve(process.cwd(), "data", "google-tokens.json");
-const SCOPES = [
-  "https://www.googleapis.com/auth/spreadsheets.readonly",
-  "https://www.googleapis.com/auth/userinfo.email",
-];
-
-function getRedirectUri(): string {
-  return process.env.FINANCE_GOOGLE_REDIRECT_URI || "https://iistwin.ru/api/finance/google/callback";
-}
-
-function createOAuth2Client() {
-  return new google.auth.OAuth2(
-    process.env.GOOGLE_CLIENT_ID,
-    process.env.GOOGLE_CLIENT_SECRET,
-    getRedirectUri()
-  );
-}
-
-interface StoredTokens {
-  access_token: string;
-  refresh_token?: string;
-  expiry_date?: number;
-  token_type?: string;
-  scope?: string;
-  email?: string;
-}
-
-function loadTokens(): StoredTokens | null {
-  try {
-    if (existsSync(TOKENS_PATH)) {
-      return JSON.parse(readFileSync(TOKENS_PATH, "utf-8"));
-    }
-  } catch {}
-  return null;
-}
-
-function saveTokens(tokens: StoredTokens): void {
-  const dir = dirname(TOKENS_PATH);
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(TOKENS_PATH, JSON.stringify(tokens, null, 2), "utf-8");
-}
-
-function clearTokens(): void {
-  try {
-    if (existsSync(TOKENS_PATH)) unlinkSync(TOKENS_PATH);
-  } catch {}
-}
-
-export function getAuthUrl(): string {
-  const client = createOAuth2Client();
-  return client.generateAuthUrl({
-    access_type: "offline",
-    scope: SCOPES,
-    prompt: "consent",
-  });
-}
-
-async function handleCallback(code: string): Promise<{ email?: string }> {
-  const client = createOAuth2Client();
-  const { tokens } = await client.getToken(code);
-
-  client.setCredentials(tokens);
-  let email: string | undefined;
-  try {
-    const oauth2 = google.oauth2({ version: "v2", auth: client });
-    const userInfo = await oauth2.userinfo.get();
-    email = userInfo.data.email || undefined;
-  } catch {}
-
-  saveTokens({
-    access_token: tokens.access_token!,
-    refresh_token: tokens.refresh_token || undefined,
-    expiry_date: tokens.expiry_date || undefined,
-    token_type: tokens.token_type || undefined,
-    scope: tokens.scope || undefined,
-    email,
-  });
-
-  return { email };
-}
-
-export function getAuthStatus(): { loggedIn: boolean; email?: string } {
-  const tokens = loadTokens();
-  if (!tokens?.access_token) return { loggedIn: false };
-  return { loggedIn: true, email: tokens.email };
-}
-
-export async function getAuthenticatedClient() {
-  const tokens = loadTokens();
-  if (!tokens?.access_token) throw new Error("Не авторизован в Google");
-
-  const client = createOAuth2Client();
-  client.setCredentials({
-    access_token: tokens.access_token,
-    refresh_token: tokens.refresh_token,
-    expiry_date: tokens.expiry_date,
-  });
-
-  const needsRefresh = tokens.expiry_date
-    ? tokens.expiry_date < Date.now() + 60000
-    : false;
-
-  if (needsRefresh && tokens.refresh_token) {
-    try {
-      const { credentials } = await client.refreshAccessToken();
-      client.setCredentials(credentials);
-      saveTokens({
-        ...tokens,
-        access_token: credentials.access_token!,
-        expiry_date: credentials.expiry_date || undefined,
-      });
-    } catch (err) {
-      clearTokens();
-      throw new Error("Токен Google истёк. Пожалуйста, войдите заново.");
-    }
-  }
-
-  client.on("tokens", (newTokens: any) => {
-    const current = loadTokens();
-    if (current && newTokens.access_token) {
-      saveTokens({
-        ...current,
-        access_token: newTokens.access_token,
-        expiry_date: newTokens.expiry_date || current.expiry_date,
-        refresh_token: newTokens.refresh_token || current.refresh_token,
-      });
-    }
-  });
-
-  return client;
-}
-
-async function getSheetNames(spreadsheetId: string): Promise<string[]> {
-  const auth = await getAuthenticatedClient();
-  const sheets = google.sheets({ version: "v4", auth });
-  const res = await sheets.spreadsheets.get({ spreadsheetId, fields: "sheets.properties.title" });
-  return (res.data.sheets || []).map((s: any) => s.properties?.title || "").filter(Boolean);
-}
-
-async function getSheetData(spreadsheetId: string, range: string): Promise<any[][]> {
-  const auth = await getAuthenticatedClient();
-  const sheets = google.sheets({ version: "v4", auth });
-  const res = await sheets.spreadsheets.values.get({ spreadsheetId, range });
-  return res.data.values || [];
-}
-
-// =====================
-// Участки (data/salary-areas.json)
-// =====================
-
-const SALARY_AREAS_PATH = resolve(process.cwd(), "data", "salary-areas.json");
-
-interface SalaryArea {
-  id: string;
-  name: string;
-  spreadsheetId: string;
-  fioCol: string;
-  bazaCol: string;
-  kVydacheCol: string;
-}
-
-function colLetterToIndex(col: string): number {
-  const c = col.toUpperCase();
-  let idx = 0;
-  for (let i = 0; i < c.length; i++) {
-    idx = idx * 26 + (c.charCodeAt(i) - 64);
-  }
-  return idx - 1;
-}
-
-function maxColLetter(...cols: string[]): string {
-  let max = cols[0];
-  for (const c of cols) {
-    if (colLetterToIndex(c) > colLetterToIndex(max)) max = c;
-  }
-  return max.toUpperCase();
-}
-
-function loadAreas(): SalaryArea[] {
-  try {
-    if (existsSync(SALARY_AREAS_PATH)) {
-      const raw = JSON.parse(readFileSync(SALARY_AREAS_PATH, "utf-8"));
-      return raw.map((a: any) => ({
-        fioCol: "B",
-        bazaCol: "F",
-        kVydacheCol: "J",
-        ...a,
-      }));
-    }
-  } catch {}
-  return [];
-}
-
-function saveAreas(areas: any[]): void {
-  writeFileSync(SALARY_AREAS_PATH, JSON.stringify(areas, null, 2), "utf-8");
-}
-
-function extractSpreadsheetId(url: string): string | null {
-  const m = url.match(/\/spreadsheets\/d\/([a-zA-Z0-9_-]+)/);
-  return m ? m[1] : null;
-}
-
-const COL_PATTERN = /^[A-Za-z]{1,2}$/;
-
-// =====================
-// Загрузка данных зарплат из Google Sheets
-// =====================
-
-const MONTH_PATTERN = /^(\d{1,2})\.(\d{2})$/;
-
-function sleep(ms: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-async function withRetry<T>(fn: () => Promise<T>, maxRetries = 4, baseDelayMs = 1000): Promise<T> {
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (err: any) {
-      const msg = String(err?.message || "");
-      const status = err?.statusCode || err?.code || err?.response?.status;
-      const isQuota = msg.includes("Quota exceeded") || msg.includes("quota") || status === 429 || msg.includes("429") || msg.includes("RATE_LIMIT") || msg.includes("rate limit");
-      if (!isQuota || attempt === maxRetries) throw err;
-      const delayMs = baseDelayMs * Math.pow(2, attempt);
-      console.log(`[opneof] retry ${attempt + 1}/${maxRetries} after ${delayMs}ms — ${msg.slice(0, 120)}`);
-      await sleep(delayMs);
-    }
-  }
-  throw new Error("withRetry: unreachable");
-}
-
-async function fetchNeofFromSheets(targetAreas: SalaryArea[]): Promise<any[]> {
-  const results: any[] = [];
-  for (const area of targetAreas) {
-    try {
-      const sheetNames = await withRetry(() => getSheetNames(area.spreadsheetId));
-      const monthSheets = sheetNames
-        .filter(name => MONTH_PATTERN.test(name))
-        .sort((a, b) => {
-          const [, am, ay] = a.match(MONTH_PATTERN)!;
-          const [, bm, by] = b.match(MONTH_PATTERN)!;
-          return (Number(ay) * 12 + Number(am)) - (Number(by) * 12 + Number(bm));
-        });
-
-      const months: { month: string; employees: any[] }[] = [];
-      for (const sheetName of monthSheets) {
-        const fioIdx = colLetterToIndex(area.fioCol || "B");
-        const bazaIdx = colLetterToIndex(area.bazaCol || "F");
-        const kVydacheIdx = colLetterToIndex(area.kVydacheCol || "J");
-        const lastCol = maxColLetter(area.fioCol || "B", area.bazaCol || "F", area.kVydacheCol || "J");
-        const rows = await withRetry(() => getSheetData(area.spreadsheetId, `'${sheetName}'!A4:${lastCol}500`));
-        const employees = rows
-          .filter(row => row && row[fioIdx] && String(row[fioIdx]).trim())
-          .map(row => {
-            const rawFio = String(row[fioIdx] || "");
-            const fio = rawFio.replace(/[0-9]/g, "").replace(/[^\p{L}\s\-().]/gu, "").replace(/\s+/g, " ").trim();
-            if (!fio) return null;
-            const baza = Number(String(row[bazaIdx] || "0").replace(/\s/g, "").replace(",", ".")) || 0;
-            const kVydache = Number(String(row[kVydacheIdx] || "0").replace(/\s/g, "").replace(",", ".")) || 0;
-            return { fio, baza, kVydache };
-          })
-          .filter(Boolean);
-
-        months.push({ month: sheetName, employees });
-        await sleep(200);
-      }
-
-      results.push({ id: area.id, name: area.name, months: months.filter(m => m.employees.length > 0) });
-    } catch (err: any) {
-      console.error(`Error fetching area ${area.name}:`, err?.message);
-      results.push({ id: area.id, name: area.name, months: [], error: err?.message || "Ошибка загрузки" });
-    }
-    await sleep(600);
-  }
-  return results;
-}
-
-// Таблица opneof создаётся в salary-routes.ts (ensureTables)
-async function ensureOpneof(): Promise<boolean> {
-  try {
-    const r = await query(`SELECT to_regclass('opneof') as reg`);
-    return !!r.rows[0]?.reg;
-  } catch {
-    return false;
-  }
-}
-
-let syncInProgress = false;
-
-// =====================
-// Routes
-// =====================
-
-export function registerGoogleSheetsRoutes(app: Express) {
-  // --- Google OAuth ---
-  app.get("/api/finance/google/status", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    res.json({ success: true, ...getAuthStatus() });
-  });
-
-  app.get("/api/finance/google/auth-url", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    res.json({ success: true, url: getAuthUrl() });
-  });
-
-  app.get("/api/finance/google/callback", async (req, res) => {
-    try {
-      const code = req.query.code as string;
-      if (!code) { res.redirect("/salary?google_auth=error"); return; }
-      await handleCallback(code);
-      res.redirect("/salary?google_auth=success");
-    } catch (err) {
-      console.error("[google callback]", err);
-      res.redirect("/salary?google_auth=error");
-    }
-  });
-
-  app.post("/api/finance/google/logout", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    clearTokens();
-    res.json({ success: true });
-  });
-
-  // --- Участки ---
-  app.get("/api/salary/areas", authenticateToken, requirePermission('finance.manage'), (_req: AuthenticatedRequest, res) => {
-    res.json({ success: true, areas: loadAreas() });
-  });
-
-  app.post("/api/salary/areas", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    try {
-      const { name, spreadsheetUrl, fioCol = "B", bazaCol = "F", kVydacheCol = "J" } = req.body || {};
-      if (!name || !spreadsheetUrl) return res.status(400).json({ success: false, error: "Укажите название участка и ссылку на таблицу" });
-      const spreadsheetId = extractSpreadsheetId(spreadsheetUrl);
-      if (!spreadsheetId) return res.status(400).json({ success: false, error: "Неверная ссылка на Google Таблицу" });
-      if (!COL_PATTERN.test(fioCol) || !COL_PATTERN.test(bazaCol) || !COL_PATTERN.test(kVydacheCol)) {
-        return res.status(400).json({ success: false, error: "Столбцы должны быть буквами (A-Z)" });
-      }
-      const areas = loadAreas();
-      const id = Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
-      const area = { id, name, spreadsheetId, fioCol: fioCol.toUpperCase(), bazaCol: bazaCol.toUpperCase(), kVydacheCol: kVydacheCol.toUpperCase() };
-      areas.push(area);
-      saveAreas(areas);
-      res.json({ success: true, area });
-    } catch (err) {
-      console.error(err);
-      res.status(500).json({ success: false, error: "Ошибка при добавлении участка" });
-    }
-  });
-
-  app.patch("/api/salary/areas/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    try {
-      const areas = loadAreas();
-      const area = areas.find(a => a.id === req.params.id);
-      if (!area) return res.status(404).json({ success: false, error: "Участок не найден" });
-      const { fioCol, bazaCol, kVydacheCol } = req.body || {};
-      if (fioCol !== undefined) {
-        if (!COL_PATTERN.test(fioCol)) return res.status(400).json({ success: false, error: "Столбец ФИО должен быть буквой (A-Z)" });
-        area.fioCol = fioCol.toUpperCase();
-      }
-      if (bazaCol !== undefined) {
-        if (!COL_PATTERN.test(bazaCol)) return res.status(400).json({ success: false, error: "Столбец База должен быть буквой (A-Z)" });
-        area.bazaCol = bazaCol.toUpperCase();
-      }
-      if (kVydacheCol !== undefined) {
-        if (!COL_PATTERN.test(kVydacheCol)) return res.status(400).json({ success: false, error: "Столбец К выдаче должен быть буквой (A-Z)" });
-        area.kVydacheCol = kVydacheCol.toUpperCase();
-      }
-      saveAreas(areas);
-      res.json({ success: true, area });
-    } catch (err) {
-      console.error(err);
-      res.status(500).json({ success: false, error: "Ошибка при обновлении участка" });
-    }
-  });
-
-  app.delete("/api/salary/areas/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    try {
-      let areas = loadAreas();
-      areas = areas.filter(a => a.id !== req.params.id);
-      saveAreas(areas);
-      res.json({ success: true });
-    } catch (err) {
-      console.error(err);
-      res.status(500).json({ success: false, error: "Ошибка при удалении участка" });
-    }
-  });
-
-  // --- Синхронизация зарплат ---
-  app.post("/api/salary/sync", authenticateToken, requirePermission('finance.manage'), async (_req: AuthenticatedRequest, res) => {
-    try {
-      if (syncInProgress) return res.status(409).json({ success: false, error: "Синхронизация уже выполняется" });
-      syncInProgress = true;
-
-      const status = getAuthStatus();
-      if (!status.loggedIn) { syncInProgress = false; return res.status(401).json({ success: false, error: "Не авторизован в Google", authRequired: true }); }
-
-      if (!(await ensureOpneof())) { syncInProgress = false; return res.status(503).json({ success: false, error: "Таблица opneof не готова" }); }
-
-      const areas = loadAreas();
-      if (areas.length === 0) { syncInProgress = false; return res.json({ success: true, added: 0, updated: 0, deleted: 0, total: 0 }); }
-
-      const sheetsData = await fetchNeofFromSheets(areas);
-
-      const failedAreas = sheetsData.filter(a => a.error);
-      if (failedAreas.length === sheetsData.length) {
-        syncInProgress = false;
-        const firstErr = failedAreas[0]?.error || "Неизвестная ошибка";
-        if (firstErr.includes("авторизован") || firstErr.includes("Токен") || firstErr.includes("401")) {
-          return res.status(401).json({ success: false, error: "Ошибка авторизации Google: " + firstErr, authRequired: true });
-        }
-        return res.status(500).json({ success: false, error: "Все участки вернули ошибку: " + firstErr });
-      }
-
-      const now = new Date().toISOString();
-
-      const client = await getPoolClient();
-      try {
-        await client.query("BEGIN");
-        let added = 0, updated = 0, deleted = 0;
-        const errors: string[] = failedAreas.map(a => `${a.name}: ${a.error}`);
-
-        const sheetsKeys = new Set<string>();
-
-        for (const areaData of sheetsData) {
-          if (areaData.error) continue;
-          for (const monthData of areaData.months) {
-            for (const emp of monthData.employees) {
-              sheetsKeys.add(`${areaData.id}||${monthData.month}||${emp.fio}`);
-
-              const r = await client.query(
-                `INSERT INTO opneof (area_id, area_name, month, fio, baza, k_vydache, synced_at, deleted_at)
-                 VALUES ($1, $2, $3, $4, $5, $6, $7, NULL)
-                 ON CONFLICT (area_id, month, fio) DO UPDATE
-                 SET baza = EXCLUDED.baza, k_vydache = EXCLUDED.k_vydache,
-                     area_name = EXCLUDED.area_name, synced_at = EXCLUDED.synced_at, deleted_at = NULL
-                 WHERE opneof.baza IS DISTINCT FROM EXCLUDED.baza
-                    OR opneof.k_vydache IS DISTINCT FROM EXCLUDED.k_vydache
-                    OR opneof.area_name IS DISTINCT FROM EXCLUDED.area_name
-                    OR opneof.deleted_at IS NOT NULL
-                 RETURNING (xmax = 0) AS inserted`,
-                [areaData.id, areaData.name, monthData.month, emp.fio, emp.baza, emp.kVydache, now]
-              );
-              if (r.rows.length === 0) continue;
-              if (r.rows[0]?.inserted) added++; else updated++;
-            }
-          }
-        }
-
-        for (const areaData of sheetsData) {
-          if (areaData.error) continue;
-          const existingRows = await client.query(
-            "SELECT id, area_id, month, fio FROM opneof WHERE area_id = $1 AND deleted_at IS NULL",
-            [areaData.id]
-          );
-          for (const row of existingRows.rows) {
-            if (!sheetsKeys.has(`${row.area_id}||${row.month}||${row.fio}`)) {
-              await client.query("UPDATE opneof SET deleted_at = $1, synced_at = $1 WHERE id = $2", [now, row.id]);
-              deleted++;
-            }
-          }
-        }
-
-        await client.query("COMMIT");
-        client.release();
-
-        const totalRes = await query("SELECT COUNT(*) as cnt FROM opneof WHERE deleted_at IS NULL");
-        const total = Number(totalRes.rows[0]?.cnt || 0);
-
-        console.log(`[opneof sync] added=${added} updated=${updated} deleted=${deleted} total=${total} errors=${errors.length}`);
-        syncInProgress = false;
-        res.json({ success: true, added, updated, deleted, total, errors: errors.length > 0 ? errors : undefined });
-      } catch (txErr) {
-        await client.query("ROLLBACK").catch(() => {});
-        client.release();
-        throw txErr;
-      }
-    } catch (err: any) {
-      syncInProgress = false;
-      if (err?.message?.includes("авторизован") || err?.message?.includes("Токен")) {
-        return res.status(401).json({ success: false, error: err.message, authRequired: true });
-      }
-      console.error("[salary sync] Error:", err);
-      res.status(500).json({ success: false, error: "Ошибка синхронизации: " + (err?.message || "неизвестная ошибка") });
-    }
-  });
-}
diff --git a/server/finance/overrides.ts b/server/finance/overrides.ts
deleted file mode 100644
index 0452a35..0000000
--- a/server/finance/overrides.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-export function registerOverrideRoutes(app: Express): void {
-  // GET /api/overrides?type=income|expense
-  app.get("/api/overrides", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const type = req.query.type as string;
-      const table = type === "expense" ? "expense_category_overrides" : "income_category_overrides";
-      const result = await query(`SELECT record_id, category_id, created_at FROM "${table}"`);
-      res.json({ success: true, overrides: result.rows });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // POST /api/overrides
-  app.post("/api/overrides", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { type, recordId, categoryId } = req.body;
-      const table = type === "expense" ? "expense_category_overrides" : "income_category_overrides";
-      await query(
-        `INSERT INTO "${table}" (record_id, category_id) VALUES ($1, $2) ON CONFLICT (record_id) DO UPDATE SET category_id = EXCLUDED.category_id`,
-        [recordId, categoryId]
-      );
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // DELETE /api/overrides/:type/:recordId
-  app.delete("/api/overrides/:type/:recordId", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const table = req.params.type === "expense" ? "expense_category_overrides" : "income_category_overrides";
-      await query(`DELETE FROM "${table}" WHERE record_id = $1`, [req.params.recordId]);
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
diff --git a/server/finance/routes.ts b/server/finance/routes.ts
deleted file mode 100644
index 03fb12d..0000000
--- a/server/finance/routes.ts
+++ /dev/null
@@ -1,708 +0,0 @@
-import { type Express, type Request, type Response } from "express";
-import { query, testConnection, setConfig, getConfig, isConnected } from "./db-client";
-import { registerSalaryRoutes } from "./salary-routes";
-import { ensureFinanceTables, ensureViews } from "./views";
-import { registerOverrideRoutes } from "./overrides";
-import { registerTagRoutes } from "./tags";
-import { registerAutoDetectRoutes } from "./auto-detect";
-import { registerTimeseriesRoutes } from "./timeseries";
-import * as cache from "./cache";
-import {
-  getTableConfig,
-  getIncomeCategories,
-  setIncomeCategories,
-  getExpenseCategories,
-  setExpenseCategories,
-  getIncomeAutoDetectConfig,
-  setIncomeAutoDetectConfig,
-  getExpenseAutoDetectConfig,
-  setExpenseAutoDetectConfig,
-} from "./table-config";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-import { tenantIsolation } from "../middleware/tenant.middleware";
-import { previewCustomerSync, applyCustomerSync, type SyncApplyCustomer } from "./customer-sync";
-import { previewContractSync, applyContractSync, type SyncApplyContract } from "./contract-sync";
-import { getFinanceSettings, setFinanceSettings } from "./settings";
-import { applyCategoryRules, buildGroupedTrees } from "./category-matching";
-import { registerDebtRoutes } from "./debt";
-import { registerCalculationRoutes } from "./calculations";
-import { registerAuditRoutes, startAuditScheduler } from "./audit";
-import { registerGoogleSheetsRoutes } from "./google-sheets";
-
-// Rebuild status (in-memory)
-let rebuildStatus = { inProgress: false, pendingRebuild: false, lastRebuiltAt: null as string | null };
-
-function buildWhere(
-  filters: Record<string, string>,
-  dateFrom?: string,
-  dateTo?: string,
-  dateColumn = "data"
-): { clause: string; params: any[]; paramIndex: number } {
-  const conditions: string[] = [];
-  const params: any[] = [];
-  let idx = 1;
-
-  for (const [col, val] of Object.entries(filters)) {
-    if (!val) continue;
-    conditions.push(`"${col}" ILIKE $${idx}`);
-    params.push(`%${val}%`);
-    idx++;
-  }
-
-  if (dateFrom) {
-    conditions.push(`"${dateColumn}" >= $${idx}`);
-    params.push(dateFrom);
-    idx++;
-  }
-  if (dateTo) {
-    conditions.push(`"${dateColumn}" <= $${idx}`);
-    params.push(dateTo);
-    idx++;
-  }
-
-  const clause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-  return { clause, params, paramIndex: idx };
-}
-
-// =====================
-// Connection & Config
-// =====================
-
-function registerConnectionRoutes(app: Express) {
-  app.get("/api/connection", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, config: getConfig() });
-  });
-
-  app.post("/api/connection/test", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    const result = await testConnection(req.body);
-    res.json(result);
-  });
-
-  app.post("/api/connection", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    setConfig(req.body);
-    cache.invalidate();
-    res.json({ success: true, message: "Конфигурация сохранена" });
-  });
-
-  app.get("/api/db-status", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    const connected = await isConnected().catch(() => false);
-    res.json({ connected });
-  });
-
-  app.get("/api/db/tables", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(
-        `SELECT table_name FROM information_schema.tables WHERE table_schema = 'public' ORDER BY table_name`
-      );
-      res.json({ success: true, tables: result.rows.map((r) => r.table_name) });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/db/columns/:table", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(
-        `SELECT column_name, data_type FROM information_schema.columns WHERE table_name = $1 AND table_schema = 'public' ORDER BY ordinal_position`,
-        [req.params.table]
-      );
-      res.json({ success: true, columns: result.rows });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/table-config", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, config: getTableConfig() });
-  });
-
-  app.get("/api/finance-settings", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, settings: getFinanceSettings() });
-  });
-
-  app.post("/api/finance-settings", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    setFinanceSettings(req.body);
-    res.json({ success: true });
-  });
-}
-
-// =====================
-// Income
-// =====================
-
-function registerIncomeRoutes(app: Express) {
-  app.get("/api/income", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const page = Math.max(1, parseInt(req.query.page as string) || 1);
-      const pageSize = Math.min(200, Math.max(1, parseInt(req.query.pageSize as string) || 50));
-      const sortBy = (req.query.sortBy as string) || "id";
-      const sortDir = (req.query.sortDir as string) === "asc" ? "ASC" : "DESC";
-      const filters: Record<string, string> = req.query.filters ? JSON.parse(req.query.filters as string) : {};
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-
-      const cacheKey = `income:${page}:${pageSize}:${sortBy}:${sortDir}:${JSON.stringify(filters)}:${dateFrom}:${dateTo}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { clause, params } = buildWhere(filters, dateFrom, dateTo);
-      const countResult = await query(`SELECT COUNT(*) FROM "${config.incomeTable}" ${clause}`, params);
-      const total = parseInt(countResult.rows[0].count, 10);
-
-      const sumResult = await query(`SELECT COALESCE(SUM("${config.incomeSumColumn}"), 0) as total FROM "${config.incomeTable}" ${clause}`, params);
-      const totalSum = parseFloat(sumResult.rows[0].total);
-
-      const offset = (page - 1) * pageSize;
-      const rowsResult = await query(
-        `SELECT * FROM "${config.incomeTable}" ${clause} ORDER BY "${sortBy}" ${sortDir} LIMIT $${params.length + 1} OFFSET $${params.length + 2}`,
-        [...params, pageSize, offset]
-      );
-
-      const result = {
-        success: true,
-        rows: rowsResult.rows,
-        total,
-        page,
-        pageSize,
-        totalPages: Math.ceil(total / pageSize),
-        totalSum,
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/income/tree-summary", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const categories = getIncomeCategories();
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-
-      const cacheKey = `income:tree:${dateFrom}:${dateTo}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { clause, params } = buildWhere({}, dateFrom, dateTo);
-      const result = await query(
-        `SELECT * FROM "${config.incomeTable}" ${clause}`,
-        params
-      );
-
-      const rows = result.rows;
-      const treeTotals = new Map<string, { total: number; count: number; minDate?: string; maxDate?: string }>();
-
-      for (const row of rows) {
-        const sum = parseFloat(row[config.incomeSumColumn]) || 0;
-        const catId = applyCategoryRules(row, categories);
-        if (catId) {
-          const existing = treeTotals.get(catId) || { total: 0, count: 0 };
-          existing.total += sum;
-          existing.count++;
-          const date = row.data;
-          if (date) {
-            if (!existing.minDate || date < existing.minDate) existing.minDate = date;
-            if (!existing.maxDate || date > existing.maxDate) existing.maxDate = date;
-          }
-          treeTotals.set(catId, existing);
-        }
-      }
-
-      const uncategorized = rows.reduce((acc, row) => {
-        const catId = applyCategoryRules(row, categories);
-        if (!catId) {
-          acc.total += parseFloat(row[config.incomeSumColumn]) || 0;
-          acc.count++;
-        }
-        return acc;
-      }, { total: 0, count: 0 });
-
-      const grandTotal = rows.reduce((sum, row) => sum + (parseFloat(row[config.incomeSumColumn]) || 0), 0);
-
-      function buildTreeNodes(nodes: any[]): any[] {
-        return nodes.map((node) => {
-          const stats = treeTotals.get(node.id) || { total: 0, count: 0 };
-          return {
-            id: node.id,
-            name: node.name,
-            total: stats.total,
-            count: stats.count,
-            excluded: node.excluded,
-            autoDetected: node.autoDetected,
-            minDate: stats.minDate,
-            maxDate: stats.maxDate,
-            children: node.children ? buildTreeNodes(node.children) : undefined,
-          };
-        }).filter((n) => n.total > 0 || (n.children && n.children.length > 0));
-      }
-
-      const trees = buildGroupedTrees(
-        categories,
-        getIncomeAutoDetectConfig(),
-        treeTotals,
-        (roots) => buildTreeNodes(roots)
-      );
-
-      const response = {
-        success: true,
-        trees,
-        uncategorized,
-        grandTotal: { total: grandTotal, count: rows.length },
-      };
-      cache.set(cacheKey, response);
-      res.json(response);
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/income/column-values", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const column = req.query.column as string;
-      const search = (req.query.search as string) || "";
-      const context = req.query.context ? JSON.parse(req.query.context as string) : {};
-
-      if (!column) { res.status(400).json({ success: false, error: "column обязателен" }); return; }
-
-      const { clause, params } = buildWhere(context);
-      const searchClause = search ? `AND "${column}" ILIKE $${params.length + 1}` : "";
-      if (search) params.push(`%${search}%`);
-
-      const result = await query(
-        `SELECT DISTINCT "${column}" FROM "${config.incomeTable}" ${clause} ${searchClause} AND "${column}" IS NOT NULL ORDER BY "${column}" LIMIT 20`,
-        params
-      );
-      res.json({ success: true, values: result.rows.map((r) => r[column]).filter(Boolean) });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/income/:categoryId", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const categoryId = req.params.categoryId;
-      const page = Math.max(1, parseInt(req.query.page as string) || 1);
-      const pageSize = Math.min(200, Math.max(1, parseInt(req.query.pageSize as string) || 50));
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-      const filters: Record<string, string> = req.query.filters ? JSON.parse(req.query.filters as string) : {};
-
-      const categories = getIncomeCategories();
-      function findCategory(nodes: any[], id: string): any | null {
-        for (const node of nodes) {
-          if (node.id === id) return node;
-          if (node.children) {
-            const found = findCategory(node.children, id);
-            if (found) return found;
-          }
-        }
-        return null;
-      }
-      const category = findCategory(categories, categoryId);
-
-      const { clause, params } = buildWhere(filters, dateFrom, dateTo);
-      const result = await query(`SELECT * FROM "${config.incomeTable}" ${clause}`, params);
-      const allRows = result.rows;
-
-      const matchedRows = category
-        ? allRows.filter((row) => applyCategoryRules(row, [category]) === categoryId)
-        : allRows.filter((row) => !applyCategoryRules(row, categories));
-
-      const total = matchedRows.length;
-      const totalSum = matchedRows.reduce((sum, row) => sum + (parseFloat(row[config.incomeSumColumn]) || 0), 0);
-      const offset = (page - 1) * pageSize;
-      const rows = matchedRows.slice(offset, offset + pageSize);
-
-      res.json({
-        success: true,
-        rows,
-        total,
-        page,
-        pageSize,
-        totalPages: Math.ceil(total / pageSize),
-        totalSum,
-      });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-// =====================
-// Expenses (mirror of income)
-// =====================
-
-function registerExpenseRoutes(app: Express) {
-  app.get("/api/expenses", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const page = Math.max(1, parseInt(req.query.page as string) || 1);
-      const pageSize = Math.min(200, Math.max(1, parseInt(req.query.pageSize as string) || 50));
-      const sortBy = (req.query.sortBy as string) || "id";
-      const sortDir = (req.query.sortDir as string) === "asc" ? "ASC" : "DESC";
-      const filters: Record<string, string> = req.query.filters ? JSON.parse(req.query.filters as string) : {};
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-
-      const cacheKey = `expenses:${page}:${pageSize}:${sortBy}:${sortDir}:${JSON.stringify(filters)}:${dateFrom}:${dateTo}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { clause, params } = buildWhere(filters, dateFrom, dateTo);
-      const countResult = await query(`SELECT COUNT(*) FROM "${config.expenseTable}" ${clause}`, params);
-      const total = parseInt(countResult.rows[0].count, 10);
-
-      const sumResult = await query(`SELECT COALESCE(SUM("${config.expenseSumColumn}"), 0) as total FROM "${config.expenseTable}" ${clause}`, params);
-      const totalSum = parseFloat(sumResult.rows[0].total);
-
-      const offset = (page - 1) * pageSize;
-      const rowsResult = await query(
-        `SELECT * FROM "${config.expenseTable}" ${clause} ORDER BY "${sortBy}" ${sortDir} LIMIT $${params.length + 1} OFFSET $${params.length + 2}`,
-        [...params, pageSize, offset]
-      );
-
-      const result = {
-        success: true,
-        rows: rowsResult.rows,
-        total,
-        page,
-        pageSize,
-        totalPages: Math.ceil(total / pageSize),
-        totalSum,
-      };
-      cache.set(cacheKey, result);
-      res.json(result);
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/expenses/tree-summary", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const categories = getExpenseCategories();
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-
-      const cacheKey = `expenses:tree:${dateFrom}:${dateTo}`;
-      const cached = cache.get(cacheKey);
-      if (cached) { res.json(cached); return; }
-
-      const { clause, params } = buildWhere({}, dateFrom, dateTo);
-      const result = await query(`SELECT * FROM "${config.expenseTable}" ${clause}`, params);
-      const rows = result.rows;
-
-      const treeTotals = new Map<string, { total: number; count: number; minDate?: string; maxDate?: string }>();
-      for (const row of rows) {
-        const sum = parseFloat(row[config.expenseSumColumn]) || 0;
-        const catId = applyCategoryRules(row, categories);
-        if (catId) {
-          const existing = treeTotals.get(catId) || { total: 0, count: 0 };
-          existing.total += sum;
-          existing.count++;
-          const date = row.data;
-          if (date) {
-            if (!existing.minDate || date < existing.minDate) existing.minDate = date;
-            if (!existing.maxDate || date > existing.maxDate) existing.maxDate = date;
-          }
-          treeTotals.set(catId, existing);
-        }
-      }
-
-      const uncategorized = rows.reduce((acc, row) => {
-        const catId = applyCategoryRules(row, categories);
-        if (!catId) { acc.total += parseFloat(row[config.expenseSumColumn]) || 0; acc.count++; }
-        return acc;
-      }, { total: 0, count: 0 });
-
-      const grandTotal = rows.reduce((sum, row) => sum + (parseFloat(row[config.expenseSumColumn]) || 0), 0);
-
-      function buildTreeNodes(nodes: any[]): any[] {
-        return nodes.map((node) => {
-          const stats = treeTotals.get(node.id) || { total: 0, count: 0 };
-          return {
-            id: node.id, name: node.name, total: stats.total, count: stats.count,
-            excluded: node.excluded, autoDetected: node.autoDetected,
-            minDate: stats.minDate, maxDate: stats.maxDate,
-            children: node.children ? buildTreeNodes(node.children) : undefined,
-          };
-        }).filter((n) => n.total > 0 || (n.children && n.children.length > 0));
-      }
-
-      const trees = buildGroupedTrees(
-        categories,
-        getExpenseAutoDetectConfig(),
-        treeTotals,
-        (roots) => buildTreeNodes(roots)
-      );
-
-      const response = { success: true, trees, uncategorized, grandTotal: { total: grandTotal, count: rows.length } };
-      cache.set(cacheKey, response);
-      res.json(response);
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/expenses/column-values", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const column = req.query.column as string;
-      const search = (req.query.search as string) || "";
-      const context = req.query.context ? JSON.parse(req.query.context as string) : {};
-      if (!column) { res.status(400).json({ success: false, error: "column обязателен" }); return; }
-      const { clause, params } = buildWhere(context);
-      const searchClause = search ? `AND "${column}" ILIKE $${params.length + 1}` : "";
-      if (search) params.push(`%${search}%`);
-      const result = await query(
-        `SELECT DISTINCT "${column}" FROM "${config.expenseTable}" ${clause} ${searchClause} AND "${column}" IS NOT NULL ORDER BY "${column}" LIMIT 20`,
-        params
-      );
-      res.json({ success: true, values: result.rows.map((r) => r[column]).filter(Boolean) });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/expenses/:categoryId", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const config = getTableConfig();
-      const categoryId = req.params.categoryId;
-      const page = Math.max(1, parseInt(req.query.page as string) || 1);
-      const pageSize = Math.min(200, Math.max(1, parseInt(req.query.pageSize as string) || 50));
-      const dateFrom = req.query.dateFrom as string;
-      const dateTo = req.query.dateTo as string;
-      const filters: Record<string, string> = req.query.filters ? JSON.parse(req.query.filters as string) : {};
-
-      const categories = getExpenseCategories();
-      function findCategory(nodes: any[], id: string): any | null {
-        for (const node of nodes) { if (node.id === id) return node; if (node.children) { const f = findCategory(node.children, id); if (f) return f; } }
-        return null;
-      }
-      const category = findCategory(categories, categoryId);
-
-      const { clause, params } = buildWhere(filters, dateFrom, dateTo);
-      const result = await query(`SELECT * FROM "${config.expenseTable}" ${clause}`, params);
-      const allRows = result.rows;
-      const matchedRows = category
-        ? allRows.filter((row) => applyCategoryRules(row, [category]) === categoryId)
-        : allRows.filter((row) => !applyCategoryRules(row, categories));
-      const total = matchedRows.length;
-      const totalSum = matchedRows.reduce((sum, row) => sum + (parseFloat(row[config.expenseSumColumn]) || 0), 0);
-      const offset = (page - 1) * pageSize;
-      const rows = matchedRows.slice(offset, offset + pageSize);
-      res.json({ success: true, rows, total, page, pageSize, totalPages: Math.ceil(total / pageSize), totalSum });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-// =====================
-// Categories
-// =====================
-
-function registerCategoryRoutes(app: Express) {
-  app.get("/api/income-categories", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, categories: getIncomeCategories() });
-  });
-
-  app.post("/api/income-categories", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getIncomeCategories();
-    const newCat = { ...req.body, id: crypto.randomUUID(), children: [] };
-    current.push(newCat);
-    setIncomeCategories(current);
-    cache.invalidatePrefix("income:");
-    res.status(201).json({ success: true, category: newCat });
-  });
-
-  app.put("/api/income-categories/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getIncomeCategories();
-    function update(nodes: any[]): boolean {
-      for (let i = 0; i < nodes.length; i++) {
-        if (nodes[i].id === req.params.id) { nodes[i] = { ...nodes[i], ...req.body }; return true; }
-        if (nodes[i].children && update(nodes[i].children)) return true;
-      }
-      return false;
-    }
-    update(current);
-    setIncomeCategories(current);
-    cache.invalidatePrefix("income:");
-    res.json({ success: true });
-  });
-
-  app.patch("/api/income-categories/:id/toggle-excluded", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getIncomeCategories();
-    function toggle(nodes: any[]): boolean {
-      for (const node of nodes) {
-        if (node.id === req.params.id) { node.excluded = !node.excluded; return true; }
-        if (node.children && toggle(node.children)) return true;
-      }
-      return false;
-    }
-    toggle(current);
-    setIncomeCategories(current);
-    cache.invalidatePrefix("income:");
-    res.json({ success: true });
-  });
-
-  app.delete("/api/income-categories/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getIncomeCategories();
-    function remove(nodes: any[]): any[] {
-      return nodes.filter((n) => n.id !== req.params.id).map((n) => ({ ...n, children: n.children ? remove(n.children) : [] }));
-    }
-    setIncomeCategories(remove(current));
-    cache.invalidatePrefix("income:");
-    res.json({ success: true });
-  });
-
-  // Expense categories (mirror)
-  app.get("/api/expense-categories", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, categories: getExpenseCategories() });
-  });
-
-  app.post("/api/expense-categories", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getExpenseCategories();
-    const newCat = { ...req.body, id: crypto.randomUUID(), children: [] };
-    current.push(newCat);
-    setExpenseCategories(current);
-    cache.invalidatePrefix("expenses:");
-    res.status(201).json({ success: true, category: newCat });
-  });
-
-  app.put("/api/expense-categories/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getExpenseCategories();
-    function update(nodes: any[]): boolean {
-      for (let i = 0; i < nodes.length; i++) {
-        if (nodes[i].id === req.params.id) { nodes[i] = { ...nodes[i], ...req.body }; return true; }
-        if (nodes[i].children && update(nodes[i].children)) return true;
-      }
-      return false;
-    }
-    update(current);
-    setExpenseCategories(current);
-    cache.invalidatePrefix("expenses:");
-    res.json({ success: true });
-  });
-
-  app.patch("/api/expense-categories/:id/toggle-excluded", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getExpenseCategories();
-    function toggle(nodes: any[]): boolean {
-      for (const node of nodes) {
-        if (node.id === req.params.id) { node.excluded = !node.excluded; return true; }
-        if (node.children && toggle(node.children)) return true;
-      }
-      return false;
-    }
-    toggle(current);
-    setExpenseCategories(current);
-    cache.invalidatePrefix("expenses:");
-    res.json({ success: true });
-  });
-
-  app.delete("/api/expense-categories/:id", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    const current = getExpenseCategories();
-    function remove(nodes: any[]): any[] {
-      return nodes.filter((n) => n.id !== req.params.id).map((n) => ({ ...n, children: n.children ? remove(n.children) : [] }));
-    }
-    setExpenseCategories(remove(current));
-    cache.invalidatePrefix("expenses:");
-    res.json({ success: true });
-  });
-}
-
-// =====================
-// Cache & Admin
-// =====================
-
-function registerAdminRoutes(app: Express) {
-  app.post("/api/cache/invalidate", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    cache.invalidate(req.body.pattern);
-    res.json({ success: true });
-  });
-
-  app.post("/api/refresh-all", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    cache.invalidate();
-    rebuildStatus = { inProgress: true, pendingRebuild: true, lastRebuiltAt: null };
-    setTimeout(() => {
-      rebuildStatus = { inProgress: false, pendingRebuild: false, lastRebuiltAt: new Date().toISOString() };
-    }, 2000);
-    res.json({ success: true, message: "Синхронизация запущена" });
-  });
-
-  app.get("/api/admin/rebuild-status", authenticateToken, requirePermission('finance.manage'), (req: AuthenticatedRequest, res) => {
-    res.json({ success: true, ...rebuildStatus });
-  });
-
-  app.post("/api/finance/customer-sync/preview", authenticateToken, requirePermission('finance.manage'), tenantIsolation, async (req: AuthenticatedRequest, res) => {
-    try {
-      const formId = parseInt(req.body.formId) || 8;
-      const result = await previewCustomerSync(formId, req.organizationId!);
-      res.json({ success: true, ...result });
-    } catch (err: any) {
-      console.error("Customer sync preview error:", err);
-      res.status(500).json({ success: false, error: err.message || "Ошибка при анализе заказчиков" });
-    }
-  });
-
-  app.post("/api/finance/customer-sync/apply", authenticateToken, requirePermission('finance.manage'), tenantIsolation, async (req: AuthenticatedRequest, res) => {
-    try {
-      const formId = parseInt(req.body.formId) || 8;
-      const customers = (req.body.customers || []) as SyncApplyCustomer[];
-      const result = await applyCustomerSync(formId, req.organizationId!, req.user!.id, customers);
-      res.json({ success: true, ...result });
-    } catch (err: any) {
-      console.error("Customer sync apply error:", err);
-      res.status(500).json({ success: false, error: err.message || "Ошибка при создании заказчиков" });
-    }
-  });
-
-  // Contract sync endpoints
-  app.post("/api/finance/contract-sync/preview", authenticateToken, requirePermission('finance.manage'), tenantIsolation, async (req: AuthenticatedRequest, res) => {
-    try {
-      const formId = parseInt(req.body.formId) || 9;
-      const result = await previewContractSync(formId, req.organizationId!);
-      res.json({ success: true, ...result });
-    } catch (err: any) {
-      console.error("Contract sync preview error:", err);
-      res.status(500).json({ success: false, error: err.message || "Ошибка при анализе договоров" });
-    }
-  });
-
-  app.post("/api/finance/contract-sync/apply", authenticateToken, requirePermission('finance.manage'), tenantIsolation, async (req: AuthenticatedRequest, res) => {
-    try {
-      const formId = parseInt(req.body.formId) || 9;
-      const contracts = (req.body.contracts || []) as SyncApplyContract[];
-      const result = await applyContractSync(formId, req.organizationId!, req.user!.id, contracts);
-      res.json({ success: true, ...result });
-    } catch (err: any) {
-      console.error("Contract sync apply error:", err);
-      res.status(500).json({ success: false, error: err.message || "Ошибка при создании договоров" });
-    }
-  });
-}
-
-export async function registerFinanceRoutes(app: Express): Promise<void> {
-  await ensureFinanceTables();
-  await ensureViews();
-  registerConnectionRoutes(app);
-  registerIncomeRoutes(app);
-  registerExpenseRoutes(app);
-  registerCategoryRoutes(app);
-  registerAdminRoutes(app);
-  registerOverrideRoutes(app);
-  registerTagRoutes(app);
-  registerAutoDetectRoutes(app);
-  registerTimeseriesRoutes(app);
-  await registerSalaryRoutes(app);
-  registerDebtRoutes(app);
-  registerCalculationRoutes(app);
-  registerAuditRoutes(app);
-  registerGoogleSheetsRoutes(app);
-  startAuditScheduler();
-}
diff --git a/server/finance/salary-routes.ts b/server/finance/salary-routes.ts
deleted file mode 100644
index 7011dbc..0000000
--- a/server/finance/salary-routes.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-import { type Express, type Request, type Response } from "express";
-import { query } from "./db-client";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-// =====================
-// Levenshtein distance
-// =====================
-
-function levenshtein(a: string, b: string): number {
-  const m = a.length, n = b.length;
-  if (!m) return n;
-  if (!n) return m;
-  const prev = new Array(n + 1);
-  const curr = new Array(n + 1);
-  for (let j = 0; j <= n; j++) prev[j] = j;
-  for (let i = 1; i <= m; i++) {
-    curr[0] = i;
-    for (let j = 1; j <= n; j++) {
-      curr[j] =
-        a[i - 1] === b[j - 1]
-          ? prev[j - 1]
-          : 1 + Math.min(prev[j], curr[j - 1], prev[j - 1]);
-    }
-    for (let j = 0; j <= n; j++) prev[j] = curr[j];
-  }
-  return prev[n];
-}
-
-function similarity(a: string, b: string): number {
-  const dist = levenshtein(a, b);
-  return 1 - dist / Math.max(a.length, b.length);
-}
-
-function fioLetters(fio: string): string {
-  return fio.replace(/[^\u0400-\u04FF]/gi, "").toLowerCase();
-}
-
-// =====================
-// Ensure tables exist
-// =====================
-
-const ENSURE_SQL = `
-CREATE TABLE IF NOT EXISTS opneof (
-  id SERIAL PRIMARY KEY,
-  area_id TEXT NOT NULL,
-  area_name TEXT NOT NULL,
-  month TEXT NOT NULL,
-  fio TEXT NOT NULL,
-  baza NUMERIC NOT NULL DEFAULT 0,
-  k_vydache NUMERIC NOT NULL DEFAULT 0,
-  synced_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  deleted_at TIMESTAMPTZ
-);
-CREATE UNIQUE INDEX IF NOT EXISTS opneof_ukey ON opneof (area_id, month, fio) WHERE deleted_at IS NULL;
-
-CREATE TABLE IF NOT EXISTS opof_manual_areas (
-  fio_letters TEXT PRIMARY KEY,
-  fio_display TEXT NOT NULL,
-  area_id TEXT NOT NULL,
-  area_name TEXT NOT NULL,
-  canonical_fio TEXT NOT NULL DEFAULT '',
-  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-);
-`;
-
-async function ensureTables() {
-  try {
-    await query(ENSURE_SQL);
-  } catch (err) {
-    console.error("[SALARY] Failed to ensure tables:", err);
-  }
-}
-
-// =====================
-// DB Status
-// =====================
-
-function registerDbStatusRoutes(app: Express) {
-  app.get("/api/salary/db-status", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const totalResult = await query(`SELECT COUNT(*)::int AS total FROM opneof WHERE deleted_at IS NULL`);
-      const areasResult = await query(`SELECT DISTINCT area_name FROM opneof WHERE deleted_at IS NULL ORDER BY area_name`);
-      const monthResult = await query(`SELECT COUNT(DISTINCT month)::int AS month_count FROM opneof WHERE deleted_at IS NULL`);
-      const lastSyncResult = await query(`SELECT MAX(synced_at) AS last_sync FROM opneof WHERE deleted_at IS NULL`);
-      res.json({
-        success: true,
-        totalRows: totalResult.rows[0]?.total ?? 0,
-        areas: areasResult.rows.map((r: any) => r.area_name),
-        monthCount: monthResult.rows[0]?.month_count ?? 0,
-        lastSync: lastSyncResult.rows[0]?.last_sync ?? null,
-      });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-// =====================
-// неОФ
-// =====================
-
-function registerNeofRoutes(app: Express) {
-  app.get("/api/salary/neof", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(`
-        SELECT area_id, area_name, month, fio, baza, k_vydache
-        FROM opneof
-        WHERE deleted_at IS NULL
-        ORDER BY area_name, month, fio
-      `);
-
-      const areaMap = new Map<string, { id: string; name: string; months: Map<string, { month: string; employees: any[] }> }>();
-
-      for (const row of result.rows) {
-        if (!areaMap.has(row.area_id)) {
-          areaMap.set(row.area_id, { id: row.area_id, name: row.area_name, months: new Map() });
-        }
-        const area = areaMap.get(row.area_id)!;
-        if (!area.months.has(row.month)) {
-          area.months.set(row.month, { month: row.month, employees: [] });
-        }
-        area.months.get(row.month)!.employees.push({
-          fio: row.fio,
-          baza: parseFloat(row.baza) || 0,
-          kVydache: parseFloat(row.k_vydache) || 0,
-        });
-      }
-
-      const areas = Array.from(areaMap.values()).map((a) => ({
-        id: a.id,
-        name: a.name,
-        months: Array.from(a.months.values()).sort((a, b) => periodCompare(b.month, a.month)),
-      }));
-
-      res.json({ success: true, areas, source: "db" });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-function periodCompare(a: string, b: string): number {
-  const pa = parsePeriod(a);
-  const pb = parsePeriod(b);
-  return (pb.y * 12 + pb.m) - (pa.y * 12 + pa.m);
-}
-
-function parsePeriod(p: string): { m: number; y: number } {
-  const parts = p.split(".");
-  const m = parseInt(parts[0], 10) || 0;
-  let y = parseInt(parts[1], 10) || 0;
-  if (y < 50) y += 2000;
-  else if (y < 100) y += 1900;
-  return { m, y };
-}
-
-// =====================
-// ОФ
-// =====================
-
-function registerZofRoutes(app: Express) {
-  app.get("/api/salary/zof/areas", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(`SELECT DISTINCT area_id, area_name FROM opneof WHERE deleted_at IS NULL ORDER BY area_name`);
-      res.json({ success: true, areas: result.rows.map((r: any) => ({ id: r.area_id, name: r.area_name })) });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.get("/api/salary/zof", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      // Load manual assignments
-      const manualResult = await query(`SELECT fio_letters, area_id, area_name, canonical_fio FROM opof_manual_areas`);
-      const manualMap = new Map<string, { areaId: string; areaName: string; canonicalFio: string }>();
-      for (const row of manualResult.rows) {
-        manualMap.set(row.fio_letters, { areaId: row.area_id, areaName: row.area_name, canonicalFio: row.canonical_fio });
-      }
-
-      // Load canonical FIOs from neof for fuzzy matching
-      const neofFioResult = await query(`SELECT DISTINCT fio FROM opneof WHERE deleted_at IS NULL`);
-      const neofFios = neofFioResult.rows.map((r: any) => r.fio as string);
-      const neofLetters = neofFios.map((f) => ({ fio: f, letters: fioLetters(f) }));
-
-      // Load opof data
-      const opofResult = await query(`
-        SELECT sotrudnik, nachislenobezndfl, summandfl, strahov, periodregistrator
-        FROM opof
-        ORDER BY periodregistrator DESC, sotrudnik
-      `);
-
-      const areaMap = new Map<string, { id: string; name: string; months: Map<string, { month: string; employees: any[] }> }>();
-
-      function ensureArea(id: string, name: string) {
-        if (!areaMap.has(id)) areaMap.set(id, { id, name, months: new Map() });
-        return areaMap.get(id)!;
-      }
-
-      for (const row of opofResult.rows) {
-        const fio = row.sotrudnik as string;
-        const letters = fioLetters(fio);
-        const month = normalizePeriod(row.periodregistrator);
-
-        let areaId = "unassigned";
-        let areaName = "Нераспределённые";
-        let canonicalFio = fio;
-
-        // 1. Manual override
-        const manual = manualMap.get(letters);
-        if (manual) {
-          areaId = manual.areaId;
-          areaName = manual.areaName;
-          canonicalFio = manual.canonicalFio || fio;
-        } else {
-          // 2. Fuzzy match
-          let bestSim = 0;
-          let bestFio = "";
-          for (const nf of neofLetters) {
-            const sim = similarity(letters, nf.letters);
-            if (sim > bestSim) {
-              bestSim = sim;
-              bestFio = nf.fio;
-            }
-          }
-          if (bestSim >= 0.9 && bestFio) {
-            // find area for this fio
-            const areaRes = await query(
-              `SELECT area_id, area_name FROM opneof WHERE fio = $1 AND deleted_at IS NULL LIMIT 1`,
-              [bestFio]
-            );
-            if (areaRes.rows.length > 0) {
-              areaId = areaRes.rows[0].area_id;
-              areaName = areaRes.rows[0].area_name;
-              canonicalFio = bestFio;
-            }
-          }
-        }
-
-        const area = ensureArea(areaId, areaName);
-        if (!area.months.has(month)) {
-          area.months.set(month, { month, employees: [] });
-        }
-        area.months.get(month)!.employees.push({
-          fio,
-          fioLetters: letters,
-          nachislenobezndfl: parseFloat(row.nachislenobezndfl) || 0,
-          summandfl: parseFloat(row.summandfl) || 0,
-          strahov: parseFloat(row.strahov) || 0,
-          canonicalFio,
-        });
-      }
-
-      const areas = Array.from(areaMap.values()).map((a) => ({
-        id: a.id,
-        name: a.name,
-        months: Array.from(a.months.values()).sort((a, b) => periodCompare(b.month, a.month)),
-      }));
-
-      res.json({ success: true, areas });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.post("/api/salary/zof/assign", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { fioLetters, fioDisplay, areaId, areaName, canonicalFio } = req.body;
-      await query(
-        `INSERT INTO opof_manual_areas (fio_letters, fio_display, area_id, area_name, canonical_fio)
-         VALUES ($1, $2, $3, $4, $5)
-         ON CONFLICT (fio_letters) DO UPDATE SET
-           fio_display = EXCLUDED.fio_display,
-           area_id = EXCLUDED.area_id,
-           area_name = EXCLUDED.area_name,
-           canonical_fio = EXCLUDED.canonical_fio`,
-        [fioLetters, fioDisplay, areaId, areaName, canonicalFio || ""]
-      );
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  app.delete("/api/salary/zof/assign/:fioLetters", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      await query(`DELETE FROM opof_manual_areas WHERE fio_letters = $1`, [req.params.fioLetters]);
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-function normalizePeriod(val: string | Date | null): string {
-  if (!val) return "00.00";
-  if (val instanceof Date) {
-    const m = String(val.getMonth() + 1).padStart(2, "0");
-    const y = String(val.getFullYear()).slice(-2);
-    return `${m}.${y}`;
-  }
-  const s = String(val).trim();
-  // "MM.YY" or "MM.YYYY"
-  if (/^\d{1,2}\.\d{2,4}$/.test(s)) {
-    const [mPart, yPart] = s.split(".");
-    const m = mPart.padStart(2, "0");
-    const y = yPart.slice(-2);
-    return `${m}.${y}`;
-  }
-  // ISO date or timestamp
-  const d = new Date(s);
-  if (!isNaN(d.getTime())) {
-    const m = String(d.getMonth() + 1).padStart(2, "0");
-    const y = String(d.getFullYear()).slice(-2);
-    return `${m}.${y}`;
-  }
-  return s;
-}
-
-// =====================
-// Planning / Analytics
-// =====================
-
-function registerPlanningRoutes(app: Express) {
-  app.get("/api/planning/salary-monthly", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(`
-        SELECT month, SUM(baza)::numeric AS total_baza, SUM(k_vydache)::numeric AS total_kvydache
-        FROM opneof
-        WHERE deleted_at IS NULL
-        GROUP BY month
-        ORDER BY month
-      `);
-      res.json({ success: true, rows: result.rows.map((r: any) => ({ month: r.month, baza: parseFloat(r.total_baza) || 0, kVydache: parseFloat(r.total_kvydache) || 0 })) });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
-
-export async function registerSalaryRoutes(app: Express): Promise<void> {
-  await ensureTables();
-  registerDbStatusRoutes(app);
-  registerNeofRoutes(app);
-  registerZofRoutes(app);
-  registerPlanningRoutes(app);
-}
diff --git a/server/finance/settings.ts b/server/finance/settings.ts
deleted file mode 100644
index 17bcfd0..0000000
--- a/server/finance/settings.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { readFileSync, existsSync, writeFileSync } from "fs";
-import { resolve } from "path";
-
-export interface FinanceSettings {
-  refreshIntervalSeconds: number;
-}
-
-const SETTINGS_PATH = resolve(process.cwd(), "data", "finance-settings.json");
-
-export function getFinanceSettings(): FinanceSettings {
-  if (!existsSync(SETTINGS_PATH)) {
-    return { refreshIntervalSeconds: 60 };
-  }
-  try {
-    const raw = readFileSync(SETTINGS_PATH, "utf-8");
-    const parsed = JSON.parse(raw) as Partial<FinanceSettings>;
-    return {
-      refreshIntervalSeconds: Math.max(
-        5,
-        Math.min(3600, parsed.refreshIntervalSeconds ?? 60)
-      ),
-    };
-  } catch {
-    return { refreshIntervalSeconds: 60 };
-  }
-}
-
-export function setFinanceSettings(settings: FinanceSettings): void {
-  const validated = {
-    refreshIntervalSeconds: Math.max(
-      5,
-      Math.min(3600, settings.refreshIntervalSeconds ?? 60)
-    ),
-  };
-  writeFileSync(SETTINGS_PATH, JSON.stringify(validated, null, 2), "utf-8");
-}
diff --git a/server/finance/sync-utils.ts b/server/finance/sync-utils.ts
deleted file mode 100644
index 496b04e..0000000
--- a/server/finance/sync-utils.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { storage } from "../storage";
-import { sql } from "drizzle-orm";
-import { db } from "../db";
-
-const CUSTOMER_FORM_ID = 8;
-
-export async function findCustomerByInn(
-  inn: string,
-  organizationId: number
-): Promise<number | null> {
-  const formFields = await storage.getFormFields(CUSTOMER_FORM_ID, organizationId);
-  const companyField = formFields.find((f) => f.type === "company");
-  if (!companyField || !companyField.companyAutofill) {
-    return null;
-  }
-
-  const autofill = companyField.companyAutofill as Record<string, string>;
-  const innFieldCode = autofill["inn"];
-  if (!innFieldCode) return null;
-
-  const innField = formFields.find((f) => f.code === innFieldCode);
-  if (!innField) return null;
-
-  const result = await db.execute(sql`
-    SELECT t.id
-    FROM tasks t
-    JOIN task_field_values v ON t.id = v.task_id AND t.form_id = v.form_id
-    WHERE t.form_id = ${CUSTOMER_FORM_ID}
-      AND t.organization_id = ${organizationId}
-      AND v.field_id = ${innField.id}
-      AND LOWER(TRIM(v.value #>> '{}')) = LOWER(TRIM(${inn}))
-    LIMIT 1
-  `);
-  const rows = result.rows as Array<{ id: number }>;
-  return rows[0]?.id ?? null;
-}
diff --git a/server/finance/table-config.ts b/server/finance/table-config.ts
deleted file mode 100644
index 4bb6f34..0000000
--- a/server/finance/table-config.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { readFileSync, existsSync, writeFileSync } from "fs";
-import { resolve } from "path";
-
-export interface TableConfig {
-  incomeTable: string;
-  expenseTable: string;
-  incomeSumColumn: string;
-  expenseSumColumn: string;
-  debtTable?: string;
-  columnLabels: Record<string, string>;
-}
-
-export interface IncomeCategoryFile {
-  id: string;
-  name: string;
-  rules: Array<{ column: string; operator: string; value: string }>;
-  ruleLogic?: "and" | "or";
-  excluded?: boolean;
-  autoDetected?: boolean;
-  treeId?: string;
-  children: IncomeCategoryFile[];
-}
-
-export interface AutoDetectTree {
-  id: string;
-  name: string;
-  columns: string[];
-  autoRefresh: boolean;
-  isPrimary: boolean;
-  mode: "split" | "merge";
-  filters: Array<{ column: string; operator: string; value: string }>;
-  filterLogic: "and" | "or";
-}
-
-export interface AutoDetectConfig {
-  trees: AutoDetectTree[];
-}
-
-const DATA_DIR = resolve(process.cwd(), "data");
-
-function readJson<T>(filename: string, defaultValue: T): T {
-  const path = resolve(DATA_DIR, filename);
-  if (!existsSync(path)) return defaultValue;
-  try {
-    return JSON.parse(readFileSync(path, "utf-8")) as T;
-  } catch {
-    return defaultValue;
-  }
-}
-
-function writeJson<T>(filename: string, data: T): void {
-  const path = resolve(DATA_DIR, filename);
-  writeFileSync(path, JSON.stringify(data, null, 2), "utf-8");
-}
-
-export function getTableConfig(): TableConfig {
-  return readJson<TableConfig>("table-config.json", {
-    incomeTable: "income",
-    expenseTable: "expenses",
-    incomeSumColumn: "summa",
-    expenseSumColumn: "summadokumenta",
-    debtTable: "prosrochennayadebitorskayazadolzhennost",
-    columnLabels: {
-      data: "Дата",
-      summa: "Сумма",
-      summadokumenta: "Сумма документа",
-      zakazchik: "Заказчик",
-      otvetstvenniipokontraktu: "Ответственный",
-      statya: "Статья",
-      dochka: "Дочка",
-      vnuchka: "Внучка",
-      kommentarii: "Комментарий",
-      stavkands: "Ставка НДС",
-      dogovorkontragenta: "Договор контрагента",
-      dogovorzakazchika: "Договор заказчика",
-      naznachenieplatezha: "Назначение платежа",
-      schetnaoplatu: "Счет на оплату",
-      statyadop: "Статья (доп.)",
-      nomervhodyaschegodokumenta: "Номер вх. документа",
-      kontragent: "Контрагент",
-      ssilkanomervhodyaschegodokumenta: "Номер вх. документа",
-    },
-  });
-}
-
-export function getIncomeCategories(): IncomeCategoryFile[] {
-  return readJson<IncomeCategoryFile[]>("income-categories.json", []);
-}
-
-export function setIncomeCategories(categories: IncomeCategoryFile[]): void {
-  writeJson("income-categories.json", categories);
-}
-
-export function getExpenseCategories(): IncomeCategoryFile[] {
-  return readJson<IncomeCategoryFile[]>("expense-categories.json", []);
-}
-
-export function setExpenseCategories(categories: IncomeCategoryFile[]): void {
-  writeJson("expense-categories.json", categories);
-}
-
-export function getIncomeAutoDetectConfig(): AutoDetectConfig {
-  return readJson<AutoDetectConfig>("income-auto-detect-config.json", { trees: [] });
-}
-
-export function setIncomeAutoDetectConfig(config: AutoDetectConfig): void {
-  writeJson("income-auto-detect-config.json", config);
-}
-
-export function getExpenseAutoDetectConfig(): AutoDetectConfig {
-  return readJson<AutoDetectConfig>("auto-detect-config.json", { trees: [] });
-}
-
-export function setExpenseAutoDetectConfig(config: AutoDetectConfig): void {
-  writeJson("auto-detect-config.json", config);
-}
diff --git a/server/finance/tags.ts b/server/finance/tags.ts
deleted file mode 100644
index 2c43228..0000000
--- a/server/finance/tags.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-
-export function registerTagRoutes(app: Express): void {
-  // GET /api/tags
-  app.get("/api/tags", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const result = await query(`SELECT id, name, color FROM node_tags ORDER BY name`);
-      res.json({ success: true, tags: result.rows });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // POST /api/tags
-  app.post("/api/tags", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { name, color } = req.body;
-      const result = await query(
-        `INSERT INTO node_tags (name, color) VALUES ($1, $2) RETURNING id, name, color`,
-        [name, color || "#2563eb"]
-      );
-      res.status(201).json({ success: true, tag: result.rows[0] });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // DELETE /api/tags/:id
-  app.delete("/api/tags/:id", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      await query(`DELETE FROM node_tags WHERE id = $1`, [req.params.id]);
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // GET /api/tag-assignments?context=income|expense&nodeIds[]=...
-  app.get("/api/tag-assignments", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const context = (req.query.context as string) || "income";
-      const nodeIds = req.query.nodeIds as string[] || [];
-      let sql = `SELECT a.id, a.node_id, a.tag_id, a.context, t.name as tag_name, t.color as tag_color
-                 FROM node_tag_assignments a
-                 JOIN node_tags t ON t.id = a.tag_id
-                 WHERE a.context = $1`;
-      const params: any[] = [context];
-      if (nodeIds.length > 0) {
-        sql += ` AND a.node_id = ANY($2::text[])`;
-        params.push(nodeIds);
-      }
-      const result = await query(sql, params);
-      res.json({ success: true, assignments: result.rows });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // POST /api/tag-assignments
-  app.post("/api/tag-assignments", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { nodeId, tagId, context } = req.body;
-      await query(
-        `INSERT INTO node_tag_assignments (node_id, tag_id, context) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
-        [nodeId, tagId, context || "income"]
-      );
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-
-  // DELETE /api/tag-assignments
-  app.delete("/api/tag-assignments", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    try {
-      const { nodeId, tagId, context } = req.body;
-      await query(
-        `DELETE FROM node_tag_assignments WHERE node_id = $1 AND tag_id = $2 AND context = $3`,
-        [nodeId, tagId, context || "income"]
-      );
-      res.json({ success: true });
-    } catch (err: any) {
-      res.status(500).json({ success: false, error: err.message });
-    }
-  });
-}
diff --git a/server/finance/timeseries.ts b/server/finance/timeseries.ts
deleted file mode 100644
index fd8046e..0000000
--- a/server/finance/timeseries.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { type Express } from "express";
-import { query } from "./db-client";
-import { getTableConfig } from "./table-config";
-import { authenticateToken, requirePermission, type AuthenticatedRequest } from "../middleware/auth.middleware";
-import * as cache from "./cache";
-
-export function registerTimeseriesRoutes(app: Express): void {
-  app.get("/api/income/tree-timeseries", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await handleTreeTimeseries(req, res, "income");
-  });
-  app.get("/api/expenses/tree-timeseries", authenticateToken, requirePermission('finance.manage'), async (req: AuthenticatedRequest, res) => {
-    await handleTreeTimeseries(req, res, "expense");
-  });
-}
-
-async function handleTreeTimeseries(req: AuthenticatedRequest, res: any, type: "income" | "expense") {
-  try {
-    const config = getTableConfig();
-    const dateFrom = req.query.dateFrom as string;
-    const dateTo = req.query.dateTo as string;
-    const groupBy = (req.query.groupBy as string) || "month";
-    const categoryId = req.query.categoryId as string | undefined;
-
-    const cacheKey = `${type}:timeseries:${dateFrom}:${dateTo}:${groupBy}:${categoryId}`;
-    const cached = cache.get(cacheKey);
-    if (cached) { res.json(cached); return; }
-
-    const table = type === "income" ? config.incomeTable : config.expenseTable;
-    const sumCol = type === "income" ? config.incomeSumColumn : config.expenseSumColumn;
-
-    const dateFilter = [];
-    const params: any[] = [];
-    if (dateFrom) { dateFilter.push(`"data" >= $${params.length + 1}`); params.push(dateFrom); }
-    if (dateTo) { dateFilter.push(`"data" <= $${params.length + 1}`); params.push(dateTo); }
-    const where = dateFilter.length > 0 ? `WHERE ${dateFilter.join(" AND ")}` : "";
-
-    const dateTrunc = groupBy === "year" ? "year" : groupBy === "quarter" ? "quarter" : "month";
-
-    const result = await query(
-      `SELECT DATE_TRUNC('${dateTrunc}', "data"::date) as period, SUM("${sumCol}") as total, COUNT(*) as count
-       FROM "${table}" ${where}
-       GROUP BY period
-       ORDER BY period`,
-      params
-    );
-
-    const periods = result.rows.map((r: any) => {
-      const d = new Date(r.period);
-      if (groupBy === "year") return `${d.getFullYear()}`;
-      if (groupBy === "quarter") return `${d.getFullYear()}-Q${Math.floor(d.getMonth() / 3) + 1}`;
-      return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`;
-    });
-
-    const data = result.rows.map((r: any) => parseFloat(r.total) || 0);
-
-    const response = {
-      success: true,
-      periods,
-      series: [{
-        id: "total",
-        name: type === "income" ? "Доходы" : "Расходы",
-        data,
-      }],
-    };
-    cache.set(cacheKey, response);
-    res.json(response);
-  } catch (err: any) {
-    res.status(500).json({ success: false, error: err.message });
-  }
-}
diff --git a/server/finance/views.ts b/server/finance/views.ts
deleted file mode 100644
index 171c482..0000000
--- a/server/finance/views.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { query } from "./db-client";
-import { getTableConfig } from "./table-config";
-
-export async function ensureFinanceTables(): Promise<void> {
-  try {
-    // Overrides tables
-    await query(`
-      CREATE TABLE IF NOT EXISTS income_category_overrides (
-        record_id TEXT PRIMARY KEY,
-        category_id TEXT NOT NULL,
-        created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-      )
-    `);
-    await query(`
-      CREATE TABLE IF NOT EXISTS expense_category_overrides (
-        record_id TEXT PRIMARY KEY,
-        category_id TEXT NOT NULL,
-        created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-      )
-    `);
-
-    // Tags tables
-    await query(`
-      CREATE TABLE IF NOT EXISTS node_tags (
-        id SERIAL PRIMARY KEY,
-        name TEXT NOT NULL,
-        color TEXT NOT NULL DEFAULT '#2563eb'
-      )
-    `);
-    await query(`
-      CREATE TABLE IF NOT EXISTS node_tag_assignments (
-        id SERIAL PRIMARY KEY,
-        node_id TEXT NOT NULL,
-        tag_id INTEGER NOT NULL REFERENCES node_tags(id) ON DELETE CASCADE,
-        context TEXT NOT NULL DEFAULT 'income',
-        UNIQUE(node_id, tag_id, context)
-      )
-    `);
-  } catch (err) {
-    console.error("[FINANCE] Failed to ensure metadata tables:", err);
-  }
-}
-
-async function tableExists(tableName: string): Promise<boolean> {
-  try {
-    const result = await query(
-      `SELECT EXISTS (
-        SELECT FROM information_schema.tables
-        WHERE table_schema = 'public' AND table_name = $1
-      ) as exists`,
-      [tableName]
-    );
-    return result.rows[0]?.exists === true;
-  } catch {
-    return false;
-  }
-}
-
-export async function ensureViews(): Promise<void> {
-  const config = getTableConfig();
-  try {
-    const incomeExists = await tableExists(config.incomeTable);
-    const expenseExists = await tableExists(config.expenseTable);
-
-    if (!incomeExists && !expenseExists) {
-      return;
-    }
-
-    if (incomeExists) {
-      // CREATE OR REPLACE VIEW не умеет менять типы столбцов (тип stavkands в источнике
-      // изменился text ↔ varchar) — пересоздаём view целиком. Зависимых объектов нет.
-      await query(`DROP VIEW IF EXISTS vw_income_effective`);
-      await query(`
-        CREATE VIEW vw_income_effective AS
-        SELECT t.*, o.category_id as _override_category_id
-        FROM "${config.incomeTable}" t
-        LEFT JOIN income_category_overrides o ON o.record_id = t.id::text
-      `);
-    }
-
-    if (expenseExists) {
-      await query(`DROP VIEW IF EXISTS vw_expense_effective`);
-      await query(`
-        CREATE VIEW vw_expense_effective AS
-        SELECT t.*, o.category_id as _override_category_id
-        FROM "${config.expenseTable}" t
-        LEFT JOIN expense_category_overrides o ON o.record_id = t.id::text
-      `);
-    }
-  } catch (err) {
-    console.error("[FINANCE] Failed to create views:", err);
-  }
-}
diff --git a/server/routes/index.ts b/server/routes/index.ts
index 2ae9788..4206fad 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -30,7 +30,6 @@ import { registerContentRoutes } from "./content.routes";
 import { registerPushRoutes } from "./push.routes";
 import { registerMcpRagRoutes } from "./mcp-rag.routes";
 import { registerFieldTemplateInsertRoutes } from "./field-template-insert.routes";
-import { registerFinanceRoutes } from "../finance/routes";
 import { registerDi2Routes } from "../finance-di2";
 import { registerDocumentRoutes } from "../documents/routes";
 import { registerDashboardRoutes } from "./dashboard.routes";
@@ -111,9 +110,8 @@ export async function registerRoutes(app: Express): Promise<Server> {
   registerPushRoutes(app);
   registerMcpRagRoutes(app);
   registerFieldTemplateInsertRoutes(app);
-  // Data-Insight2 (финансы v2) — СТРОГО перед старым модулем финансов: при совпадении путей приоритет у DI2
+  // Data-Insight2 (финансы v2) — старый модуль финансов удалён, DI2 единственный источник
   await registerDi2Routes(app);
-  await registerFinanceRoutes(app);
   await registerDocumentRoutes(app);
   registerDashboardRoutes(app);
   app.use(formAccessRouter);