wip

app/Concerns/HasTransactionAction.php

                     ->required(),
                 Forms\Components\Select::make('account_id')
                     ->label('Category')
-                    ->options(fn (Forms\Get $get, ?Transaction $transaction) => Transaction::getChartAccountOptions(type: TransactionType::parse($get('type')), nominalAccountsOnly: true, currentAccountId: $transaction?->account_id))
+                    ->options(fn (Forms\Get $get, ?Transaction $transaction) => Transaction::getTransactionAccountOptions(type: TransactionType::parse($get('type')), currentAccountId: $transaction?->account_id))
                     ->searchable()
-                    ->preload()
                     ->required(),
                 Forms\Components\Textarea::make('notes')
                     ->label('Notes')
                 ->label('Description'),
             Forms\Components\Select::make('account_id')
                 ->label('Account')
-                ->options(fn (?JournalEntry $journalEntry): array => Transaction::getChartAccountOptions(currentAccountId: $journalEntry?->account_id))
+                ->options(fn (?JournalEntry $journalEntry): array => Transaction::getJournalAccountOptions(currentAccountId: $journalEntry?->account_id))
                 ->softRequired()
                 ->searchable(),
             Forms\Components\TextInput::make('amount')

app/Filament/Actions/CreateTransactionAction.php

     {
         parent::setUp();
 
+        $this->label(null);
+
+        $this->groupedIcon(null);
+
+        $this->slideOver();
+
         $this->modalWidth(function (): MaxWidth {
             return match ($this->transactionType) {
                 TransactionType::Journal => MaxWidth::Screen,

app/Filament/Company/Pages/Reports/BaseReportPage.php

                 ->outlined()
                 ->dropdownWidth('max-w-[7rem]')
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Accounting/TransactionResource.php

 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
+use App\Models\Common\Client;
+use App\Models\Common\Vendor;
 use Exception;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Grid;
 {
     protected static ?string $model = Transaction::class;
 
-    protected static ?string $navigationGroup = 'Accounting';
-
-    protected static ?string $navigationIcon = 'heroicon-o-banknotes';
-
     protected static ?string $recordTitleAttribute = 'description';
 
-    protected static bool $isGloballySearchable = false;
-
     public static function form(Form $form): Form
     {
         return $form
                     'account',
                     'bankAccount.account',
                     'journalEntries.account',
+                    'payeeable',
                 ])
                     ->where(function (Builder $query) {
                         $query->whereNull('transactionable_id')
                 Tables\Columns\TextColumn::make('description')
                     ->label('Description')
                     ->limit(50)
+                    ->searchable()
                     ->toggleable(),
+                Tables\Columns\TextColumn::make('payeeable.name')
+                    ->label('Payee')
+                    ->searchable()
+                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\TextColumn::make('bankAccount.account.name')
                     ->label('Account')
+                    ->searchable()
                     ->toggleable(),
                 Tables\Columns\TextColumn::make('account.name')
                     ->label('Category')
                     ->prefix(static fn (Transaction $transaction) => $transaction->type->isTransfer() ? 'Transfer to ' : null)
+                    ->searchable()
                     ->toggleable()
                     ->state(static fn (Transaction $transaction) => $transaction->account->name ?? 'Journal Entry'),
                 Tables\Columns\TextColumn::make('amount')
                     ->sortable()
                     ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code),
             ])
-            ->recordClasses(static fn (Transaction $transaction) => $transaction->reviewed ? 'bg-primary-300/10' : null)
             ->defaultSort('posted_at', 'desc')
             ->filters([
                 Tables\Filters\SelectFilter::make('bank_account_id')
                     ->label('Account')
                     ->searchable()
-                    ->options(fn () => Transaction::getBankAccountOptions(false)),
+                    ->options(static fn () => Transaction::getBankAccountOptions(false)),
                 Tables\Filters\SelectFilter::make('account_id')
                     ->label('Category')
                     ->multiple()
-                    ->options(fn () => Transaction::getChartAccountOptions(nominalAccountsOnly: false)),
+                    ->options(static fn () => Transaction::getChartAccountOptions()),
                 Tables\Filters\TernaryFilter::make('reviewed')
                     ->label('Status')
-                    ->native(false)
                     ->trueLabel('Reviewed')
                     ->falseLabel('Not Reviewed'),
                 Tables\Filters\SelectFilter::make('type')
                     ->label('Type')
-                    ->native(false)
                     ->options(TransactionType::class),
+                Tables\Filters\TernaryFilter::make('is_payment')
+                    ->label('Payment')
+                    ->default(false),
+                Tables\Filters\SelectFilter::make('payee')
+                    ->label('Payee')
+                    ->options(static fn () => Transaction::getPayeeOptions())
+                    ->searchable()
+                    ->query(function (Builder $query, array $data): Builder {
+                        if (empty($data['value'])) {
+                            return $query;
+                        }
+
+                        $id = (int) $data['value'];
+
+                        if ($id < 0) {
+                            return $query->where('payeeable_type', Vendor::class)
+                                ->where('payeeable_id', abs($id));
+                        } else {
+                            return $query->where('payeeable_type', Client::class)
+                                ->where('payeeable_id', $id);
+                        }
+                    }),
                 static::buildDateRangeFilter('posted_at', 'Posted', true),
                 static::buildDateRangeFilter('updated_at', 'Last modified'),
             ])
                         $filters['account_id'],
                         $filters['reviewed'],
                         $filters['type'],
+                        $filters['is_payment'],
+                        $filters['payee'],
                     ])
                     ->columnSpanFull()
                     ->extraAttributes(['class' => 'border-b border-gray-200 dark:border-white/10 pb-8']),
                 Tables\Actions\ActionGroup::make([
                     Tables\Actions\ActionGroup::make([
                         EditTransactionAction::make('editTransaction')
-                            ->label('Edit transaction')
                             ->visible(static fn (Transaction $transaction) => $transaction->type->isStandard() && ! $transaction->transactionable_id),
                         EditTransactionAction::make('editTransfer')
-                            ->label('Edit transfer')
                             ->type(TransactionType::Transfer)
                             ->visible(static fn (Transaction $transaction) => $transaction->type->isTransfer()),
-                        EditTransactionAction::make('editJournalTransaction')
-                            ->label('Edit journal transaction')
+                        EditTransactionAction::make('editJournalEntry')
                             ->type(TransactionType::Journal)
                             ->visible(static fn (Transaction $transaction) => $transaction->type->isJournal() && ! $transaction->transactionable_id),
                         Tables\Actions\ReplicateAction::make()

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ListTransactions.php

 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Filament\Support\Enums\MaxWidth;
 
 class ListTransactions extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateTransactionAction::make('addIncome')
-                ->label('Add income')
-                ->type(TransactionType::Deposit),
-            CreateTransactionAction::make('addExpense')
-                ->label('Add expense')
-                ->type(TransactionType::Withdrawal),
-            CreateTransactionAction::make('addTransfer')
-                ->label('Add transfer')
-                ->type(TransactionType::Transfer),
             Actions\ActionGroup::make([
-                CreateTransactionAction::make('addJournalTransaction')
-                    ->label('Add journal transaction')
-                    ->type(TransactionType::Journal)
-                    ->groupedIcon(null),
+                CreateTransactionAction::make('addDeposit')
+                    ->type(TransactionType::Deposit),
+                CreateTransactionAction::make('addWithdrawal')
+                    ->type(TransactionType::Withdrawal),
+                CreateTransactionAction::make('addTransfer')
+                    ->type(TransactionType::Transfer),
+                CreateTransactionAction::make('addJournalEntry')
+                    ->type(TransactionType::Journal),
+            ])
+                ->label('Add transaction')
+                ->button()
+                ->dropdownPlacement('bottom-end')
+                ->icon('heroicon-m-chevron-down')
+                ->iconPosition(IconPosition::After),
+            Actions\ActionGroup::make([
                 Actions\Action::make('connectBank')
                     ->label('Connect your bank')
                     ->visible(app(PlaidService::class)->isEnabled())
                 ->label('More')
                 ->button()
                 ->outlined()
-                ->dropdownWidth('max-w-fit')
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
-                ->iconSize(IconSize::Small)
+                ->icon('heroicon-m-chevron-down')
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ViewTransaction.php

 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use Filament\Actions;
-use Filament\Infolists\Components\Grid;
-use Filament\Infolists\Components\RepeatableEntry;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
                             ->label('Notes')
                             ->columnSpanFull(),
                     ]),
-                Section::make('Journal Entries')
-                    ->visible(fn (Transaction $record) => $record->type->isJournal())
-                    ->schema([
-                        RepeatableEntry::make('journalEntries')
-                            ->hiddenLabel()
-                            ->schema([
-                                Grid::make(4)
-                                    ->schema([
-                                        TextEntry::make('type')
-                                            ->label('Type')
-                                            ->badge(),
-                                        TextEntry::make('description')
-                                            ->label('Description'),
-                                        TextEntry::make('account.name')
-                                            ->label('Account'),
-                                        TextEntry::make('amount')
-                                            ->label('Amount')
-                                            ->currency(fn (JournalEntry $record) => $record->transaction->bankAccount?->account->currency_code)
-                                            ->alignEnd(),
-                                    ]),
-                            ]),
-                    ]),
             ]);
     }
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/ViewBill.php

                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Purchases/VendorResource/Pages/ViewVendor.php

                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Sales/ClientResource/Pages/ViewClient.php

                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ViewEstimate.php

                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ViewInvoice.php

 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
-use Filament\Support\Enums\MaxWidth;
 use Illuminate\Support\HtmlString;
 
 class ViewInvoice extends ViewRecord
                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

                 ->button()
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
-                ->icon('heroicon-c-chevron-down')
+                ->icon('heroicon-m-chevron-down')
                 ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];

app/Filament/Tables/Actions/EditTransactionAction.php

     {
         parent::setUp();
 
+        $this->label(null);
+
+        $this->slideOver();
+
         $this->modalWidth(function (): MaxWidth {
             return match ($this->transactionType) {
                 TransactionType::Journal => MaxWidth::Screen,

app/Models/Accounting/Transaction.php

 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AccountCategory;
+use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Banking\BankAccount;
+use App\Models\Common\Client;
 use App\Models\Common\Contact;
+use App\Models\Common\Vendor;
 use App\Observers\TransactionObserver;
 use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
         return $this->morphTo();
     }
 
+    public function payeeable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
     public function isUncategorized(): bool
     {
         return $this->journalEntries->contains(fn (JournalEntry $entry) => $entry->account->isUncategorized());
             ->toArray();
     }
 
-    public static function getChartAccountOptions(?TransactionType $type = null, ?bool $nominalAccountsOnly = null, ?int $currentAccountId = null): array
+    public static function getChartAccountOptions(): array
     {
-        $nominalAccountsOnly ??= false;
+        return Account::query()
+            ->select(['id', 'name', 'category'])
+            ->get()
+            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
+            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->toArray();
+    }
 
-        $excludedCategory = match ($type) {
-            TransactionType::Deposit => AccountCategory::Expense,
-            TransactionType::Withdrawal => AccountCategory::Revenue,
+    public static function getTransactionAccountOptions(
+        TransactionType $type,
+        ?int $currentAccountId = null
+    ): array {
+        $associatedAccountTypes = match ($type) {
+            TransactionType::Deposit => [
+                AccountType::OperatingRevenue,     // Sales, service income
+                AccountType::NonOperatingRevenue,  // Interest, dividends received
+                AccountType::CurrentLiability,     // Loans received
+                AccountType::NonCurrentLiability,  // Long-term financing
+                AccountType::Equity,               // Owner contributions
+                AccountType::ContraExpense,        // Refunds of expenses
+                AccountType::UncategorizedRevenue,
+            ],
+            TransactionType::Withdrawal => [
+                AccountType::OperatingExpense,     // Regular business expenses
+                AccountType::NonOperatingExpense,  // Interest paid, etc.
+                AccountType::CurrentLiability,     // Loan payments
+                AccountType::NonCurrentLiability,  // Long-term debt payments
+                AccountType::Equity,               // Owner withdrawals
+                AccountType::ContraRevenue,        // Customer refunds, discounts
+                AccountType::UncategorizedExpense,
+            ],
             default => null,
         };
 
         return Account::query()
-            ->when($nominalAccountsOnly, fn (Builder $query) => $query->doesntHave('bankAccount'))
-            ->when($excludedCategory, fn (Builder $query) => $query->whereNot('category', $excludedCategory))
+            ->doesntHave('adjustment')
+            ->doesntHave('bankAccount')
+            ->when($associatedAccountTypes, fn (Builder $query) => $query->whereIn('type', $associatedAccountTypes))
+            ->where(function (Builder $query) use ($currentAccountId) {
+                $query->where('archived', false)
+                    ->orWhere('id', $currentAccountId);
+            })
+            ->get()
+            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
+            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->toArray();
+    }
+
+    public static function getJournalAccountOptions(
+        ?int $currentAccountId = null
+    ): array {
+        return Account::query()
             ->where(function (Builder $query) use ($currentAccountId) {
                 $query->where('archived', false)
                     ->orWhere('id', $currentAccountId);
             ->first();
     }
 
+    public static function getPayeeOptions(): array
+    {
+        $clients = Client::query()
+            ->orderBy('name')
+            ->pluck('name', 'id')
+            ->toArray();
+
+        $vendors = Vendor::query()
+            ->orderBy('name')
+            ->pluck('name', 'id')
+            ->mapWithKeys(fn ($name, $id) => [-$id => $name])
+            ->toArray();
+
+        return [
+            'Clients' => $clients,
+            'Vendors' => $vendors,
+        ];
+    }
+
     protected static function newFactory(): Factory
     {
         return TransactionFactory::new();

app/Models/Common/Client.php

 use App\Models\Accounting\Estimate;
 use App\Models\Accounting\Invoice;
 use App\Models\Accounting\RecurringInvoice;
+use App\Models\Accounting\Transaction;
 use App\Models\Setting\Currency;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
         return $this;
     }
 
+    public function transactions(): MorphMany
+    {
+        return $this->morphMany(Transaction::class, 'payeeable');
+    }
+
     public function contacts(): MorphMany
     {
         return $this->morphMany(Contact::class, 'contactable');

app/Models/Common/Vendor.php

 use App\Enums\Common\ContractorType;
 use App\Enums\Common\VendorType;
 use App\Models\Accounting\Bill;
+use App\Models\Accounting\Transaction;
 use App\Models\Setting\Currency;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 class Vendor extends Model
         return $this->hasMany(Bill::class);
     }
 
+    public function transactions(): MorphMany
+    {
+        return $this->morphMany(Transaction::class, 'payeeable');
+    }
+
     public function currency(): BelongsTo
     {
         return $this->belongsTo(Currency::class, 'currency_code', 'code');

app/Observers/TransactionObserver.php

 use App\Models\Accounting\Bill;
 use App\Models\Accounting\Invoice;
 use App\Models\Accounting\Transaction;
+use App\Models\Common\Client;
+use App\Models\Common\Vendor;
 use App\Services\TransactionService;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Builder;
         if ($transaction->type->isTransfer() && $transaction->description === null) {
             $transaction->description = 'Account Transfer';
         }
+
+        if ($transaction->transactionable && ! $transaction->payeeable_id) {
+            $document = $transaction->transactionable;
+
+            if ($document instanceof Invoice) {
+                $transaction->payeeable_id = $document->client_id;
+                $transaction->payeeable_type = Client::class;
+            } elseif ($document instanceof Bill) {
+                $transaction->payeeable_id = $document->vendor_id;
+                $transaction->payeeable_type = Vendor::class;
+            }
+        }
     }
 
     /**

app/Providers/Filament/CompanyPanelProvider.php

                     ->passwordReset();
             })
             ->tenantMenu(false)
-            ->plugin(
+            ->plugins([
                 FilamentCompanies::make()
                     ->userPanel('user')
                     ->switchCurrentCompany()
                         providers: [Provider::Github],
                         features: [Feature::RememberSession, Feature::ProviderAvatars],
                     ),
-            )
-            ->plugin(
                 PanelShiftDropdown::make()
                     ->logoutItem()
                     ->companySettings()
                         return $builder
                             ->items(Account::getNavigationItems());
                     }),
-            )
+            ])
             ->colors([
                 'primary' => Color::Indigo,
             ])
                             ]),
                     ]);
             })
+            ->globalSearch(false)
             ->sidebarCollapsibleOnDesktop()
             ->viteTheme('resources/css/filament/company/theme.css')
             ->brandLogo(static fn () => view('components.icons.logo'))

app/Services/ReportService.php

             return [
                 'type' => 'transaction',
                 'action' => match ($transaction->type) {
-                    TransactionType::Journal => 'editJournalTransaction',
+                    TransactionType::Journal => 'editJournalEntry',
                     TransactionType::Transfer => 'editTransfer',
                     default => 'editTransaction',
                 },

database/migrations/2025_05_17_194711_add_payeeable_to_transactions_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('transactions', function (Blueprint $table) {
+            $table->after('transactionable_id', function (Blueprint $table) {
+                $table->nullableMorphs('payeeable');
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('transactions', function (Blueprint $table) {
+            $table->dropMorphs('payeeable');
+        });
+    }
+};

tests/Feature/Accounting/TransactionTest.php

     $undoRepeaterFake = JournalEntryRepeater::fake();
 
     livewire(ListTransactions::class)
-        ->mountAction('addJournalTransaction')
+        ->mountAction('addJournalEntry')
         ->assertActionDataSet([
             'posted_at' => today(),
             'journalEntries' => [
 
     livewire(ListTransactions::class)
         ->assertTableActionHidden('editTransfer', $transaction)
-        ->assertTableActionHidden('editJournalTransaction', $transaction);
+        ->assertTableActionHidden('editJournalEntry', $transaction);
 })->with([
     TransactionType::Deposit,
     TransactionType::Withdrawal,
 
     livewire(ListTransactions::class)
         ->assertTableActionHidden('editTransaction', $transaction)
-        ->assertTableActionHidden('editJournalTransaction', $transaction);
+        ->assertTableActionHidden('editJournalEntry', $transaction);
 });
 
 it('replicates a transaction with correct journal entries', function () {